Removed baseUrl from Cesium3DTileset

CesiumGS · Oct 23, 2015 · a49b6fd · a49b6fd
1 parent 9ae609d
commit a49b6fd
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/Source/Scene/Cesium3DTileset.js b/Source/Scene/Cesium3DTileset.js
@@ -60,10 +60,9 @@ define([
         }
         //>>includeEnd('debug');
 
-        var baseUrl = appendForwardSlash(url);
+        url = appendForwardSlash(url);
 
         this._url = url;
-        this._baseUrl = baseUrl;
         this._root = undefined;
         this._properties = undefined; // // Metadata for per-model/point/etc properties
         this._geometricError = undefined; // Geometric error when the tree is not rendered at all
@@ -147,10 +146,10 @@ define([
 
         var that = this;
 
-        loadJson(baseUrl + 'tiles.json').then(function(tree) {
+        loadJson(url + 'tiles.json').then(function(tree) {
             that._properties = tree.properties;
             that._geometricError = tree.geometricError;
-            that._root = new Cesium3DTile(that, baseUrl, tree.root, undefined);
+            that._root = new Cesium3DTile(that, url, tree.root, undefined);
 
             var stack = [];
             stack.push({
@@ -166,7 +165,7 @@ define([
                     var length = children.length;
                     for (var k = 0; k < length; ++k) {
                         var childHeader = children[k];
-                        var childTile = new Cesium3DTile(that, baseUrl, childHeader, t.cesium3DTile);
+                        var childTile = new Cesium3DTile(that, url, childHeader, t.cesium3DTile);
                         t.cesium3DTile.children.push(childTile);
 
                         stack.push({

diff --git a/Source/Scene/Instanced3DModel3DTileContentProvider.js b/Source/Scene/Instanced3DModel3DTileContentProvider.js
@@ -156,7 +156,7 @@ define([
 
             if (gltfFormat === 0) {
                 var gltfUrl = getStringFromTypedArray(gltfView);
-                var url = (new Uri(gltfUrl).isAbsolute()) ? gltfUrl : that._tileset._baseUrl + gltfUrl;
+                var url = (new Uri(gltfUrl).isAbsolute()) ? gltfUrl : that._tileset.url + gltfUrl;
                 collectionOptions.url = url;
                 // TODO : how to get the correct headers
             } else {