@cesium/engine 2.0.0 → 2.2.0

package/Source/Scene/Composite3DTileContent.js

@@ -1,5 +1,6 @@
 import defaultValue from "../Core/defaultValue.js";
 import defined from "../Core/defined.js";
+import deprecationWarning from "../Core/deprecationWarning.js";
 import destroyObject from "../Core/destroyObject.js";
 import getMagic from "../Core/getMagic.js";
 import RuntimeError from "../Core/RuntimeError.js";
@@ -17,23 +18,24 @@ import RuntimeError from "../Core/RuntimeError.js";
  *
  * @private
  */
-function Composite3DTileContent(
-  tileset,
-  tile,
-  resource,
-  arrayBuffer,
-  byteOffset,
-  factory
-) {
+function Composite3DTileContent(tileset, tile, resource, contents) {
   this._tileset = tileset;
   this._tile = tile;
   this._resource = resource;
-  this._contents = [];
+
+  if (!defined(contents)) {
+    contents = [];
+  }
+  this._contents = contents;
 
   this._metadata = undefined;
   this._group = undefined;
+  this._ready = false;
 
-  this._readyPromise = initialize(this, arrayBuffer, byteOffset, factory);
+  this._resolveContent = undefined;
+  this._readyPromise = new Promise((resolve) => {
+    this._resolveContent = resolve;
+  });
 }
 
 Object.defineProperties(Composite3DTileContent.prototype, {
@@ -130,8 +132,37 @@ Object.defineProperties(Composite3DTileContent.prototype, {
     },
   },
 
+  /**
+   * Returns true when the tile's content is ready to render; otherwise false
+   *
+   * @memberof Composite3DTileContent.prototype
+   *
+   * @type {boolean}
+   * @readonly
+   * @private
+   */
+  ready: {
+    get: function () {
+      return this._ready;
+    },
+  },
+
+  /**
+   * Gets the promise that will be resolved when the tile's content is ready to render.
+   *
+   * @memberof Composite3DTileContent.prototype
+   *
+   * @type {Promise<Composite3DTileContent>}
+   * @readonly
+   * @deprecated
+   * @private
+   */
   readyPromise: {
     get: function () {
+      deprecationWarning(
+        "Composite3DTileContent.readyPromise",
+        "Composite3DTileContent.readyPromise was deprecated in CesiumJS 1.104. It will be removed in 1.107. Wait for Composite3DTileContent.ready to return true instead."
+      );
       return this._readyPromise;
     },
   },
@@ -210,7 +241,14 @@ Object.defineProperties(Composite3DTileContent.prototype, {
 
 const sizeOfUint32 = Uint32Array.BYTES_PER_ELEMENT;
 
-function initialize(content, arrayBuffer, byteOffset, factory) {
+Composite3DTileContent.fromTileType = async function (
+  tileset,
+  tile,
+  resource,
+  arrayBuffer,
+  byteOffset,
+  factory
+) {
   byteOffset = defaultValue(byteOffset, 0);
 
   const uint8Array = new Uint8Array(arrayBuffer);
@@ -231,14 +269,11 @@ function initialize(content, arrayBuffer, byteOffset, factory) {
   const tilesLength = view.getUint32(byteOffset, true);
   byteOffset += sizeOfUint32;
 
-  const contentPromises = [];
-
   // For caching purposes, models within the composite tile must be
   // distinguished. To do this, add a query parameter ?compositeIndex=i.
   // Since composite tiles may contain other composite tiles, check for an
   // existing prefix and separate them with underscores. e.g.
   // ?compositeIndex=0_1_1
-  const resource = content._resource;
   let prefix = resource.queryParameters.compositeIndex;
   if (defined(prefix)) {
     // We'll be adding another value at the end, so add an underscore.
@@ -248,6 +283,8 @@ function initialize(content, arrayBuffer, byteOffset, factory) {
     prefix = "";
   }
 
+  const promises = [];
+  promises.length = tilesLength;
   for (let i = 0; i < tilesLength; ++i) {
     const tileType = getMagic(uint8Array, byteOffset);
 
@@ -265,15 +302,9 @@ function initialize(content, arrayBuffer, byteOffset, factory) {
     });
 
     if (defined(contentFactory)) {
-      const innerContent = contentFactory(
-        content._tileset,
-        content._tile,
-        childResource,
-        arrayBuffer,
-        byteOffset
+      promises[i] = Promise.resolve(
+        contentFactory(tileset, tile, childResource, arrayBuffer, byteOffset)
       );
-      content._contents.push(innerContent);
-      contentPromises.push(innerContent.readyPromise);
     } else {
       throw new RuntimeError(
         `Unknown tile content type, ${tileType}, inside Composite tile`
@@ -283,10 +314,15 @@ function initialize(content, arrayBuffer, byteOffset, factory) {
     byteOffset += tileByteLength;
   }
 
-  return Promise.all(contentPromises).then(function () {
-    return content;
-  });
-}
+  const innerContents = await Promise.all(promises);
+  const content = new Composite3DTileContent(
+    tileset,
+    tile,
+    resource,
+    innerContents
+  );
+  return content;
+};
 
 /**
  * Part of the {@link Cesium3DTileContent} interface.  <code>Composite3DTileContent</code>
@@ -326,8 +362,15 @@ Composite3DTileContent.prototype.applyStyle = function (style) {
 Composite3DTileContent.prototype.update = function (tileset, frameState) {
   const contents = this._contents;
   const length = contents.length;
+  let ready = true;
   for (let i = 0; i < length; ++i) {
     contents[i].update(tileset, frameState);
+    ready = ready && contents[i].ready;
+  }
+
+  if (!this._ready && ready) {
+    this._ready = true;
+    this._resolveContent(this);
   }
 };
 

package/Source/Scene/ConditionsExpression.js

@@ -15,8 +15,8 @@ import Expression from "./Expression.js";
  * @alias ConditionsExpression
  * @constructor
  *
- * @param {Object} [conditionsExpression] The conditions expression defined using the 3D Tiles Styling language.
- * @param {Object} [defines] Defines in the style.
+ * @param {object} [conditionsExpression] The conditions expression defined using the 3D Tiles Styling language.
+ * @param {object} [defines] Defines in the style.
  *
  * @example
  * const expression = new Cesium.ConditionsExpression({
@@ -42,7 +42,7 @@ Object.defineProperties(ConditionsExpression.prototype, {
    *
    * @memberof ConditionsExpression.prototype
    *
-   * @type {Object}
+   * @type {object}
    * @readonly
    *
    * @default undefined
@@ -91,8 +91,8 @@ function setRuntime(expression, defines) {
  * a {@link Color}, the {@link Cartesian4} value is converted to a {@link Color} and then returned.
  *
  * @param {Cesium3DTileFeature} feature The feature whose properties may be used as variables in the expression.
- * @param {Object} [result] The object onto which to store the result.
- * @returns {Boolean|Number|String|RegExp|Cartesian2|Cartesian3|Cartesian4|Color} The result of evaluating the expression.
+ * @param {object} [result] The object onto which to store the result.
+ * @returns {boolean|number|string|RegExp|Cartesian2|Cartesian3|Cartesian4|Color} The result of evaluating the expression.
  */
 ConditionsExpression.prototype.evaluate = function (feature, result) {
   const conditions = this._runtimeConditions;
@@ -135,12 +135,12 @@ ConditionsExpression.prototype.evaluateColor = function (feature, result) {
  * Gets the shader function for this expression.
  * Returns undefined if the shader function can't be generated from this expression.
  *
- * @param {String} functionSignature Signature of the generated function.
- * @param {Object} variableSubstitutionMap Maps variable names to shader variable names.
- * @param {Object} shaderState Stores information about the generated shader function, including whether it is translucent.
- * @param {String} returnType The return type of the generated function.
+ * @param {string} functionSignature Signature of the generated function.
+ * @param {object} variableSubstitutionMap Maps variable names to shader variable names.
+ * @param {object} shaderState Stores information about the generated shader function, including whether it is translucent.
+ * @param {string} returnType The return type of the generated function.
  *
- * @returns {String} The shader function.
+ * @returns {string} The shader function.
  *
  * @private
  */
@@ -188,7 +188,7 @@ ConditionsExpression.prototype.getShaderFunction = function (
 /**
  * Gets the variables used by the expression.
  *
- * @returns {String[]} The variables used by the expression.
+ * @returns {string[]} The variables used by the expression.
  *
  * @private
  */

package/Source/Scene/ConeEmitter.js

@@ -12,7 +12,7 @@ const defaultAngle = CesiumMath.toRadians(30.0);
  * @alias ConeEmitter
  * @constructor
  *
- * @param {Number} [angle=Cesium.Math.toRadians(30.0)] The angle of the cone in radians.
+ * @param {number} [angle=Cesium.Math.toRadians(30.0)] The angle of the cone in radians.
  */
 function ConeEmitter(angle) {
   this._angle = defaultValue(angle, defaultAngle);
@@ -22,7 +22,7 @@ Object.defineProperties(ConeEmitter.prototype, {
   /**
    * The angle of the cone in radians.
    * @memberof CircleEmitter.prototype
-   * @type {Number}
+   * @type {number}
    * @default Cesium.Math.toRadians(30.0)
    */
   angle: {

package/Source/Scene/ContentMetadata.js

@@ -9,8 +9,8 @@ import MetadataEntity from "./MetadataEntity.js";
  * See the {@link https://github.com/CesiumGS/3d-tiles/tree/main/extensions/3DTILES_metadata|3DTILES_metadata Extension} for 3D Tiles
  * </p>
  *
- * @param {Object} options Object with the following properties:
- * @param {Object} options.content Either the content metadata JSON (3D Tiles 1.1) or the extension JSON attached to the content.
+ * @param {object} options Object with the following properties:
+ * @param {object} options.content Either the content metadata JSON (3D Tiles 1.1) or the extension JSON attached to the content.
  * @param {MetadataClass} options.class The class that the content metadata conforms to.
  *
  * @alias ContentMetadata
@@ -53,7 +53,7 @@ Object.defineProperties(ContentMetadata.prototype, {
    * Extra user-defined properties.
    *
    * @memberof ContentMetadata.prototype
-   * @type {Object}
+   * @type {object}
    * @readonly
    * @private
    */
@@ -67,7 +67,7 @@ Object.defineProperties(ContentMetadata.prototype, {
    * An object containing extensions.
    *
    * @memberof ContentMetadata.prototype
-   * @type {Object}
+   * @type {object}
    * @readonly
    * @private
    */
@@ -81,8 +81,8 @@ Object.defineProperties(ContentMetadata.prototype, {
 /**
  * Returns whether the content has this property.
  *
- * @param {String} propertyId The case-sensitive ID of the property.
- * @returns {Boolean} Whether the content has this property.
+ * @param {string} propertyId The case-sensitive ID of the property.
+ * @returns {boolean} Whether the content has this property.
  * @private
  */
 ContentMetadata.prototype.hasProperty = function (propertyId) {
@@ -92,8 +92,8 @@ ContentMetadata.prototype.hasProperty = function (propertyId) {
 /**
  * Returns whether the content has a property with the given semantic.
  *
- * @param {String} semantic The case-sensitive semantic of the property.
- * @returns {Boolean} Whether the content has a property with the given semantic.
+ * @param {string} semantic The case-sensitive semantic of the property.
+ * @returns {boolean} Whether the content has a property with the given semantic.
  * @private
  */
 ContentMetadata.prototype.hasPropertyBySemantic = function (semantic) {
@@ -107,8 +107,8 @@ ContentMetadata.prototype.hasPropertyBySemantic = function (semantic) {
 /**
  * Returns an array of property IDs.
  *
- * @param {String[]} [results] An array into which to store the results.
- * @returns {String[]} The property IDs.
+ * @param {string[]} [results] An array into which to store the results.
+ * @returns {string[]} The property IDs.
  * @private
  */
 ContentMetadata.prototype.getPropertyIds = function (results) {
@@ -121,7 +121,7 @@ ContentMetadata.prototype.getPropertyIds = function (results) {
  * If the property is normalized the normalized value is returned.
  * </p>
  *
- * @param {String} propertyId The case-sensitive ID of the property.
+ * @param {string} propertyId The case-sensitive ID of the property.
  * @returns {*} The value of the property or <code>undefined</code> if the content does not have this property.
  * @private
  */
@@ -135,9 +135,9 @@ ContentMetadata.prototype.getProperty = function (propertyId) {
  * If the property is normalized a normalized value must be provided to this function.
  * </p>
  *
- * @param {String} propertyId The case-sensitive ID of the property.
+ * @param {string} propertyId The case-sensitive ID of the property.
  * @param {*} value The value of the property that will be copied.
- * @returns {Boolean} <code>true</code> if the property was set, <code>false</code> otherwise.
+ * @returns {boolean} <code>true</code> if the property was set, <code>false</code> otherwise.
  * @private
  */
 ContentMetadata.prototype.setProperty = function (propertyId, value) {
@@ -152,7 +152,7 @@ ContentMetadata.prototype.setProperty = function (propertyId, value) {
 /**
  * Returns a copy of the value of the property with the given semantic.
  *
- * @param {String} semantic The case-sensitive semantic of the property.
+ * @param {string} semantic The case-sensitive semantic of the property.
  * @returns {*} The value of the property or <code>undefined</code> if the content does not have this semantic.
  * @private
  */
@@ -167,9 +167,9 @@ ContentMetadata.prototype.getPropertyBySemantic = function (semantic) {
 /**
  * Sets the value of the property with the given semantic.
  *
- * @param {String} semantic The case-sensitive semantic of the property.
+ * @param {string} semantic The case-sensitive semantic of the property.
  * @param {*} value The value of the property that will be copied.
- * @returns {Boolean} <code>true</code> if the property was set, <code>false</code> otherwise.
+ * @returns {boolean} <code>true</code> if the property was set, <code>false</code> otherwise.
  * @private
  */
 ContentMetadata.prototype.setPropertyBySemantic = function (semantic, value) {

package/Source/Scene/CreditDisplay.js

@@ -174,7 +174,7 @@ function addStyle(selector, styles) {
   return style;
 }
 
-function appendCss() {
+function appendCss(container) {
   let style = "";
   style += addStyle(".cesium-credit-lightbox-overlay", {
     display: "none",
@@ -270,17 +270,33 @@ function appendCss() {
     }
   );
 
-  const head = document.head;
+  function getShadowRoot(container) {
+    if (container.shadowRoot) {
+      return container.shadowRoot;
+    }
+    if (container.getRootNode) {
+      const root = container.getRootNode();
+      if (root instanceof ShadowRoot) {
+        return root;
+      }
+    }
+    return undefined;
+  }
+
+  const shadowRootOrDocumentHead = defaultValue(
+    getShadowRoot(container),
+    document.head
+  );
   const css = document.createElement("style");
   css.innerHTML = style;
-  head.insertBefore(css, head.firstChild);
+  shadowRootOrDocumentHead.appendChild(css);
 }
 
 /**
  * The credit display is responsible for displaying credits on screen.
  *
  * @param {HTMLElement} container The HTML element where credits will be displayed
- * @param {String} [delimiter= ' • '] The string to separate text credits
+ * @param {string} [delimiter= ' • '] The string to separate text credits
  * @param {HTMLElement} [viewport=document.body] The HTML element that will contain the credits popup
  *
  * @alias CreditDisplay
@@ -343,7 +359,7 @@ function CreditDisplay(container, delimiter, viewport) {
   expandLink.textContent = "Data attribution";
   container.appendChild(expandLink);
 
-  appendCss();
+  appendCss(container);
   const cesiumCredit = Credit.clone(CreditDisplay.cesiumCredit);
 
   this._delimiter = defaultValue(delimiter, " • ");
@@ -550,7 +566,7 @@ CreditDisplay.prototype.destroy = function () {
  * Returns true if this object was destroyed; otherwise, false.
  * <br /><br />
  *
- * @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>.
  */
 CreditDisplay.prototype.isDestroyed = function () {
   return false;

package/Source/Scene/CullFace.js

@@ -3,13 +3,13 @@ import WebGLConstants from "../Core/WebGLConstants.js";
 /**
  * Determines which triangles, if any, are culled.
  *
- * @enum {Number}
+ * @enum {number}
  */
 const CullFace = {
   /**
    * Front-facing triangles are culled.
    *
-   * @type {Number}
+   * @type {number}
    * @constant
    */
   FRONT: WebGLConstants.FRONT,
@@ -17,7 +17,7 @@ const CullFace = {
   /**
    * Back-facing triangles are culled.
    *
-   * @type {Number}
+   * @type {number}
    * @constant
    */
   BACK: WebGLConstants.BACK,
@@ -25,7 +25,7 @@ const CullFace = {
   /**
    * Both front-facing and back-facing triangles are culled.
    *
-   * @type {Number}
+   * @type {number}
    * @constant
    */
   FRONT_AND_BACK: WebGLConstants.FRONT_AND_BACK,

package/Source/Scene/CumulusCloud.js

@@ -88,7 +88,7 @@ Object.defineProperties(CumulusCloud.prototype, {
    * Determines if this cumulus cloud will be shown.  Use this to hide or show a cloud, instead
    * of removing it and re-adding it to the collection.
    * @memberof CumulusCloud.prototype
-   * @type {Boolean}
+   * @type {boolean}
    * @default true
    */
   show: {
@@ -293,7 +293,7 @@ Object.defineProperties(CumulusCloud.prototype, {
    * </div>
    *
    * @memberof CumulusCloud.prototype
-   * @type {Number}
+   * @type {number}
    * @default -1.0
    */
   slice: {
@@ -325,7 +325,7 @@ Object.defineProperties(CumulusCloud.prototype, {
    * </tr></table>
    * </div>
    * @memberof CumulusCloud.prototype
-   * @type {Number}
+   * @type {number}
    * @default 1.0
    */
   brightness: {

package/Source/Scene/DebugAppearance.js

@@ -14,13 +14,13 @@ import Appearance from "./Appearance.js";
  * @alias DebugAppearance
  * @constructor
  *
- * @param {Object} options Object with the following properties:
- * @param {String} options.attributeName The name of the attribute to visualize.
- * @param {Boolean} [options.perInstanceAttribute=false] Boolean that determines whether this attribute is a per-instance geometry attribute.
- * @param {String} [options.glslDatatype='vec3'] The GLSL datatype of the attribute.  Supported datatypes are <code>float</code>, <code>vec2</code>, <code>vec3</code>, and <code>vec4</code>.
- * @param {String} [options.vertexShaderSource] Optional GLSL vertex shader source to override the default vertex shader.
- * @param {String} [options.fragmentShaderSource] Optional GLSL fragment shader source to override the default fragment shader.
- * @param {Object} [options.renderState] Optional render state to override the default render state.
+ * @param {object} options Object with the following properties:
+ * @param {string} options.attributeName The name of the attribute to visualize.
+ * @param {boolean} [options.perInstanceAttribute=false] Boolean that determines whether this attribute is a per-instance geometry attribute.
+ * @param {string} [options.glslDatatype='vec3'] The GLSL datatype of the attribute.  Supported datatypes are <code>float</code>, <code>vec2</code>, <code>vec3</code>, and <code>vec4</code>.
+ * @param {string} [options.vertexShaderSource] Optional GLSL vertex shader source to override the default vertex shader.
+ * @param {string} [options.fragmentShaderSource] Optional GLSL fragment shader source to override the default fragment shader.
+ * @param {object} [options.renderState] Optional render state to override the default render state.
  *
  * @exception {DeveloperError} options.glslDatatype must be float, vec2, vec3, or vec4.
  *
@@ -122,7 +122,7 @@ function DebugAppearance(options) {
   /**
    * When <code>true</code>, the geometry is expected to appear translucent.
    *
-   * @type {Boolean}
+   * @type {boolean}
    *
    * @default false
    */
@@ -149,7 +149,7 @@ Object.defineProperties(DebugAppearance.prototype, {
    *
    * @memberof DebugAppearance.prototype
    *
-   * @type {String}
+   * @type {string}
    * @readonly
    */
   vertexShaderSource: {
@@ -165,7 +165,7 @@ Object.defineProperties(DebugAppearance.prototype, {
    *
    * @memberof DebugAppearance.prototype
    *
-   * @type {String}
+   * @type {string}
    * @readonly
    */
   fragmentShaderSource: {
@@ -179,7 +179,7 @@ Object.defineProperties(DebugAppearance.prototype, {
    *
    * @memberof DebugAppearance.prototype
    *
-   * @type {Object}
+   * @type {object}
    * @readonly
    */
   renderState: {
@@ -193,7 +193,7 @@ Object.defineProperties(DebugAppearance.prototype, {
    *
    * @memberof DebugAppearance.prototype
    *
-   * @type {Boolean}
+   * @type {boolean}
    * @readonly
    *
    * @default false
@@ -209,7 +209,7 @@ Object.defineProperties(DebugAppearance.prototype, {
    *
    * @memberof DebugAppearance.prototype
    *
-   * @type {String}
+   * @type {string}
    * @readonly
    */
   attributeName: {
@@ -223,7 +223,7 @@ Object.defineProperties(DebugAppearance.prototype, {
    *
    * @memberof DebugAppearance.prototype
    *
-   * @type {String}
+   * @type {string}
    * @readonly
    */
   glslDatatype: {
@@ -239,7 +239,7 @@ Object.defineProperties(DebugAppearance.prototype, {
  *
  * @function
  *
- * @returns {String} The full GLSL fragment shader source.
+ * @returns {string} The full GLSL fragment shader source.
  */
 DebugAppearance.prototype.getFragmentShaderSource =
   Appearance.prototype.getFragmentShaderSource;
@@ -249,7 +249,7 @@ DebugAppearance.prototype.getFragmentShaderSource =
  *
  * @function
  *
- * @returns {Boolean} <code>true</code> if the appearance is translucent.
+ * @returns {boolean} <code>true</code> if the appearance is translucent.
  */
 DebugAppearance.prototype.isTranslucent = Appearance.prototype.isTranslucent;
 
@@ -260,7 +260,7 @@ DebugAppearance.prototype.isTranslucent = Appearance.prototype.isTranslucent;
  *
  * @function
  *
- * @returns {Object} The render state.
+ * @returns {object} The render state.
  */
 DebugAppearance.prototype.getRenderState = Appearance.prototype.getRenderState;
 export default DebugAppearance;

package/Source/Scene/DebugCameraPrimitive.js

@@ -23,13 +23,13 @@ import Primitive from "./Primitive.js";
  * @alias DebugCameraPrimitive
  * @constructor
  *
- * @param {Object} options Object with the following properties:
+ * @param {object} options Object with the following properties:
  * @param {Camera} options.camera The camera.
- * @param {Number[]} [options.frustumSplits] Distances to the near and far planes of the camera frustums. This overrides the camera's frustum near and far values.
+ * @param {number[]} [options.frustumSplits] Distances to the near and far planes of the camera frustums. This overrides the camera's frustum near and far values.
  * @param {Color} [options.color=Color.CYAN] The color of the debug outline.
- * @param {Boolean} [options.updateOnChange=true] Whether the primitive updates when the underlying camera changes.
- * @param {Boolean} [options.show=true] Determines if this primitive will be shown.
- * @param {Object} [options.id] A user-defined object to return when the instance is picked with {@link Scene#pick}.
+ * @param {boolean} [options.updateOnChange=true] Whether the primitive updates when the underlying camera changes.
+ * @param {boolean} [options.show=true] Determines if this primitive will be shown.
+ * @param {object} [options.id] A user-defined object to return when the instance is picked with {@link Scene#pick}.
  *
  * @example
  * primitives.add(new Cesium.DebugCameraPrimitive({
@@ -54,7 +54,7 @@ function DebugCameraPrimitive(options) {
   /**
    * Determines if this primitive will be shown.
    *
-   * @type Boolean
+   * @type {boolean}
    * @default true
    */
   this.show = defaultValue(options.show, true);
@@ -220,7 +220,7 @@ DebugCameraPrimitive.prototype.update = function (frameState) {
  * <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 DebugCameraPrimitive#destroy
  */

package/Source/Scene/DebugModelMatrixPrimitive.js

@@ -24,12 +24,12 @@ import Primitive from "./Primitive.js";
  * @alias DebugModelMatrixPrimitive
  * @constructor
  *
- * @param {Object} [options] Object with the following properties:
- * @param {Number} [options.length=10000000.0] The length of the axes in meters.
- * @param {Number} [options.width=2.0] The width of the axes in pixels.
+ * @param {object} [options] Object with the following properties:
+ * @param {number} [options.length=10000000.0] The length of the axes in meters.
+ * @param {number} [options.width=2.0] The width of the axes in pixels.
  * @param {Matrix4} [options.modelMatrix=Matrix4.IDENTITY] The 4x4 matrix that defines the reference frame, i.e., origin plus axes, to visualize.
- * @param {Boolean} [options.show=true] Determines if this primitive will be shown.
- * @param {Object} [options.id] A user-defined object to return when the instance is picked with {@link Scene#pick}
+ * @param {boolean} [options.show=true] Determines if this primitive will be shown.
+ * @param {object} [options.id] A user-defined object to return when the instance is picked with {@link Scene#pick}
  *
  * @example
  * primitives.add(new Cesium.DebugModelMatrixPrimitive({
@@ -44,7 +44,7 @@ function DebugModelMatrixPrimitive(options) {
   /**
    * The length of the axes in meters.
    *
-   * @type {Number}
+   * @type {number}
    * @default 10000000.0
    */
   this.length = defaultValue(options.length, 10000000.0);
@@ -53,7 +53,7 @@ function DebugModelMatrixPrimitive(options) {
   /**
    * The width of the axes in pixels.
    *
-   * @type {Number}
+   * @type {number}
    * @default 2.0
    */
   this.width = defaultValue(options.width, 2.0);
@@ -62,7 +62,7 @@ function DebugModelMatrixPrimitive(options) {
   /**
    * Determines if this primitive will be shown.
    *
-   * @type Boolean
+   * @type {boolean}
    * @default true
    */
   this.show = defaultValue(options.show, true);
@@ -191,7 +191,7 @@ DebugModelMatrixPrimitive.prototype.update = function (frameState) {
  * <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 DebugModelMatrixPrimitive#destroy
  */