Remove tilesetContent flag

CesiumGS · Jan 21, 2016 · 3587e31 · 3587e31
1 parent 321cf9b
commit 3587e31
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 27 deletions.
diff --git a/Source/Scene/Cesium3DTile.js b/Source/Scene/Cesium3DTile.js
@@ -139,13 +139,6 @@ define([
 
         this.hasContent = true;
 
-        /**
-         * DOC_TBA
-         *
-         * @readonly
-         */
-        this.hasTilesetContent = false;
-
         /**
          * DOC_TBA
          *
@@ -162,7 +155,6 @@ define([
             var contentFactory = Cesium3DTileContentProviderFactory[type];
 
             if (type === 'json') {
-                this.hasTilesetContent = true;
                 this.hasContent = false;
                 this._numberOfUnrefinableChildren = 1;
             }

diff --git a/Source/Scene/Cesium3DTileset.js b/Source/Scene/Cesium3DTileset.js
@@ -427,23 +427,6 @@ define([
             var k;
             var additiveRefinement = (t.refine === Cesium3DTileRefine.ADD);
 
-            if (t.hasTilesetContent) {
-                // If tile has tileset content, skip it and process its child instead (the tileset root)
-                // No need to check visibility or sse of the child because its bounding volume
-                // and geometric error are equal to its parent.
-                if (t.isReady()) {
-                    child = t.children[0];
-                    child.parentPlaneMask = t.parentPlaneMask;
-                    child.distanceToCamera = t.distanceToCamera;
-                    child.refining = t.refining;
-                    if (child.isContentUnloaded()) {
-                        requestContent(tiles3D, child, outOfCore);
-                    } else {
-                        stack.push(child);
-                    }
-                }
-                continue;
-            }
             if (additiveRefinement) {
                 // With additive refinement, the tile is rendered
                 // regardless of if its SSE is sufficient.

diff --git a/Specs/Scene/Cesium3DTilesetSpec.js b/Specs/Scene/Cesium3DTilesetSpec.js
@@ -587,7 +587,6 @@ defineSuite([
         return Cesium3DTilesTester.loadTileset(scene, tilesetOfTilesetsUrl).then(function(tileset) {
             // Root points to an external tileset.json and has no children until it is requested
             var root = tileset._root;
-            expect(root.hasTilesetContent).toEqual(true);
             expect(root.children.length).toEqual(0);
 
             // Set view so that root's content is requested
@@ -604,7 +603,6 @@ defineSuite([
                 expect(root.contentBoundingVolume.boundingVolume).toEqual(subtreeRoot.contentBoundingVolume.boundingVolume);
 
                 // Check that Subtree root has 4 children
-                expect(subtreeRoot.hasTilesetContent).toEqual(false);
                 expect(subtreeRoot.children.length).toEqual(4);
             });
         });