Merge pull request #3434 from AnalyticalGraphicsInc/3d-tiles-refine

Change 3D Tiles refine to inherit from parent
CesiumGS · Jan 15, 2016 · 0a8b211 · 0a8b211
2 parents c5e509e + 2f15f1e
commit 0a8b211
Show file tree

Hide file tree

Showing 19 changed files with 28 additions and 2 deletions.
diff --git a/Source/Scene/Cesium3DTile.js b/Source/Scene/Cesium3DTile.js
@@ -96,13 +96,20 @@ define([
          */
         this.geometricError = header.geometricError;
 
-// TODO: use default for a smaller tree.json?  Or inherit from parent.  Same for "type" and others.
+        var refine;
+        if (defined(header.refine)) {
+            refine = (header.refine === 'replace') ? Cesium3DTileRefine.REPLACE : Cesium3DTileRefine.ADD;
+        } else if (defined(parent)) {
+            // Inherit from parent tile if omitted.
+            refine = parent.refine;
+        }
+
         /**
          * DOC_TBA
          *
          * @readonly
          */
-        this.refine = (header.refine === 'replace') ? Cesium3DTileRefine.REPLACE : Cesium3DTileRefine.ADD;
+        this.refine = refine;
 
         /**
          * DOC_TBA

diff --git a/Specs/Data/Cesium3DTiles/Batched/BatchedNoBuildings/tiles.json b/Specs/Data/Cesium3DTiles/Batched/BatchedNoBuildings/tiles.json
@@ -18,6 +18,7 @@
             ]
         },
         "geometricError": 0,
+        "refine": "add",
         "content": {
             "url": "batchedNoBuildings.b3dm"
         }

diff --git a/Specs/Data/Cesium3DTiles/Batched/BatchedWithBatchTable/tiles.json b/Specs/Data/Cesium3DTiles/Batched/BatchedWithBatchTable/tiles.json
@@ -18,6 +18,7 @@
             ]
         },
         "geometricError": 0,
+        "refine": "add",
         "content": {
             "url": "batchedWithBatchTable.b3dm"
         }

diff --git a/Specs/Data/Cesium3DTiles/Batched/BatchedWithoutBatchTable/tiles.json b/Specs/Data/Cesium3DTiles/Batched/BatchedWithoutBatchTable/tiles.json
@@ -18,6 +18,7 @@
             ]
         },
         "geometricError": 0,
+        "refine": "add",
         "content": {
             "url": "batchedWithoutBatchTable.b3dm"
         }

diff --git a/Specs/Data/Cesium3DTiles/Composite/Composite/tiles.json b/Specs/Data/Cesium3DTiles/Composite/Composite/tiles.json
@@ -18,6 +18,7 @@
             ]
         },
         "geometricError": 0,
+        "refine": "add",
         "content": {
             "url": "composite.cmpt"
         }

diff --git a/Specs/Data/Cesium3DTiles/Composite/CompositeOfComposite/tiles.json b/Specs/Data/Cesium3DTiles/Composite/CompositeOfComposite/tiles.json
@@ -18,6 +18,7 @@
             ]
         },
         "geometricError": 0,
+        "refine": "add",
         "content": {
             "url": "compositeOfComposite.cmpt"
         }

diff --git a/Specs/Data/Cesium3DTiles/Instanced/InstancedGltfEmbedded/tiles.json b/Specs/Data/Cesium3DTiles/Instanced/InstancedGltfEmbedded/tiles.json
@@ -18,6 +18,7 @@
             ]
         },
         "geometricError": 0,
+        "refine": "add",
         "content": {
             "url": "instancedGltfEmbedded.i3dm"
         }

diff --git a/Specs/Data/Cesium3DTiles/Instanced/InstancedGltfExternal/tiles.json b/Specs/Data/Cesium3DTiles/Instanced/InstancedGltfExternal/tiles.json
@@ -18,6 +18,7 @@
             ]
         },
         "geometricError": 0,
+        "refine": "add",
         "content": {
             "url": "instancedGltfExternal.i3dm"
         }

diff --git a/Specs/Data/Cesium3DTiles/Instanced/InstancedWithBatchTable/tiles.json b/Specs/Data/Cesium3DTiles/Instanced/InstancedWithBatchTable/tiles.json
@@ -18,6 +18,7 @@
             ]
         },
         "geometricError": 0,
+        "refine": "add",
         "content": {
             "url": "instancedWithBatchTable.i3dm"
         }

diff --git a/Specs/Data/Cesium3DTiles/Instanced/InstancedWithoutBatchTable/tiles.json b/Specs/Data/Cesium3DTiles/Instanced/InstancedWithoutBatchTable/tiles.json
@@ -18,6 +18,7 @@
             ]
         },
         "geometricError": 0,
+        "refine": "add",
         "content": {
             "url": "instancedWithoutBatchTable.i3dm"
         }

diff --git a/Specs/Data/Cesium3DTiles/Points/Points/tiles.json b/Specs/Data/Cesium3DTiles/Points/Points/tiles.json
@@ -10,6 +10,7 @@
             ]
         },
         "geometricError": 0,
+        "refine": "add",
         "content": {
             "url": "points.pnts"
         }

diff --git a/Specs/Data/Cesium3DTiles/Tilesets/Tileset/tiles.json b/Specs/Data/Cesium3DTiles/Tilesets/Tileset/tiles.json
@@ -18,6 +18,7 @@
             ]
         },
         "geometricError": 70,
+        "refine": "add",
         "content": {
             "url": "parent.b3dm",
             "boundingVolume": {

diff --git a/Specs/Data/Cesium3DTiles/Tilesets/TilesetEmptyRoot/tiles.json b/Specs/Data/Cesium3DTiles/Tilesets/TilesetEmptyRoot/tiles.json
@@ -18,6 +18,7 @@
             ]
         },
         "geometricError": 70,
+        "refine": "add",
         "children": [
             {
                 "boundingVolume": {

diff --git a/Specs/Data/Cesium3DTiles/Tilesets/TilesetInvalid/tiles.json b/Specs/Data/Cesium3DTiles/Tilesets/TilesetInvalid/tiles.json
@@ -18,6 +18,7 @@
             ]
         },
         "geometricError": 70,
+        "refine": "add",
         "content": {
             "url": "parent.b3dm",
             "boundingVolume": {

diff --git a/Specs/Data/Cesium3DTiles/Tilesets/TilesetOfTilesets/tiles.json b/Specs/Data/Cesium3DTiles/Tilesets/TilesetOfTilesets/tiles.json
@@ -18,6 +18,7 @@
             ]
         },
         "geometricError": 70,
+        "refine": "add",
         "content": {
             "url": "tiles2.json"
         }

diff --git a/Specs/Data/Cesium3DTiles/Tilesets/TilesetOfTilesets/tiles2.json b/Specs/Data/Cesium3DTiles/Tilesets/TilesetOfTilesets/tiles2.json
@@ -27,6 +27,7 @@
                     ]
                 },
                 "geometricError": 0,
+                "refine": "add",
                 "content": {
                     "url": "tiles3.json"
                 }

diff --git a/Specs/Data/Cesium3DTiles/Tilesets/TilesetOfTilesets/tiles3.json b/Specs/Data/Cesium3DTiles/Tilesets/TilesetOfTilesets/tiles3.json
@@ -11,6 +11,7 @@
             ]
         },
         "geometricError": 0,
+        "refine": "add",
         "content": {
             "url": "ll.b3dm"
         }

diff --git a/Specs/Data/Cesium3DTiles/Tilesets/TilesetReplacement1/tiles.json b/Specs/Data/Cesium3DTiles/Tilesets/TilesetReplacement1/tiles.json
@@ -46,6 +46,7 @@
                     ]
                 },
                 "geometricError": 70,
+                "refine": "add",
                 "children": [
                     {
                         "boundingVolume": {
@@ -93,6 +94,7 @@
                     ]
                 },
                 "geometricError": 70,
+                "refine": "add",
                 "children": [
                     {
                         "boundingVolume": {

diff --git a/Specs/Data/Cesium3DTiles/Tilesets/TilesetReplacement2/tiles.json b/Specs/Data/Cesium3DTiles/Tilesets/TilesetReplacement2/tiles.json
@@ -6,6 +6,7 @@
         }
     },
     "geometricError": 240,
+    "refine": "add",
     "root": {
         "boundingVolume": {
             "region": [