CesiumGS · ptrgags · Mar 9, 2022 · Mar 9, 2022 · Mar 9, 2022 · Mar 9, 2022
diff --git a/CHANGES.md b/CHANGES.md
@@ -10,7 +10,7 @@
     - Added support for subtree metadata. [#10093](https://github.com/CesiumGS/cesium/pull/10093)
     - Updated implicit tiling availability to match the latest schema. [#10107](https://github.com/CesiumGS/cesium/pull/10107)
     - Added support for content metadata in tilesets with implicit tiling. [#10123](https://github.com/CesiumGS/cesium/pull/10123)
-    - Implicit tile metadata is now stored in `tileMetadata` in the subtree JSON, rather than the `3DTILES_metadata` extension. [#10163] (https://github.com/CesiumGS/cesium/pull/10163)
+    - Implicit tile and content metadata is now stored in the `propertyTables` array in the subtree JSON. `tileMetadata` and `contentMetadata` are an index and array of indices respectively that point to the corresponding property tables. This eliminates the need for the `3DTILES_metadata` extension. [#10177](https://github.com/CesiumGS/cesium/pull/10177)
   - Split `EXT_mesh_features` into `EXT_mesh_features`, `EXT_instance_features`, `EXT_structural_metadata` [#10199](https://github.com/CesiumGS/cesium/pull/10119)
   - `EXT_mesh_features`:
     - Updated feature ID parsing to match the latest schema [#10087](https://github.com/CesiumGS/cesium/pull/10087)

diff --git a/Source/Scene/ImplicitSubtree.js b/Source/Scene/ImplicitSubtree.js
@@ -337,14 +337,23 @@ function initialize(subtree, json, subtreeView, implicitTileset) {
   let tilePropertyTableJson;
   if (hasExtension(subtreeJson, "3DTILES_metadata")) {
     tilePropertyTableJson = subtreeJson.extensions["3DTILES_metadata"];
-  } else {
-    tilePropertyTableJson = subtreeJson.tileMetadata;
+  } else if (defined(subtreeJson.tileMetadata)) {
+    const propertyTableIndex = subtreeJson.tileMetadata;
+    tilePropertyTableJson = subtreeJson.propertyTables[propertyTableIndex];
   }
 
-  const contentPropertyTableJsons = defaultValue(
-    subtreeJson.contentMetadata,
-    []
-  );
+  const contentPropertyTableJsons = [];
+  if (defined(subtreeJson.contentMetadata)) {
+    const length = subtreeJson.contentMetadata.length;
+    for (let i = 0; i < length; i++) {
+      const propertyTableIndex = subtreeJson.contentMetadata[i];
+      contentPropertyTableJsons.push(
+        subtreeJson.propertyTables[propertyTableIndex]
+      );
+    }
+  }
+
+  // TODO: FIGURE OUT FAILURE IN IMPLICIT SUBTREE SPEC
 
   let metadata;
   const schema = implicitTileset.metadataSchema;

diff --git a/...ata/Cesium3DTiles/Metadata/ImplicitContentBoundingVolumeSemantics/subtrees/1.1/0.0.0.json b/...ata/Cesium3DTiles/Metadata/ImplicitContentBoundingVolumeSemantics/subtrees/1.1/0.0.0.json
@@ -21,12 +21,15 @@
   "childSubtreeAvailability": {
     "constant": 0
   },
-  "tileMetadata": {
-    "class": "tile",
-    "properties": {
-      "contentBounds": {
-        "values": 0
+  "propertyTables": [
+    {
+      "class": "tile",
+      "properties": {
+        "contentBounds": {
+          "values": 0
+        }
       }
     }
-  }
+  ],
+  "tileMetadata": 0
 }
diff --git a/...ta/Cesium3DTiles/Metadata/ImplicitContentHeightAndRegionSemantics/subtrees/1.1/0.0.0.json b/...ta/Cesium3DTiles/Metadata/ImplicitContentHeightAndRegionSemantics/subtrees/1.1/0.0.0.json
@@ -31,18 +31,21 @@
     "childSubtreeAvailability": {
         "constant": 0
     },
-    "tileMetadata": {
-        "class": "tile",
-        "properties": {
-            "minimumHeight": {
-                "values": 0
-            },
-            "maximumHeight": {
-                "values": 1
-            },
-            "boundingRegion": {
-                "values": 2
+    "propertyTables": [
+        {
+            "class": "tile",
+            "properties": {
+                "minimumHeight": {
+                    "values": 0
+                },
+                "maximumHeight": {
+                    "values": 1
+                },
+                "boundingRegion": {
+                    "values": 2
+                }
             }
         }
-    }
+    ],
+    "tileMetadata": 0
 }
diff --git a/Specs/Data/Cesium3DTiles/Metadata/ImplicitContentHeightSemantics/subtrees/1.1/0.0.0.json b/Specs/Data/Cesium3DTiles/Metadata/ImplicitContentHeightSemantics/subtrees/1.1/0.0.0.json
@@ -26,15 +26,18 @@
     "childSubtreeAvailability": {
         "constant": 0
     },
-    "tileMetadata": {
-        "class": "tile",
-        "properties": {
-            "minimumHeight": {
-                "values": 0
-            },
-            "maximumHeight": {
-                "values": 1
+    "propertyTables": [
+        {
+            "class": "tile",
+            "properties": {
+                "minimumHeight": {
+                    "values": 0
+                },
+                "maximumHeight": {
+                    "values": 1
+                }
             }
         }
-    }
+    ],
+    "tileMetadata": 0
 }
diff --git a/Specs/Data/Cesium3DTiles/Metadata/ImplicitContentMetadata/subtrees/1.0/0.0.0.json b/Specs/Data/Cesium3DTiles/Metadata/ImplicitContentMetadata/subtrees/1.0/0.0.0.json
@@ -47,7 +47,7 @@
   "childSubtreeAvailability": {
     "constant": 0
   },
-  "contentMetadata": [
+  "propertyTables" : [
     {
       "class": "building",
       "properties": {
@@ -60,6 +60,9 @@
       }
     }
   ],
+  "contentMetadata": [
+    0
+  ],
   "extensions": {
     "3DTILES_metadata": {
       "class": "tile",

diff --git a/Specs/Data/Cesium3DTiles/Metadata/ImplicitContentMetadata/subtrees/1.1/0.0.0.json b/Specs/Data/Cesium3DTiles/Metadata/ImplicitContentMetadata/subtrees/1.1/0.0.0.json
@@ -47,7 +47,7 @@
   "childSubtreeAvailability": {
     "constant": 0
   },
-  "contentMetadata": [
+  "propertyTables": [
     {
       "class": "building",
       "properties": {
@@ -58,17 +58,19 @@
           "values": 4
         }
       }
-    }
-  ],
-  "tileMetadata": {
-    "class": "tile",
-    "properties": {
-      "quadrant": {
-        "values": 1
-      },
-      "color": {
-        "values": 2
+    },
+    {
+      "class": "tile",
+      "properties": {
+        "quadrant": {
+          "values": 1
+        },
+        "color": {
+          "values": 2
+        }
       }
     }
-  }
+  ],
+  "contentMetadata": [0],
+  "tileMetadata": 1
 }
diff --git a/Specs/Data/Cesium3DTiles/Metadata/ImplicitGeometricErrorSemantics/subtrees/1.1/0.0.0.json b/Specs/Data/Cesium3DTiles/Metadata/ImplicitGeometricErrorSemantics/subtrees/1.1/0.0.0.json
@@ -21,12 +21,15 @@
     "childSubtreeAvailability": {
         "constant": 0
     },
-    "tileMetadata": {
-        "class": "tile",
-        "properties": {
-            "geometricError": {
-                "values": 0
+    "propertyTables": [
+        {
+            "class": "tile",
+            "properties": {
+                "geometricError": {
+                    "values": 0
+                }
             }
         }
-    }
+    ],
+    "tileMetadata": 0
 }
diff --git a/...ImplicitGroupMetadata/subtrees/0.0.0.json → ...icitGroupMetadata/subtrees/1.0/0.0.0.json b/...ImplicitGroupMetadata/subtrees/0.0.0.json → ...icitGroupMetadata/subtrees/1.0/0.0.0.json
@@ -2,7 +2,7 @@
   "buffers": [
     {
       "byteLength": 8,
-      "uri": "availability.bin"
+      "uri": "../availability.bin"
     }
   ],
   "bufferViews": [

diff --git a/Specs/Data/Cesium3DTiles/Metadata/ImplicitGroupMetadata/subtrees/1.1/0.0.0.json b/Specs/Data/Cesium3DTiles/Metadata/ImplicitGroupMetadata/subtrees/1.1/0.0.0.json
@@ -0,0 +1,29 @@
+{
+  "buffers": [
+    {
+      "byteLength": 8,
+      "uri": "../availability.bin"
+    }
+  ],
+  "bufferViews": [
+    {
+      "buffer": 0,
+      "byteOffset": 0,
+      "byteLength": 1
+    }
+  ],
+  "tileAvailability": {
+    "constant": 1
+  },
+  "childSubtreeAvailability": {
+    "constant": 0
+  },
+  "contentAvailability": [
+    {
+      "constant": 1
+    },
+    {
+      "bitstream": 0
+    }
+  ]
+}
diff --git a/Specs/Data/Cesium3DTiles/Metadata/ImplicitGroupMetadata/tileset_1.0.json b/Specs/Data/Cesium3DTiles/Metadata/ImplicitGroupMetadata/tileset_1.0.json
@@ -65,7 +65,7 @@
         "subtreeLevels": 2,
         "availableLevels": 2,
         "subtrees": {
-          "uri": "subtrees/{level}.{x}.{y}.json"
+          "uri": "subtrees/1.0/{level}.{x}.{y}.json"
         }
       },
       "3DTILES_multiple_contents": {

diff --git a/Specs/Data/Cesium3DTiles/Metadata/ImplicitGroupMetadata/tileset_1.1.json b/Specs/Data/Cesium3DTiles/Metadata/ImplicitGroupMetadata/tileset_1.1.json
@@ -2,12 +2,6 @@
   "asset": {
     "version": "1.1"
   },
-  "extensionsUsed": [
-    "3DTILES_multiple_contents"
-  ],
-  "extensionsRequired": [
-    "3DTILES_multiple_contents"
-  ],
   "schema": {
     "classes": {
       "layer": {
@@ -56,23 +50,19 @@
       "subtreeLevels": 2,
       "availableLevels": 2,
       "subtrees": {
-        "uri": "subtrees/{level}.{x}.{y}.json"
+        "uri": "subtrees/1.1/{level}.{x}.{y}.json"
       }
     },
-    "extensions": {
-      "3DTILES_multiple_contents": {
-        "content": [
-          {
-            "uri": "ground/{level}/{x}/{y}.b3dm",
-            "group": "ground"
-          },
-          {
-            "uri": "sky/{level}/{x}/{y}.b3dm",
-            "group": "sky"
-          }
-        ]
+    "contents": [
+      {
+        "uri": "ground/{level}/{x}/{y}.b3dm",
+        "group": "ground"
+      },
+      {
+        "uri": "sky/{level}/{x}/{y}.b3dm",
+        "group": "sky"
       }
-    },
+    ],
     "geometricError": 70,
     "refine": "ADD"
   }

diff --git a/Specs/Data/Cesium3DTiles/Metadata/ImplicitHeightAndRegionSemantics/subtrees/1.1/0.0.0.json b/Specs/Data/Cesium3DTiles/Metadata/ImplicitHeightAndRegionSemantics/subtrees/1.1/0.0.0.json
@@ -31,18 +31,21 @@
     "childSubtreeAvailability": {
         "constant": 0
     },
-    "tileMetadata": {
-        "class": "tile",
-        "properties": {
-            "minimumHeight": {
-                "values": 0
-            },
-            "maximumHeight": {
-                "values": 1
-            },
-            "boundingRegion": {
-                "values": 2
+    "propertyTables": [
+        {
+            "class": "tile",
+            "properties": {
+                "minimumHeight": {
+                    "values": 0
+                },
+                "maximumHeight": {
+                    "values": 1
+               },
+              "boundingRegion": {
+                    "values": 2
+              }
             }
         }
-    }
+    ],
+    "tileMetadata": 0
 }
diff --git a/Specs/Data/Cesium3DTiles/Metadata/ImplicitHeightAndSphereSemantics/subtrees/1.1/0.0.0.json b/Specs/Data/Cesium3DTiles/Metadata/ImplicitHeightAndSphereSemantics/subtrees/1.1/0.0.0.json
@@ -31,18 +31,21 @@
     "childSubtreeAvailability": {
         "constant": 0
     },
-    "tileMetadata": {
-        "class": "tile",
-        "properties": {
-            "minimumHeight": {
-                "values": 0
-            },
-            "maximumHeight": {
-                "values": 1
-            },
-            "boundingSphere": {
-                "values": 2
+    "propertyTables": [
+        {
+            "class": "tile",
+            "properties": {
+                "minimumHeight": {
+                    "values": 0
+                },
+                "maximumHeight": {
+                    "values": 1
+                },
+                "boundingSphere": {
+                    "values": 2
+                }
             }
         }
-    }
+    ],
+    "tileMetadata": 0
 }