@cesium/engine 1.1.0 → 2.1.0

package/Source/Scene/Primitive.js

@@ -63,20 +63,20 @@ import ShadowMode from "./ShadowMode.js";
  * @alias Primitive
  * @constructor
  *
- * @param {Object} [options] Object with the following properties:
+ * @param {object} [options] Object with the following properties:
  * @param {GeometryInstance[]|GeometryInstance} [options.geometryInstances] The geometry instances - or a single geometry instance - to render.
  * @param {Appearance} [options.appearance] The appearance used to render the primitive.
  * @param {Appearance} [options.depthFailAppearance] The appearance used to shade this primitive when it fails the depth test.
- * @param {Boolean} [options.show=true] Determines if this primitive will be shown.
+ * @param {boolean} [options.show=true] Determines if this primitive will be shown.
  * @param {Matrix4} [options.modelMatrix=Matrix4.IDENTITY] The 4x4 transformation matrix that transforms the primitive (all geometry instances) from model to world coordinates.
- * @param {Boolean} [options.vertexCacheOptimize=false] When <code>true</code>, geometry vertices are optimized for the pre and post-vertex-shader caches.
- * @param {Boolean} [options.interleave=false] When <code>true</code>, geometry vertex attributes are interleaved, which can slightly improve rendering performance but increases load time.
- * @param {Boolean} [options.compressVertices=true] When <code>true</code>, the geometry vertices are compressed, which will save memory.
- * @param {Boolean} [options.releaseGeometryInstances=true] When <code>true</code>, the primitive does not keep a reference to the input <code>geometryInstances</code> to save memory.
- * @param {Boolean} [options.allowPicking=true] When <code>true</code>, each geometry instance will only be pickable with {@link Scene#pick}.  When <code>false</code>, GPU memory is saved.
- * @param {Boolean} [options.cull=true] When <code>true</code>, the renderer frustum culls and horizon culls the primitive's commands based on their bounding volume.  Set this to <code>false</code> for a small performance gain if you are manually culling the primitive.
- * @param {Boolean} [options.asynchronous=true] Determines if the primitive will be created asynchronously or block until ready.
- * @param {Boolean} [options.debugShowBoundingVolume=false] For debugging only. Determines if this primitive's commands' bounding spheres are shown.
+ * @param {boolean} [options.vertexCacheOptimize=false] When <code>true</code>, geometry vertices are optimized for the pre and post-vertex-shader caches.
+ * @param {boolean} [options.interleave=false] When <code>true</code>, geometry vertex attributes are interleaved, which can slightly improve rendering performance but increases load time.
+ * @param {boolean} [options.compressVertices=true] When <code>true</code>, the geometry vertices are compressed, which will save memory.
+ * @param {boolean} [options.releaseGeometryInstances=true] When <code>true</code>, the primitive does not keep a reference to the input <code>geometryInstances</code> to save memory.
+ * @param {boolean} [options.allowPicking=true] When <code>true</code>, each geometry instance will only be pickable with {@link Scene#pick}.  When <code>false</code>, GPU memory is saved.
+ * @param {boolean} [options.cull=true] When <code>true</code>, the renderer frustum culls and horizon culls the primitive's commands based on their bounding volume.  Set this to <code>false</code> for a small performance gain if you are manually culling the primitive.
+ * @param {boolean} [options.asynchronous=true] Determines if the primitive will be created asynchronously or block until ready.
+ * @param {boolean} [options.debugShowBoundingVolume=false] For debugging only. Determines if this primitive's commands' bounding spheres are shown.
  * @param {ShadowMode} [options.shadows=ShadowMode.DISABLED] Determines whether this primitive casts or receives shadows from light sources.
  *
  * @example
@@ -233,7 +233,7 @@ function Primitive(options) {
    * Determines if the primitive will be shown.  This affects all geometry
    * instances in the primitive.
    *
-   * @type Boolean
+   * @type {boolean}
    *
    * @default true
    */
@@ -254,7 +254,7 @@ function Primitive(options) {
    * based on their bounding volume.  Set this to <code>false</code> for a small performance gain
    * if you are manually culling the primitive.
    *
-   * @type {Boolean}
+   * @type {boolean}
    *
    * @default true
    */
@@ -266,7 +266,7 @@ function Primitive(options) {
    * Draws the bounding sphere for each draw command in the primitive.
    * </p>
    *
-   * @type {Boolean}
+   * @type {boolean}
    *
    * @default false
    */
@@ -314,7 +314,7 @@ function Primitive(options) {
   this._boundingSphereCV = [];
   this._boundingSphere2D = [];
   this._boundingSphereMorph = [];
-  this._perInstanceAttributeCache = [];
+  this._perInstanceAttributeCache = new Map();
   this._instanceIds = [];
   this._lastPerInstanceAttributeIndex = 0;
 
@@ -386,7 +386,7 @@ Object.defineProperties(Primitive.prototype, {
    *
    * @memberof Primitive.prototype
    *
-   * @type {Boolean}
+   * @type {boolean}
    * @readonly
    *
    * @default true
@@ -402,7 +402,7 @@ Object.defineProperties(Primitive.prototype, {
    *
    * @memberof Primitive.prototype
    *
-   * @type {Boolean}
+   * @type {boolean}
    * @readonly
    *
    * @default false
@@ -418,7 +418,7 @@ Object.defineProperties(Primitive.prototype, {
    *
    * @memberof Primitive.prototype
    *
-   * @type {Boolean}
+   * @type {boolean}
    * @readonly
    *
    * @default true
@@ -434,7 +434,7 @@ Object.defineProperties(Primitive.prototype, {
    *
    * @memberof Primitive.prototype
    *
-   * @type {Boolean}
+   * @type {boolean}
    * @readonly
    *
    * @default true
@@ -450,7 +450,7 @@ Object.defineProperties(Primitive.prototype, {
    *
    * @memberof Primitive.prototype
    *
-   * @type {Boolean}
+   * @type {boolean}
    * @readonly
    *
    * @default true
@@ -466,7 +466,7 @@ Object.defineProperties(Primitive.prototype, {
    *
    * @memberof Primitive.prototype
    *
-   * @type {Boolean}
+   * @type {boolean}
    * @readonly
    *
    * @default true
@@ -484,7 +484,7 @@ Object.defineProperties(Primitive.prototype, {
    *
    * @memberof Primitive.prototype
    *
-   * @type {Boolean}
+   * @type {boolean}
    * @readonly
    */
   ready: {
@@ -496,7 +496,7 @@ Object.defineProperties(Primitive.prototype, {
   /**
    * Gets a promise that resolves when the primitive is ready to render.
    * @memberof Primitive.prototype
-   * @type {Promise.<Primitive>}
+   * @type {Promise<Primitive>}
    * @readonly
    */
   readyPromise: {
@@ -743,7 +743,7 @@ function cloneInstance(instance, geometry) {
   };
 }
 
-const positionRegex = /attribute\s+vec(?:3|4)\s+(.*)3DHigh;/g;
+const positionRegex = /in\s+vec(?:3|4)\s+(.*)3DHigh;/g;
 
 Primitive._modifyShaderPosition = function (
   primitive,
@@ -771,8 +771,7 @@ Primitive._modifyShaderPosition = function (
     if (!defined(primitive.rtcCenter)) {
       // Use GPU RTE
       if (!scene3DOnly) {
-        attributes +=
-          `attribute vec3 ${name}2DHigh;\n` + `attribute vec3 ${name}2DLow;\n`;
+        attributes += `in vec3 ${name}2DHigh;\nin vec3 ${name}2DLow;\n`;
 
         computeFunctions +=
           `${functionName}\n` +
@@ -805,16 +804,16 @@ Primitive._modifyShaderPosition = function (
     } else {
       // Use RTC
       vertexShaderSource = vertexShaderSource.replace(
-        /attribute\s+vec(?:3|4)\s+position3DHigh;/g,
+        /in\s+vec(?:3|4)\s+position3DHigh;/g,
         ""
       );
       vertexShaderSource = vertexShaderSource.replace(
-        /attribute\s+vec(?:3|4)\s+position3DLow;/g,
+        /in\s+vec(?:3|4)\s+position3DLow;/g,
         ""
       );
 
       forwardDecl += "uniform mat4 u_modifiedModelView;\n";
-      attributes += "attribute vec4 position;\n";
+      attributes += "in vec4 position;\n";
 
       computeFunctions +=
         `${functionName}\n` +
@@ -871,7 +870,7 @@ Primitive._updateColorAttribute = function (
     return vertexShaderSource;
   }
 
-  if (vertexShaderSource.search(/attribute\s+vec4\s+color;/g) === -1) {
+  if (vertexShaderSource.search(/in\s+vec4\s+color;/g) === -1) {
     return vertexShaderSource;
   }
 
@@ -887,7 +886,7 @@ Primitive._updateColorAttribute = function (
   //>>includeEnd('debug');
 
   let modifiedVS = vertexShaderSource;
-  modifiedVS = modifiedVS.replace(/attribute\s+vec4\s+color;/g, "");
+  modifiedVS = modifiedVS.replace(/in\s+vec4\s+color;/g, "");
   if (!isDepthFail) {
     modifiedVS = modifiedVS.replace(
       /(\b)color(\b)/g,
@@ -905,7 +904,7 @@ Primitive._updateColorAttribute = function (
 function appendPickToVertexShader(source) {
   const renamedVS = ShaderSource.replaceMain(source, "czm_non_pick_main");
   const pickMain =
-    "varying vec4 v_pickColor; \n" +
+    "out vec4 v_pickColor; \n" +
     "void main() \n" +
     "{ \n" +
     "    czm_non_pick_main(); \n" +
@@ -916,11 +915,11 @@ function appendPickToVertexShader(source) {
 }
 
 function appendPickToFragmentShader(source) {
-  return `varying vec4 v_pickColor;\n${source}`;
+  return `in vec4 v_pickColor;\n${source}`;
 }
 
 Primitive._updatePickColorAttribute = function (source) {
-  let vsPick = source.replace(/attribute\s+vec4\s+pickColor;/g, "");
+  let vsPick = source.replace(/in\s+vec4\s+pickColor;/g, "");
   vsPick = vsPick.replace(
     /(\b)pickColor(\b)/g,
     "$1czm_batchTable_pickColor(batchId)$2"
@@ -933,10 +932,10 @@ Primitive._appendOffsetToShader = function (primitive, vertexShaderSource) {
     return vertexShaderSource;
   }
 
-  let attr = "attribute float batchId;\n";
-  attr += "attribute float applyOffset;";
+  let attr = "in float batchId;\n";
+  attr += "in float applyOffset;";
   let modifiedShader = vertexShaderSource.replace(
-    /attribute\s+float\s+batchId;/g,
+    /in\s+float\s+batchId;/g,
     attr
   );
 
@@ -1033,17 +1032,16 @@ function modifyForEncodedNormals(primitive, vertexShaderSource) {
   }
 
   const containsNormal =
-    vertexShaderSource.search(/attribute\s+vec3\s+normal;/g) !== -1;
-  const containsSt =
-    vertexShaderSource.search(/attribute\s+vec2\s+st;/g) !== -1;
+    vertexShaderSource.search(/in\s+vec3\s+normal;/g) !== -1;
+  const containsSt = vertexShaderSource.search(/in\s+vec2\s+st;/g) !== -1;
   if (!containsNormal && !containsSt) {
     return vertexShaderSource;
   }
 
   const containsTangent =
-    vertexShaderSource.search(/attribute\s+vec3\s+tangent;/g) !== -1;
+    vertexShaderSource.search(/in\s+vec3\s+tangent;/g) !== -1;
   const containsBitangent =
-    vertexShaderSource.search(/attribute\s+vec3\s+bitangent;/g) !== -1;
+    vertexShaderSource.search(/in\s+vec3\s+bitangent;/g) !== -1;
 
   let numComponents = containsSt && containsNormal ? 2.0 : 1.0;
   numComponents += containsTangent || containsBitangent ? 1 : 0;
@@ -1051,7 +1049,7 @@ function modifyForEncodedNormals(primitive, vertexShaderSource) {
   const type = numComponents > 1 ? `vec${numComponents}` : "float";
 
   const attributeName = "compressedAttributes";
-  const attributeDecl = `attribute ${type} ${attributeName};`;
+  const attributeDecl = `in ${type} ${attributeName};`;
 
   let globalDecl = "";
   let decode = "";
@@ -1092,10 +1090,10 @@ function modifyForEncodedNormals(primitive, vertexShaderSource) {
   }
 
   let modifiedVS = vertexShaderSource;
-  modifiedVS = modifiedVS.replace(/attribute\s+vec3\s+normal;/g, "");
-  modifiedVS = modifiedVS.replace(/attribute\s+vec2\s+st;/g, "");
-  modifiedVS = modifiedVS.replace(/attribute\s+vec3\s+tangent;/g, "");
-  modifiedVS = modifiedVS.replace(/attribute\s+vec3\s+bitangent;/g, "");
+  modifiedVS = modifiedVS.replace(/in\s+vec3\s+normal;/g, "");
+  modifiedVS = modifiedVS.replace(/in\s+vec2\s+st;/g, "");
+  modifiedVS = modifiedVS.replace(/in\s+vec3\s+tangent;/g, "");
+  modifiedVS = modifiedVS.replace(/in\s+vec3\s+bitangent;/g, "");
   modifiedVS = ShaderSource.replaceMain(modifiedVS, "czm_non_compressed_main");
   const compressedMain =
     `${"void main() \n" + "{ \n"}${decode}    czm_non_compressed_main(); \n` +
@@ -1125,19 +1123,12 @@ function depthClampFS(fragmentShaderSource) {
   modifiedFS +=
     "void main() {\n" +
     "    czm_non_depth_clamp_main();\n" +
-    "#if defined(GL_EXT_frag_depth)\n" +
     "    #if defined(LOG_DEPTH)\n" +
     "        czm_writeLogDepth();\n" +
     "    #else\n" +
     "        czm_writeDepthClamp();\n" +
     "    #endif\n" +
-    "#endif\n" +
     "}\n";
-  modifiedFS = `${
-    "#ifdef GL_EXT_frag_depth\n" +
-    "#extension GL_EXT_frag_depth : enable\n" +
-    "#endif\n"
-  }${modifiedFS}`;
   return modifiedFS;
 }
 
@@ -2397,7 +2388,7 @@ function createPickIdProperty(primitive, properties, index) {
  * Returns the modifiable per-instance attributes for a {@link GeometryInstance}.
  *
  * @param {*} id The id of the {@link GeometryInstance}.
- * @returns {Object} The typed array in the attribute's format or undefined if the is no instance with id.
+ * @returns {object} The typed array in the attribute's format or undefined if the is no instance with id.
  *
  * @exception {DeveloperError} must call update before calling getGeometryInstanceAttributes.
  *
@@ -2420,6 +2411,11 @@ Primitive.prototype.getGeometryInstanceAttributes = function (id) {
   }
   //>>includeEnd('debug');
 
+  let attributes = this._perInstanceAttributeCache.get(id);
+  if (defined(attributes)) {
+    return attributes;
+  }
+
   let index = -1;
   const lastIndex = this._lastPerInstanceAttributeIndex;
   const ids = this._instanceIds;
@@ -2436,11 +2432,6 @@ Primitive.prototype.getGeometryInstanceAttributes = function (id) {
     return undefined;
   }
 
-  let attributes = this._perInstanceAttributeCache[index];
-  if (defined(attributes)) {
-    return attributes;
-  }
-
   const batchTable = this._batchTable;
   const perInstanceAttributeIndices = this._batchTableAttributeIndices;
   attributes = {};
@@ -2461,7 +2452,7 @@ Primitive.prototype.getGeometryInstanceAttributes = function (id) {
   Object.defineProperties(attributes, properties);
 
   this._lastPerInstanceAttributeIndex = index;
-  this._perInstanceAttributeCache[index] = attributes;
+  this._perInstanceAttributeCache.set(id, attributes);
   return attributes;
 };
 
@@ -2472,7 +2463,7 @@ Primitive.prototype.getGeometryInstanceAttributes = function (id) {
  * <code>isDestroyed</code> will result in a {@link DeveloperError} exception.
  * </p>
  *
- * @returns {Boolean} <code>true</code> if this object was destroyed; otherwise, <code>false</code>.
+ * @returns {boolean} <code>true</code> if this object was destroyed; otherwise, <code>false</code>.
  *
  * @see Primitive#destroy
  */

package/Source/Scene/PrimitiveCollection.js

@@ -12,9 +12,9 @@ import DeveloperError from "../Core/DeveloperError.js";
  * @alias PrimitiveCollection
  * @constructor
  *
- * @param {Object} [options] Object with the following properties:
- * @param {Boolean} [options.show=true] Determines if the primitives in the collection will be shown.
- * @param {Boolean} [options.destroyPrimitives=true] Determines if primitives in the collection are destroyed when they are removed.
+ * @param {object} [options] Object with the following properties:
+ * @param {boolean} [options.show=true] Determines if the primitives in the collection will be shown.
+ * @param {boolean} [options.destroyPrimitives=true] Determines if primitives in the collection are destroyed when they are removed.
  *
  * @example
  * const billboards = new Cesium.BillboardCollection();
@@ -38,7 +38,7 @@ function PrimitiveCollection(options) {
   /**
    * Determines if primitives in this collection will be shown.
    *
-   * @type {Boolean}
+   * @type {boolean}
    * @default true
    */
   this.show = defaultValue(options.show, true);
@@ -48,7 +48,7 @@ function PrimitiveCollection(options) {
    * {@link PrimitiveCollection#destroy} or  {@link PrimitiveCollection#remove} or implicitly
    * by {@link PrimitiveCollection#removeAll}.
    *
-   * @type {Boolean}
+   * @type {boolean}
    * @default true
    *
    * @example
@@ -76,7 +76,7 @@ Object.defineProperties(PrimitiveCollection.prototype, {
    *
    * @memberof PrimitiveCollection.prototype
    *
-   * @type {Number}
+   * @type {number}
    * @readonly
    */
   length: {
@@ -89,9 +89,9 @@ Object.defineProperties(PrimitiveCollection.prototype, {
 /**
  * Adds a primitive to the collection.
  *
- * @param {Object} primitive The primitive to add.
- * @param {Number} [index] The index to add the layer at.  If omitted, the primitive will be added at the bottom of all existing primitives.
- * @returns {Object} The primitive added to the collection.
+ * @param {object} primitive The primitive to add.
+ * @param {number} [index] The index to add the layer at.  If omitted, the primitive will be added at the bottom of all existing primitives.
+ * @returns {object} The primitive added to the collection.
  *
  * @exception {DeveloperError} This object was destroyed, i.e., destroy() was called.
  *
@@ -134,8 +134,8 @@ PrimitiveCollection.prototype.add = function (primitive, index) {
 /**
  * Removes a primitive from the collection.
  *
- * @param {Object} [primitive] The primitive to remove.
- * @returns {Boolean} <code>true</code> if the primitive was removed; <code>false</code> if the primitive is <code>undefined</code> or was not found in the collection.
+ * @param {object} [primitive] The primitive to remove.
+ * @returns {boolean} <code>true</code> if the primitive was removed; <code>false</code> if the primitive is <code>undefined</code> or was not found in the collection.
  *
  * @exception {DeveloperError} This object was destroyed, i.e., destroy() was called.
  *
@@ -201,8 +201,8 @@ PrimitiveCollection.prototype.removeAll = function () {
 /**
  * Determines if this collection contains a primitive.
  *
- * @param {Object} [primitive] The primitive to check for.
- * @returns {Boolean} <code>true</code> if the primitive is in the collection; <code>false</code> if the primitive is <code>undefined</code> or was not found in the collection.
+ * @param {object} [primitive] The primitive to check for.
+ * @returns {boolean} <code>true</code> if the primitive is in the collection; <code>false</code> if the primitive is <code>undefined</code> or was not found in the collection.
  *
  * @exception {DeveloperError} This object was destroyed, i.e., destroy() was called.
  *
@@ -231,7 +231,7 @@ function getPrimitiveIndex(compositePrimitive, primitive) {
  * Raises a primitive "up one" in the collection.  If all primitives in the collection are drawn
  * on the globe surface, this visually moves the primitive up one.
  *
- * @param {Object} [primitive] The primitive to raise.
+ * @param {object} [primitive] The primitive to raise.
  *
  * @exception {DeveloperError} primitive is not in this collection.
  * @exception {DeveloperError} This object was destroyed, i.e., destroy() was called.
@@ -257,7 +257,7 @@ PrimitiveCollection.prototype.raise = function (primitive) {
  * Raises a primitive to the "top" of the collection.  If all primitives in the collection are drawn
  * on the globe surface, this visually moves the primitive to the top.
  *
- * @param {Object} [primitive] The primitive to raise the top.
+ * @param {object} [primitive] The primitive to raise the top.
  *
  * @exception {DeveloperError} primitive is not in this collection.
  * @exception {DeveloperError} This object was destroyed, i.e., destroy() was called.
@@ -283,7 +283,7 @@ PrimitiveCollection.prototype.raiseToTop = function (primitive) {
  * Lowers a primitive "down one" in the collection.  If all primitives in the collection are drawn
  * on the globe surface, this visually moves the primitive down one.
  *
- * @param {Object} [primitive] The primitive to lower.
+ * @param {object} [primitive] The primitive to lower.
  *
  * @exception {DeveloperError} primitive is not in this collection.
  * @exception {DeveloperError} This object was destroyed, i.e., destroy() was called.
@@ -309,7 +309,7 @@ PrimitiveCollection.prototype.lower = function (primitive) {
  * Lowers a primitive to the "bottom" of the collection.  If all primitives in the collection are drawn
  * on the globe surface, this visually moves the primitive to the bottom.
  *
- * @param {Object} [primitive] The primitive to lower to the bottom.
+ * @param {object} [primitive] The primitive to lower to the bottom.
  *
  * @exception {DeveloperError} primitive is not in this collection.
  * @exception {DeveloperError} This object was destroyed, i.e., destroy() was called.
@@ -334,8 +334,8 @@ PrimitiveCollection.prototype.lowerToBottom = function (primitive) {
 /**
  * Returns the primitive in the collection at the specified index.
  *
- * @param {Number} index The zero-based index of the primitive to return.
- * @returns {Object} The primitive at the <code>index</code>.
+ * @param {number} index The zero-based index of the primitive to return.
+ * @returns {object} The primitive at the <code>index</code>.
  *
  * @exception {DeveloperError} This object was destroyed, i.e., destroy() was called.
  *
@@ -432,7 +432,7 @@ PrimitiveCollection.prototype.postPassesUpdate = function (frameState) {
  * If this object was destroyed, it should not be used; calling any function other than
  * <code>isDestroyed</code> will result in a {@link DeveloperError} exception.
  *
- * @returns {Boolean} True if this object was destroyed; otherwise, false.
+ * @returns {boolean} True if this object was destroyed; otherwise, false.
  *
  * @see PrimitiveCollection#destroy
  */

package/Source/Scene/PrimitiveLoadPlan.js

@@ -37,7 +37,7 @@ function AttributeLoadPlan(attribute) {
    * Whether the attribute will be loaded as a GPU buffer by the time
    * {@link PrimitiveLoadPlan#postProcess} is finished.
    *
-   * @type {Boolean}
+   * @type {boolean}
    * @private
    */
   this.loadBuffer = false;
@@ -46,7 +46,7 @@ function AttributeLoadPlan(attribute) {
    * Whether the attribute will be loaded as a packed typed array by the time
    * {@link PrimitiveLoadPlan#postProcess} is finished.
    *
-   * @type {Boolean}
+   * @type {boolean}
    * @private
    */
   this.loadTypedArray = false;
@@ -81,7 +81,7 @@ function IndicesLoadPlan(indices) {
    * Whether the indices will be loaded as a GPU buffer by the time
    * {@link PrimitiveLoadPlan#postProcess} is finished.
    *
-   * @type {Boolean}
+   * @type {boolean}
    * @private
    */
   this.loadBuffer = false;
@@ -90,7 +90,7 @@ function IndicesLoadPlan(indices) {
    * Whether the indices will be loaded as a typed array copy of the GPU
    * buffer by the time {@link PrimitiveLoadPlan#postProcess} is finished.
    *
-   * @type {Boolean}
+   * @type {boolean}
    * @private
    */
   this.loadTypedArray = false;
@@ -145,7 +145,7 @@ function PrimitiveLoadPlan(primitive) {
    * Set this true to indicate that the primitive has the
    * CESIUM_primitive_outline extension and needs to be post-processed
    *
-   * @type {Boolean}
+   * @type {boolean}
    * @private
    */
   this.needsOutlines = false;
@@ -153,7 +153,7 @@ function PrimitiveLoadPlan(primitive) {
   /**
    * The outline edge indices from the CESIUM_primitive_outline extension
    *
-   * @type {Number[]}
+   * @type {number[]}
    * @private
    */
   this.outlineIndices = undefined;

package/Source/Scene/PropertyAttribute.js

@@ -10,10 +10,10 @@ import PropertyAttributeProperty from "./PropertyAttributeProperty.js";
  * See the {@link https://github.com/CesiumGS/glTF/tree/3d-tiles-next/extensions/2.0/Vendor/EXT_structural_metadata|EXT_structural_metadata Extension}
  * </p>
  *
- * @param {Object} options Object with the following properties:
- * @param {String} [options.name] Optional human-readable name to describe the attribute
- * @param {Number} [options.id] A unique id to identify the property attribute, useful for debugging. This is the array index in the property attributes array
- * @param {Object} options.propertyAttribute The property attribute JSON, following the EXT_structural_metadata schema.
+ * @param {object} options Object with the following properties:
+ * @param {string} [options.name] Optional human-readable name to describe the attribute
+ * @param {number} [options.id] A unique id to identify the property attribute, useful for debugging. This is the array index in the property attributes array
+ * @param {object} options.propertyAttribute The property attribute JSON, following the EXT_structural_metadata schema.
  * @param {MetadataClass} options.class The class that properties conform to.
  *
  * @alias PropertyAttribute
@@ -58,7 +58,7 @@ Object.defineProperties(PropertyAttribute.prototype, {
    *
    * @memberof PropertyAttribute.prototype
    *
-   * @type {String}
+   * @type {string}
    * @readonly
    * @private
    */
@@ -72,7 +72,7 @@ Object.defineProperties(PropertyAttribute.prototype, {
    *
    * @memberof PropertyAttribute.prototype
    *
-   * @type {String|Number}
+   * @type {string|number}
    * @readonly
    * @private
    */
@@ -101,7 +101,7 @@ Object.defineProperties(PropertyAttribute.prototype, {
    *
    * @memberof PropertyAttribute.prototype
    *
-   * @type {Object.<String, PropertyAttributeProperty>}
+   * @type {Object<string, PropertyAttributeProperty>}
    * @readonly
    * @private
    */
@@ -131,7 +131,7 @@ Object.defineProperties(PropertyAttribute.prototype, {
    *
    * @memberof PropertyAttribute.prototype
    *
-   * @type {Object}
+   * @type {object}
    * @readonly
    * @private
    */
@@ -145,7 +145,7 @@ Object.defineProperties(PropertyAttribute.prototype, {
 /**
  * Gets the property with the given property ID.
  *
- * @param {String} propertyId The case-sensitive ID of the property.
+ * @param {string} propertyId The case-sensitive ID of the property.
  * @returns {PropertyAttributeProperty|undefined} The property, or <code>undefined</code> if the property does not exist.
  * @private
  */

package/Source/Scene/PropertyAttributeProperty.js

@@ -9,8 +9,8 @@ import defined from "../Core/defined.js";
  * See the {@link https://github.com/CesiumGS/glTF/tree/3d-tiles-next/extensions/2.0/Vendor/EXT_structural_metadata|EXT_structural_metadata Extension}
  * </p>
  *
- * @param {Object} options Object with the following properties:
- * @param {Object} options.property The property JSON object.
+ * @param {object} options Object with the following properties:
+ * @param {object} options.property The property JSON object.
  * @param {MetadataClassProperty} options.classProperty The class property.
  *
  * @alias PropertyAttributeProperty
@@ -66,7 +66,7 @@ Object.defineProperties(PropertyAttributeProperty.prototype, {
    * The attribute semantic
    *
    * @memberof PropertyAttributeProperty.prototype
-   * @type {String}
+   * @type {string}
    * @readonly
    * @private
    */
@@ -81,7 +81,7 @@ Object.defineProperties(PropertyAttributeProperty.prototype, {
    * undefined, they default to identity so this property is set false
    *
    * @memberof MetadataClassProperty.prototype
-   * @type {Boolean}
+   * @type {boolean}
    * @readonly
    * @private
    */
@@ -95,7 +95,7 @@ Object.defineProperties(PropertyAttributeProperty.prototype, {
    * The offset to be added to property values as part of the value transform.
    *
    * @memberof MetadataClassProperty.prototype
-   * @type {Number|Cartesian2|Cartesian3|Cartesian4|Matrix2|Matrix3|Matrix4}
+   * @type {number|Cartesian2|Cartesian3|Cartesian4|Matrix2|Matrix3|Matrix4}
    * @readonly
    * @private
    */
@@ -109,7 +109,7 @@ Object.defineProperties(PropertyAttributeProperty.prototype, {
    * The scale to be multiplied to property values as part of the value transform.
    *
    * @memberof MetadataClassProperty.prototype
-   * @type {Number|Cartesian2|Cartesian3|Cartesian4|Matrix2|Matrix3|Matrix4}
+   * @type {number|Cartesian2|Cartesian3|Cartesian4|Matrix2|Matrix3|Matrix4}
    * @readonly
    * @private
    */