@cesium/engine 1.0.0 → 1.1.0

package/Source/Scene/Cesium3DTilesVoxelProvider.js

@@ -0,0 +1,482 @@
+import Cartesian3 from "../Core/Cartesian3.js";
+import Check from "../Core/Check.js";
+import defaultValue from "../Core/defaultValue.js";
+import defined from "../Core/defined.js";
+import DeveloperError from "../Core/DeveloperError.js";
+import Ellipsoid from "../Core/Ellipsoid.js";
+import Matrix4 from "../Core/Matrix4.js";
+import OrientedBoundingBox from "../Core/OrientedBoundingBox.js";
+import Resource from "../Core/Resource.js";
+import RuntimeError from "../Core/RuntimeError.js";
+import Cesium3DTilesetMetadata from "./Cesium3DTilesetMetadata.js";
+import hasExtension from "./hasExtension.js";
+import ImplicitSubtree from "./ImplicitSubtree.js";
+import ImplicitSubtreeCache from "./ImplicitSubtreeCache.js";
+import ImplicitTileCoordinates from "./ImplicitTileCoordinates.js";
+import ImplicitTileset from "./ImplicitTileset.js";
+import MetadataType from "./MetadataType.js";
+import preprocess3DTileContent from "./preprocess3DTileContent.js";
+import ResourceCache from "./ResourceCache.js";
+import VoxelBoxShape from "./VoxelBoxShape.js";
+import VoxelContent from "./VoxelContent.js";
+import VoxelCylinderShape from "./VoxelCylinderShape.js";
+import VoxelShapeType from "./VoxelShapeType.js";
+
+/**
+ * A {@link VoxelProvider} that fetches voxel data from a 3D Tiles tileset.
+ * <p>
+ * Implements the {@link VoxelProvider} interface.
+ * </p>
+ *
+ * @alias Cesium3DTilesVoxelProvider
+ * @constructor
+ * @augments VoxelProvider
+ *
+ * @param {Object} options Object with the following properties:
+ * @param {Resource|String|Promise<Resource>|Promise<String>} options.url The URL to a tileset JSON file.
+ *
+ * @see VoxelProvider
+ * @see VoxelPrimitive
+ * @see VoxelShapeType
+ *
+ * @experimental This feature is not final and is subject to change without Cesium's standard deprecation policy.
+ */
+function Cesium3DTilesVoxelProvider(options) {
+  options = defaultValue(options, defaultValue.EMPTY_OBJECT);
+  //>>includeStart('debug', pragmas.debug)
+  Check.defined("options.url", options.url);
+  //>>includeEnd('debug');
+
+  /** @inheritdoc */
+  this.ready = false;
+
+  /** @inheritdoc */
+  this.shapeTransform = undefined;
+
+  /** @inheritdoc */
+  this.globalTransform = undefined;
+
+  /** @inheritdoc */
+  this.shape = undefined;
+
+  /** @inheritdoc */
+  this.minBounds = undefined;
+
+  /** @inheritdoc */
+  this.maxBounds = undefined;
+
+  /** @inheritdoc */
+  this.dimensions = undefined;
+
+  /** @inheritdoc */
+  this.paddingBefore = undefined;
+
+  /** @inheritdoc */
+  this.paddingAfter = undefined;
+
+  /** @inheritdoc */
+  this.names = undefined;
+
+  /** @inheritdoc */
+  this.types = undefined;
+
+  /** @inheritdoc */
+  this.componentTypes = undefined;
+
+  /** @inheritdoc */
+  this.minimumValues = undefined;
+
+  /** @inheritdoc */
+  this.maximumValues = undefined;
+
+  /** @inheritdoc */
+  this.maximumTileCount = undefined;
+
+  this._implicitTileset = undefined;
+  this._subtreeCache = new ImplicitSubtreeCache();
+
+  const that = this;
+  let tilesetJson;
+
+  this._readyPromise = Promise.resolve(options.url).then(function (url) {
+    const resource = Resource.createIfNeeded(url);
+    return resource
+      .fetchJson()
+      .then(function (tileset) {
+        tilesetJson = tileset;
+        validate(tilesetJson);
+        return getMetadataSchemaLoader(tilesetJson, resource).promise;
+      })
+      .then(function (schemaLoader) {
+        const root = tilesetJson.root;
+        const voxel = root.content.extensions["3DTILES_content_voxels"];
+        const className = voxel.class;
+
+        const metadataJson = hasExtension(tilesetJson, "3DTILES_metadata")
+          ? tilesetJson.extensions["3DTILES_metadata"]
+          : tilesetJson;
+
+        const metadataSchema = schemaLoader.schema;
+        const metadata = new Cesium3DTilesetMetadata({
+          metadataJson: metadataJson,
+          schema: metadataSchema,
+        });
+
+        addAttributeInfo(that, metadata, className);
+
+        const implicitTileset = new ImplicitTileset(
+          resource,
+          root,
+          metadataSchema
+        );
+
+        const {
+          shape,
+          minBounds,
+          maxBounds,
+          shapeTransform,
+          globalTransform,
+        } = getShape(root);
+
+        that.shape = shape;
+        that.minBounds = minBounds;
+        that.maxBounds = maxBounds;
+        that.dimensions = Cartesian3.unpack(voxel.dimensions);
+        that.shapeTransform = shapeTransform;
+        that.globalTransform = globalTransform;
+
+        let paddingBefore;
+        let paddingAfter;
+
+        if (defined(voxel.padding)) {
+          paddingBefore = Cartesian3.unpack(voxel.padding.before);
+          paddingAfter = Cartesian3.unpack(voxel.padding.after);
+        }
+
+        that.paddingBefore = paddingBefore;
+        that.paddingAfter = paddingAfter;
+
+        that._implicitTileset = implicitTileset;
+
+        ResourceCache.unload(schemaLoader);
+
+        that.ready = true;
+        return that;
+      });
+  });
+}
+
+Object.defineProperties(Cesium3DTilesVoxelProvider.prototype, {
+  /** @inheritdoc */
+  readyPromise: {
+    get: function () {
+      return this._readyPromise;
+    },
+  },
+});
+
+function validate(tileset) {
+  const root = tileset.root;
+
+  if (!defined(root.content)) {
+    throw new RuntimeError("Root must have content");
+  }
+
+  if (!hasExtension(root.content, "3DTILES_content_voxels")) {
+    throw new RuntimeError(
+      "Root tile content must have 3DTILES_content_voxels extension"
+    );
+  }
+
+  if (
+    !hasExtension(root, "3DTILES_implicit_tiling") &&
+    !defined(root.implicitTiling)
+  ) {
+    throw new RuntimeError("Root tile must have implicit tiling");
+  }
+
+  if (
+    !defined(tileset.schema) &&
+    !defined(tileset.schemaUri) &&
+    !hasExtension(tileset, "3DTILES_metadata")
+  ) {
+    throw new RuntimeError("Tileset must have a metadata schema");
+  }
+}
+
+function getShape(tile) {
+  const boundingVolume = tile.boundingVolume;
+
+  let tileTransform;
+  if (defined(tile.transform)) {
+    tileTransform = Matrix4.unpack(tile.transform);
+  } else {
+    tileTransform = Matrix4.clone(Matrix4.IDENTITY);
+  }
+
+  if (defined(boundingVolume.box)) {
+    return getBoxShape(boundingVolume.box, tileTransform);
+  } else if (defined(boundingVolume.region)) {
+    return getEllipsoidShape(boundingVolume.region);
+  } else if (hasExtension(boundingVolume, "3DTILES_bounding_volume_cylinder")) {
+    return getCylinderShape(
+      boundingVolume.extensions["3DTILES_bounding_volume_cylinder"].cylinder,
+      tileTransform
+    );
+  }
+
+  throw new RuntimeError(
+    "Only box, region and 3DTILES_bounding_volume_cylinder are supported in Cesium3DTilesVoxelProvider"
+  );
+}
+
+function getEllipsoidShape(region) {
+  const west = region[0];
+  const south = region[1];
+  const east = region[2];
+  const north = region[3];
+  const minHeight = region[4];
+  const maxHeight = region[5];
+
+  const shapeTransform = Matrix4.fromScale(Ellipsoid.WGS84.radii);
+
+  const minBoundsX = west;
+  const maxBoundsX = east;
+  const minBoundsY = south;
+  const maxBoundsY = north;
+  const minBoundsZ = minHeight;
+  const maxBoundsZ = maxHeight;
+
+  const minBounds = new Cartesian3(minBoundsX, minBoundsY, minBoundsZ);
+  const maxBounds = new Cartesian3(maxBoundsX, maxBoundsY, maxBoundsZ);
+
+  return {
+    shape: VoxelShapeType.ELLIPSOID,
+    minBounds: minBounds,
+    maxBounds: maxBounds,
+    shapeTransform: shapeTransform,
+    globalTransform: Matrix4.clone(Matrix4.IDENTITY),
+  };
+}
+
+function getBoxShape(box, tileTransform) {
+  const obb = OrientedBoundingBox.unpack(box);
+  const shapeTransform = Matrix4.fromRotationTranslation(
+    obb.halfAxes,
+    obb.center
+  );
+
+  return {
+    shape: VoxelShapeType.BOX,
+    minBounds: Cartesian3.clone(VoxelBoxShape.DefaultMinBounds),
+    maxBounds: Cartesian3.clone(VoxelBoxShape.DefaultMaxBounds),
+    shapeTransform: shapeTransform,
+    globalTransform: tileTransform,
+  };
+}
+
+function getCylinderShape(cylinder, tileTransform) {
+  const obb = OrientedBoundingBox.unpack(cylinder);
+  const shapeTransform = Matrix4.fromRotationTranslation(
+    obb.halfAxes,
+    obb.center
+  );
+
+  return {
+    shape: VoxelShapeType.CYLINDER,
+    minBounds: Cartesian3.clone(VoxelCylinderShape.DefaultMinBounds),
+    maxBounds: Cartesian3.clone(VoxelCylinderShape.DefaultMaxBounds),
+    shapeTransform: shapeTransform,
+    globalTransform: tileTransform,
+  };
+}
+
+function getMetadataSchemaLoader(tilesetJson, resource) {
+  const { schemaUri, schema } = tilesetJson;
+  if (!defined(schemaUri)) {
+    return ResourceCache.loadSchema({ schema });
+  }
+  return ResourceCache.loadSchema({
+    resource: resource.getDerivedResource({
+      url: schemaUri,
+    }),
+  });
+}
+
+function addAttributeInfo(provider, metadata, className) {
+  const { schema, statistics } = metadata;
+  const classStatistics = statistics?.classes[className];
+  const properties = schema.classes[className].properties;
+
+  const propertyInfo = Object.entries(properties).map(([id, property]) => {
+    const { type, componentType } = property;
+    const min = classStatistics?.properties[id].min;
+    const max = classStatistics?.properties[id].max;
+    const componentCount = MetadataType.getComponentCount(type);
+    const minValue = copyArray(min, componentCount);
+    const maxValue = copyArray(max, componentCount);
+
+    return { id, type, componentType, minValue, maxValue };
+  });
+
+  provider.names = propertyInfo.map((info) => info.id);
+  provider.types = propertyInfo.map((info) => info.type);
+  provider.componentTypes = propertyInfo.map((info) => info.componentType);
+
+  const minimumValues = propertyInfo.map((info) => info.minValue);
+  const maximumValues = propertyInfo.map((info) => info.maxValue);
+  const hasMinimumValues = minimumValues.some(defined);
+
+  provider.minimumValues = hasMinimumValues ? minimumValues : undefined;
+  provider.maximumValues = hasMinimumValues ? maximumValues : undefined;
+}
+
+function copyArray(values, length) {
+  // Copy input values into a new array of a specified length.
+  // If the input is not an array, its value will be copied into the first element
+  // of the returned array. If the input is an array shorter than the returned
+  // array, the extra elements in the returned array will be undefined. If the
+  // input is undefined, the return will be undefined.
+  if (!defined(values)) {
+    return;
+  }
+  const valuesArray = Array.isArray(values) ? values : [values];
+  return Array.from({ length }, (v, i) => valuesArray[i]);
+}
+
+function getVoxelPromise(implicitTileset, tileCoordinates) {
+  const voxelRelative = implicitTileset.contentUriTemplates[0].getDerivedResource(
+    {
+      templateValues: tileCoordinates.getTemplateValues(),
+    }
+  );
+  const voxelResource = implicitTileset.baseResource.getDerivedResource({
+    url: voxelRelative.url,
+  });
+
+  return voxelResource.fetchArrayBuffer().then(function (arrayBuffer) {
+    const preprocessed = preprocess3DTileContent(arrayBuffer);
+
+    const voxelContent = new VoxelContent(
+      voxelResource,
+      preprocessed.jsonPayload,
+      preprocessed.binaryPayload,
+      implicitTileset.metadataSchema
+    );
+
+    return voxelContent.readyPromise;
+  });
+}
+
+function getSubtreePromise(provider, subtreeCoord) {
+  const implicitTileset = provider._implicitTileset;
+  const subtreeCache = provider._subtreeCache;
+
+  // First load the subtree to check if the tile is available.
+  // If the subtree has been requested previously it might still be in the cache
+  const subtree = subtreeCache.find(subtreeCoord);
+  if (defined(subtree)) {
+    return subtree.readyPromise;
+  }
+
+  const subtreeRelative = implicitTileset.subtreeUriTemplate.getDerivedResource(
+    {
+      templateValues: subtreeCoord.getTemplateValues(),
+    }
+  );
+  const subtreeResource = implicitTileset.baseResource.getDerivedResource({
+    url: subtreeRelative.url,
+  });
+
+  return subtreeResource.fetchArrayBuffer().then(function (arrayBuffer) {
+    // Check one more time if the subtree is in the cache.
+    // This could happen if there are two in-flight tile requests from the same
+    // subtree and one finishes before the other.
+    let subtree = subtreeCache.find(subtreeCoord);
+    if (defined(subtree)) {
+      return subtree.readyPromise;
+    }
+
+    const preprocessed = preprocess3DTileContent(arrayBuffer);
+    subtree = new ImplicitSubtree(
+      subtreeResource,
+      preprocessed.jsonPayload,
+      preprocessed.binaryPayload,
+      implicitTileset,
+      subtreeCoord
+    );
+    subtreeCache.addSubtree(subtree);
+    return subtree.readyPromise;
+  });
+}
+
+/** @inheritdoc */
+Cesium3DTilesVoxelProvider.prototype.requestData = function (options) {
+  //>>includeStart('debug', pragmas.debug);
+  if (!this.ready) {
+    throw new DeveloperError(
+      "The provider is not ready. Use Cesium3DTilesVoxelProvider.readyPromise or wait for Cesium3DTilesVoxelProvider.ready to be true."
+    );
+  }
+  //>>includeEnd('debug');
+
+  options = defaultValue(options, defaultValue.EMPTY_OBJECT);
+  const tileLevel = defaultValue(options.tileLevel, 0);
+  const tileX = defaultValue(options.tileX, 0);
+  const tileY = defaultValue(options.tileY, 0);
+  const tileZ = defaultValue(options.tileZ, 0);
+  const keyframe = defaultValue(options.keyframe, 0);
+
+  // 3D Tiles currently doesn't support time-dynamic data.
+  if (keyframe !== 0) {
+    return undefined;
+  }
+
+  // 1. Load the subtree that the tile belongs to (possibly from the subtree cache)
+  // 2. Load the voxel content if available
+
+  const implicitTileset = this._implicitTileset;
+  const names = this.names;
+
+  // Can't use a scratch variable here because the object is used inside the promise chain.
+  const tileCoordinates = new ImplicitTileCoordinates({
+    subdivisionScheme: implicitTileset.subdivisionScheme,
+    subtreeLevels: implicitTileset.subtreeLevels,
+    level: tileLevel,
+    x: tileX,
+    y: tileY,
+    z: tileZ,
+  });
+
+  // Find the coordinates of the parent subtree containing tileCoordinates
+  // If tileCoordinates is a subtree child, use that subtree
+  // If tileCoordinates is a subtree root, use its parent subtree
+  const isSubtreeRoot =
+    tileCoordinates.isSubtreeRoot() && tileCoordinates.level > 0;
+
+  const subtreeCoord = isSubtreeRoot
+    ? tileCoordinates.getParentSubtreeCoordinates()
+    : tileCoordinates.getSubtreeCoordinates();
+
+  const that = this;
+
+  return getSubtreePromise(that, subtreeCoord)
+    .then(function (subtree) {
+      const available = isSubtreeRoot
+        ? subtree.childSubtreeIsAvailableAtCoordinates(tileCoordinates)
+        : subtree.tileIsAvailableAtCoordinates(tileCoordinates);
+
+      if (!available) {
+        return Promise.reject("Tile is not available");
+      }
+
+      return getVoxelPromise(implicitTileset, tileCoordinates);
+    })
+    .then(function (voxelContent) {
+      return names.map(function (name) {
+        return voxelContent.metadataTable.getPropertyTypedArray(name);
+      });
+    });
+};
+
+export default Cesium3DTilesVoxelProvider;

