Add Extras to 3DTile and 3DTileset

Apps/SampleData/Cesium3DTiles/Tilesets/Tileset/tileset.json

@@ -3,6 +3,7 @@
     "version": "1.0",
     "tilesetVersion": "1.2.3"
   },
+  "extras": { "hey":12 },
   "properties": {
     "id": {
       "minimum": 0,
@@ -61,6 +62,7 @@
           ]
         },
         "geometricError": 0,
+	"extras": { "special": true },
         "content": {
           "uri": "ll.b3dm"
         }

CHANGES.md

@@ -14,6 +14,7 @@ Change Log
 * Added `GeocoderViewModel.destinationFound` for specifying a function that is called upon a successful geocode.  The default behavior is to fly to the destination found by the geocoder. [#6915](https://github.com/AnalyticalGraphicsInc/cesium/pull/6915)
 * Added optional `width` and `height` to `Scene.drillPick` for specifying a search area.
 * Added `Cesium3DTileset.root` for getting the root tile of a tileset. [#6944](https://github.com/AnalyticalGraphicsInc/cesium/pull/6944)
+* Added `Cesium3DTileset.extras` and `Cesium3DTile.extras` for getting application specific metadata from 3D Tiles. [#6974](https://github.com/AnalyticalGraphicsInc/cesium/pull/6974)
 * Added `heightReference` to `BoxGraphics`, `CylinderGraphics` and `EllipsoidGraphics`, which can be used to clamp these entity types to terrain [#6932](https://github.com/AnalyticalGraphicsInc/cesium/pull/6932)
 
 ##### Fixes :wrench:

Source/Scene/Cesium3DTile.js

@@ -88,7 +88,7 @@ define([
         var contentHeader = header.content;
 
         /**
-         * The local transform of this tile
+         * The local transform of this tile.
          * @type {Matrix4}
          */
         this.transform = defined(header.transform) ? Matrix4.unpack(header.transform) : Matrix4.clone(Matrix4.IDENTITY);
@@ -99,8 +99,10 @@ define([
         var parentInitialTransform = defined(parent) ? parent._initialTransform : Matrix4.IDENTITY;
         this._initialTransform = Matrix4.multiply(parentInitialTransform, this.transform, new Matrix4());
 
+        this._extras = header.extras;
+
         /**
-         * The final computed transform of this tile
+         * The final computed transform of this tile.
          * @type {Matrix4}
          * @readonly
          */
@@ -429,6 +431,21 @@ define([
             }
         },
 
+        /**
+         * Application specific metadata.
+         *
+         * @memberof Cesium3DTile.prototype
+         *
+         * @type {Object}
+         * @readonly
+         * @see {@link https://github.com/AnalyticalGraphicsInc/3d-tiles/tree/master/specification#specifying-extensions-and-application-specific-extras|Extras in the 3D Tiles specification.}
+         */
+        extras : {
+            get : function() {
+                return this._extras;
+            }
+        },
+
         /**
          * Gets or sets the tile's highlight color.
          *

Source/Scene/Cesium3DTileset.js

@@ -181,6 +181,7 @@ define([
         this._selectedTilesToStyle = [];
         this._loadTimestamp = undefined;
         this._timeSinceLoad = 0.0;
+        this._extras = undefined;
 
         this._cullWithChildrenBounds = defaultValue(options.cullWithChildrenBounds, true);
         this._allTilesAdditive = true;
@@ -710,6 +711,7 @@ define([
                 that._geometricError = tilesetJson.geometricError;
                 that._extensionsUsed = tilesetJson.extensionsUsed;
                 that._gltfUpAxis = gltfUpAxis;
+                that._extras = tilesetJson.extras;
                 that._readyPromise.resolve(that);
             }).otherwise(function(error) {
                 that._readyPromise.reject(error);
@@ -1237,6 +1239,22 @@ define([
             get : function() {
                 return this._ellipsoid;
             }
+        },
+
+        /**
+         * Application specific metadata.
+         *
+         * @memberof Cesium3DTileset.prototype
+         *
+         * @type {Object}
+         * @readonly
+         *
+         * @see {@link https://github.com/AnalyticalGraphicsInc/3d-tiles/tree/master/specification#specifying-extensions-and-application-specific-extras|Extras in the 3D Tiles specification.}
+         */
+        extras : {
+            get : function() {
+                return this._extras;
+            }
         }
     });
 

Specs/Data/Cesium3DTiles/Tilesets/TilesetWithExtras/tileset.json

@@ -0,0 +1,124 @@
+{
+  "asset": {
+    "version": "1.0",
+    "tilesetVersion": "1.2.3"
+  },
+  "properties": {
+    "id": {
+      "minimum": 0,
+      "maximum": 9
+    },
+    "Longitude": {
+      "minimum": -1.3197192952275933,
+      "maximum": -1.319644104024109
+    },
+    "Latitude": {
+      "minimum": 0.698848878034009,
+      "maximum": 0.6989046192460953
+    },
+    "Height": {
+      "minimum": 6.161747192963958,
+      "maximum": 85.41026367992163
+    }
+  },
+  "geometricError": 240,
+  "extras": {
+      "key": "value"
+    },
+  "root": {
+    "boundingVolume": {
+      "region": [
+        -1.3197209591796106,
+        0.6988424218,
+        -1.3196390408203893,
+        0.6989055782,
+        0,
+        88
+      ]
+    },
+    "geometricError": 70,
+    "extras": {
+        "key": "value"
+    },
+    "refine": "ADD",
+    "content": {
+      "uri": "parent.b3dm",
+      "boundingVolume": {
+        "region": [
+          -1.3197004795898053,
+          0.6988582109,
+          -1.3196595204101946,
+          0.6988897891,
+          0,
+          88
+        ]
+      }
+    },
+    "children": [
+      {
+        "boundingVolume": {
+          "region": [
+            -1.3197209591796106,
+            0.6988424218,
+            -1.31968,
+            0.698874,
+            0,
+            20
+          ]
+        },
+        "geometricError": 0,
+        "content": {
+          "uri": "ll.b3dm"
+        }
+      },
+      {
+        "boundingVolume": {
+          "region": [
+            -1.31968,
+            0.6988424218,
+            -1.3196390408203893,
+            0.698874,
+            0,
+            20
+          ]
+        },
+        "geometricError": 0,
+        "content": {
+          "uri": "lr.b3dm"
+        }
+      },
+      {
+        "boundingVolume": {
+          "region": [
+            -1.31968,
+            0.698874,
+            -1.3196390408203893,
+            0.6989055782,
+            0,
+            20
+          ]
+        },
+        "geometricError": 0,
+        "content": {
+          "uri": "ur.b3dm"
+        }
+      },
+      {
+        "boundingVolume": {
+          "region": [
+            -1.3197209591796106,
+            0.698874,
+            -1.31968,
+            0.6989055782,
+            0,
+            20
+          ]
+        },
+        "geometricError": 0,
+        "content": {
+          "uri": "ul.b3dm"
+        }
+      }
+    ]
+  }
+}

Specs/Scene/Cesium3DTilesetSpec.js

@@ -132,6 +132,8 @@ defineSuite([
     var pointCloudUrl = 'Data/Cesium3DTiles/PointCloud/PointCloudRGB/tileset.json';
     var pointCloudBatchedUrl = 'Data/Cesium3DTiles/PointCloud/PointCloudBatched/tileset.json';
 
+    var tilesetWithExtras = 'Data/Cesium3DTiles/Tilesets/TilesetWithExtras/tileset.json';
+
     beforeAll(function() {
         scene = createScene();
     });
@@ -356,6 +358,16 @@ defineSuite([
         });
     });
 
+    fit('loads tileset with extras', function() {
+        return Cesium3DTilesTester.loadTileset(scene, tilesetWithExtras).then(function(tileset) {
+            expect(tileset.extras).toBeDefined();
+            expect(tileset.extras).toEqual({'key': 'value'});
+
+            expect(tileset.root.extras).toBeDefined();
+            expect(tileset.root.extras).toEqual({'key': 'value'});
+        });
+    });
+
     it('gets root tile', function() {
         var tileset = scene.primitives.add(new Cesium3DTileset({
             url : tilesetUrl