Add spec for KHR_materials_common

CesiumGS · Dec 6, 2016 · 3de6aa2 · 3de6aa2
1 parent dff7931
commit 3de6aa2
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 0 deletions.
diff --git a/...ta/Cesium3DTiles/Batched/BatchedWithKHRMaterialsCommon/batchedWithKHRMaterialsCommon.b3dm b/...ta/Cesium3DTiles/Batched/BatchedWithKHRMaterialsCommon/batchedWithKHRMaterialsCommon.b3dm
diff --git a/Specs/Data/Cesium3DTiles/Batched/BatchedWithKHRMaterialsCommon/tileset.json b/Specs/Data/Cesium3DTiles/Batched/BatchedWithKHRMaterialsCommon/tileset.json
@@ -0,0 +1,37 @@
+{
+  "asset": {
+    "version": "0.0"
+  },
+  "properties": {
+    "Longitude": {
+      "minimum": -1.3196972173766555,
+      "maximum": -1.3196718547473905
+    },
+    "Latitude": {
+      "minimum": 0.6988624606923348,
+      "maximum": 0.6988888301460953
+    },
+    "Height": {
+      "minimum": 6.2074098233133554,
+      "maximum": 12.83180232718587
+    }
+  },
+  "geometricError": 70,
+  "root": {
+    "refine": "add",
+    "boundingVolume": {
+      "region": [
+        -1.3197004795898053,
+        0.6988582109,
+        -1.3196595204101946,
+        0.6988897891,
+        0,
+        20
+      ]
+    },
+    "geometricError": 0,
+    "content": {
+      "url": "batchedWithKHRMaterialsCommon.b3dm"
+    }
+  }
+}
diff --git a/Specs/Scene/Batched3DModel3DTileContentSpec.js b/Specs/Scene/Batched3DModel3DTileContentSpec.js
@@ -24,6 +24,7 @@ defineSuite([
     var withoutBatchTableUrl = './Data/Cesium3DTiles/Batched/BatchedWithoutBatchTable/';
     var translucentUrl = './Data/Cesium3DTiles/Batched/BatchedTranslucent/';
     var translucentOpaqueMixUrl = './Data/Cesium3DTiles/Batched/BatchedTranslucentOpaqueMix/';
+    var withKHRMaterialsCommonUrl = './Data/Cesium3DTiles/Batched/BatchedWithKHRMaterialsCommon/';
     var withTransformBoxUrl = './Data/Cesium3DTiles/Batched/BatchedWithTransformBox/';
     var withTransformSphereUrl = './Data/Cesium3DTiles/Batched/BatchedWithTransformSphere/';
     var withTransformRegionUrl = './Data/Cesium3DTiles/Batched/BatchedWithTransformRegion/';
@@ -143,6 +144,13 @@ defineSuite([
         });
     });
 
+    it('renders with KHR_materials_common extension', function() {
+        // Tests that the batchId attribute and CESIUM_RTC extension are handled correctly
+        return Cesium3DTilesTester.loadTileset(scene, withKHRMaterialsCommonUrl).then(function(tileset) {
+            Cesium3DTilesTester.expectRenderTileset(scene, tileset);
+        });
+    });
+
     function expectRenderWithTransform(url) {
         return Cesium3DTilesTester.loadTileset(scene, url).then(function(tileset) {
             Cesium3DTilesTester.expectRenderTileset(scene, tileset);