package/Source/Scene/Cesium3DTilesetMetadata.js

@@ -168,7 +168,7 @@ Object.defineProperties(Cesium3DTilesetMetadata.prototype, {
   },
 
   /**
-   * Extras in the JSON object.
+   * Extra user-defined properties.
    *
    * @memberof Cesium3DTilesetMetadata.prototype
    * @type {*}
@@ -182,7 +182,7 @@ Object.defineProperties(Cesium3DTilesetMetadata.prototype, {
   },
 
   /**
-   * Extensions in the JSON object.
+   * An object containing extensions.
    *
    * @memberof Cesium3DTilesetMetadata.prototype
    * @type {Object}

package/Source/Scene/ContentMetadata.js

@@ -50,7 +50,7 @@ Object.defineProperties(ContentMetadata.prototype, {
   },
 
   /**
-   * Extras in the JSON object.
+   * Extra user-defined properties.
    *
    * @memberof ContentMetadata.prototype
    * @type {Object}
@@ -64,7 +64,7 @@ Object.defineProperties(ContentMetadata.prototype, {
   },
 
   /**
-   * Extensions in the JSON object.
+   * An object containing extensions.
    *
    * @memberof ContentMetadata.prototype
    * @type {Object}

package/Source/Scene/DerivedCommand.js

@@ -148,6 +148,13 @@ const vertexlogDepthRegex = /\s+czm_vertexLogDepth\(/;
 const extensionRegex = /\s*#extension\s+GL_EXT_frag_depth\s*:\s*enable/;
 
 function getLogDepthShaderProgram(context, shaderProgram) {
+  const disableLogDepthWrite =
+    shaderProgram.fragmentShaderSource.defines.indexOf("LOG_DEPTH_READ_ONLY") >=
+    0;
+  if (disableLogDepthWrite) {
+    return shaderProgram;
+  }
+
   let shader = context.shaderCache.getDerivedShaderProgram(
     shaderProgram,
     "logDepth"

package/Source/Scene/Expression.js

@@ -659,7 +659,7 @@ function parseCall(expression, ast) {
     const object = ast.callee.object;
     if (call === "test" || call === "exec") {
       // Make sure this is called on a valid type
-      if (object.callee.name !== "regExp") {
+      if (!defined(object.callee) || object.callee.name !== "regExp") {
         throw new RuntimeError(`${call} is not a function.`);
       }
       if (argsLength === 0) {

package/Source/Scene/Globe.js

@@ -379,6 +379,15 @@ function Globe(ellipsoid) {
 
   this._oceanNormalMap = undefined;
   this._zoomedOutOceanSpecularIntensity = undefined;
+
+  /**
+   * Determines the darkness of the vertex shadow.
+   * This only takes effect when <code>enableLighting</code> is <code>true</code>.
+   *
+   * @type {Number}
+   * @default 0.3
+   */
+  this.vertexShadowDarkness = 0.3;
 }
 
 Object.defineProperties(Globe.prototype, {
@@ -1046,6 +1055,7 @@ Globe.prototype.beginFrame = function (frameState) {
     tileProvider.fillHighlightColor = this.fillHighlightColor;
     tileProvider.showSkirts = this.showSkirts;
     tileProvider.backFaceCulling = this.backFaceCulling;
+    tileProvider.vertexShadowDarkness = this.vertexShadowDarkness;
     tileProvider.undergroundColor = this._undergroundColor;
     tileProvider.undergroundColorAlphaByDistance = this._undergroundColorAlphaByDistance;
     tileProvider.lambertDiffuseMultiplier = this.lambertDiffuseMultiplier;

package/Source/Scene/GlobeSurfaceTileProvider.js

@@ -89,6 +89,7 @@ function GlobeSurfaceTileProvider(options) {
   this.dynamicAtmosphereLightingFromSun = false;
   this.showGroundAtmosphere = false;
   this.shadows = ShadowMode.RECEIVE_ONLY;
+  this.vertexShadowDarkness = 0.3;
 
   /**
    * The color to use to highlight terrain fill tiles. If undefined, fill tiles are not
@@ -1785,6 +1786,9 @@ function createTileUniformMap(frameState, globeSurfaceTileProvider) {
     u_lambertDiffuseMultiplier: function () {
       return this.properties.lambertDiffuseMultiplier;
     },
+    u_vertexShadowDarkness: function () {
+      return this.properties.vertexShadowDarkness;
+    },
 
     // make a separate object so that changes to the properties are seen on
     // derived commands that combine another uniform map with this one.
@@ -1846,6 +1850,7 @@ function createTileUniformMap(frameState, globeSurfaceTileProvider) {
       undergroundColor: Color.clone(Color.TRANSPARENT),
       undergroundColorAlphaByDistance: new Cartesian4(),
       lambertDiffuseMultiplier: 0.0,
+      vertexShadowDarkness: 0.0,
     },
   };
 
@@ -2112,6 +2117,7 @@ function addDrawCommandsForTile(tileProvider, tile, frameState) {
       undergroundColorAlphaByDistance.farValue > 0.0);
 
   const lambertDiffuseMultiplier = tileProvider.lambertDiffuseMultiplier;
+  const vertexShadowDarkness = tileProvider.vertexShadowDarkness;
 
   const showReflectiveOcean =
     tileProvider.hasWaterMask && defined(waterMaskTexture);
@@ -2416,6 +2422,7 @@ function addDrawCommandsForTile(tileProvider, tile, frameState) {
     Color.clone(undergroundColor, uniformMapProperties.undergroundColor);
 
     uniformMapProperties.lambertDiffuseMultiplier = lambertDiffuseMultiplier;
+    uniformMapProperties.vertexShadowDarkness = vertexShadowDarkness;
 
     const highlightFillTile =
       !defined(surfaceTile.vertexArray) &&

package/Source/Scene/GltfImageLoader.js

@@ -293,7 +293,7 @@ function loadImageFromBufferTypedArray(typedArray) {
 const ktx2Regex = /(^data:image\/ktx2)|(\.ktx2$)/i;
 
 function loadImageFromUri(resource) {
-  const uri = resource.url;
+  const uri = resource.getUrlComponent(false, true);
   if (ktx2Regex.test(uri)) {
     // Resolves to a CompressedTextureBuffer
     return loadKTX2(resource);

package/Source/Scene/GltfVertexBufferLoader.js

@@ -67,7 +67,7 @@ function GltfVertexBufferLoader(options) {
   }
 
   const hasBufferViewId = defined(bufferViewId);
-  const hasDraco = defined(draco);
+  const hasDraco = hasDracoCompression(draco, attributeSemantic);
   const hasAttributeSemantic = defined(attributeSemantic);
   const hasAccessorId = defined(accessorId);
 
@@ -196,6 +196,14 @@ Object.defineProperties(GltfVertexBufferLoader.prototype, {
   },
 });
 
+function hasDracoCompression(draco, semantic) {
+  return (
+    defined(draco) &&
+    defined(draco.attributes) &&
+    defined(draco.attributes[semantic])
+  );
+}
+
 /**
  * Loads the resource.
  * @returns {Promise.<GltfVertexBufferLoader>} A promise which resolves to the loader when the resource loading is completed.
@@ -204,7 +212,7 @@ Object.defineProperties(GltfVertexBufferLoader.prototype, {
 GltfVertexBufferLoader.prototype.load = function () {
   let promise;
 
-  if (defined(this._draco)) {
+  if (hasDracoCompression(this._draco, this._attributeSemantic)) {
     promise = loadFromDraco(this);
   } else {
     promise = loadFromBufferView(this);

package/Source/Scene/GroupMetadata.js

@@ -69,7 +69,7 @@ Object.defineProperties(GroupMetadata.prototype, {
   },
 
   /**
-   * Extras in the JSON object.
+   * Extra user-defined properties.
    *
    * @memberof GroupMetadata.prototype
    * @type {*}
@@ -83,7 +83,7 @@ Object.defineProperties(GroupMetadata.prototype, {
   },
 
   /**
-   * Extensions in the JSON object.
+   * An object containing extensions.
    *
    * @memberof GroupMetadata.prototype
    * @type {Object}

package/Source/Scene/ImplicitMetadataView.js

@@ -56,7 +56,7 @@ Object.defineProperties(ImplicitMetadataView.prototype, {
   },
 
   /**
-   * Extras in the JSON object.
+   * Extra user-defined properties.
    *
    * @memberof ImplicitMetadataView.prototype
    * @type {Object}
@@ -69,7 +69,7 @@ Object.defineProperties(ImplicitMetadataView.prototype, {
   },
 
   /**
-   * Extensions in the JSON object.
+   * An object containing extensions.
    *
    * @memberof ImplicitMetadataView.prototype
    * @type {Object}