@cesium/engine 2.0.0 → 2.1.0

package/Source/Scene/Vector3DTilePolylines.js

@@ -29,18 +29,18 @@ import Cesium3DTileFeature from "./Cesium3DTileFeature.js";
  * @alias Vector3DTilePolylines
  * @constructor
  *
- * @param {Object} options An object with following properties:
+ * @param {object} options An object with following properties:
  * @param {Uint16Array} options.positions The positions of the polylines
  * @param {Uint32Array} options.counts The number or positions in the each polyline.
  * @param {Uint16Array} options.widths The width of each polyline.
- * @param {Number} options.minimumHeight The minimum height of the terrain covered by the tile.
- * @param {Number} options.maximumHeight The maximum height of the terrain covered by the tile.
+ * @param {number} options.minimumHeight The minimum height of the terrain covered by the tile.
+ * @param {number} options.maximumHeight The maximum height of the terrain covered by the tile.
  * @param {Rectangle} options.rectangle The rectangle containing the tile.
  * @param {Cartesian3} [options.center=Cartesian3.ZERO] The RTC center.
  * @param {Cesium3DTileBatchTable} options.batchTable The batch table for the tile containing the batched polylines.
  * @param {Uint16Array} options.batchIds The batch ids for each polyline.
  * @param {BoundingSphere} options.boundingVolume The bounding volume for the entire batch of polylines.
- * @param {Boolean} options.keepDecodedPositions Whether to keep decoded positions in memory.
+ * @param {boolean} options.keepDecodedPositions Whether to keep decoded positions in memory.
  *
  * @private
  */
@@ -99,7 +99,7 @@ Object.defineProperties(Vector3DTilePolylines.prototype, {
    *
    * @memberof Vector3DTilePolylines.prototype
    *
-   * @type {Number}
+   * @type {number}
    * @readonly
    */
   trianglesLength: {
@@ -113,7 +113,7 @@ Object.defineProperties(Vector3DTilePolylines.prototype, {
    *
    * @memberof Vector3DTilePolylines.prototype
    *
-   * @type {Number}
+   * @type {number}
    * @readonly
    */
   geometryByteLength: {
@@ -528,7 +528,7 @@ Vector3DTilePolylines.getPolylinePositions = function (polylines, batchId) {
 /**
  * Get the polyline positions for the given feature.
  *
- * @param {Number} batchId The batch ID of the feature.
+ * @param {number} batchId The batch ID of the feature.
  */
 Vector3DTilePolylines.prototype.getPositions = function (batchId) {
   return Vector3DTilePolylines.getPolylinePositions(this, batchId);
@@ -552,7 +552,7 @@ Vector3DTilePolylines.prototype.createFeatures = function (content, features) {
 /**
  * Colors the entire tile when enabled is true. The resulting color will be (polyline batch table color * color).
  *
- * @param {Boolean} enabled Whether to enable debug coloring.
+ * @param {boolean} enabled Whether to enable debug coloring.
  * @param {Color} color The debug color.
  */
 Vector3DTilePolylines.prototype.applyDebugSettings = function (enabled, color) {
@@ -651,7 +651,7 @@ Vector3DTilePolylines.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>.
  */
 Vector3DTilePolylines.prototype.isDestroyed = function () {
   return false;

package/Source/Scene/Vector3DTilePrimitive.js

@@ -33,7 +33,7 @@ import Vector3DTileBatch from "./Vector3DTileBatch.js";
  * @alias Vector3DTilePrimitive
  * @constructor
  *
- * @param {Object} options An object with following properties:
+ * @param {object} options An object with following properties:
  * @param {Float32Array} options.positions The positions of the meshes.
  * @param {Uint16Array|Uint32Array} options.indices The indices of the triangulated meshes. The indices must be contiguous so that
  * the indices for mesh n are in [i, i + indexCounts[n]] where i = sum{indexCounts[0], indexCounts[n - 1]}.
@@ -108,7 +108,7 @@ function Vector3DTilePrimitive(options) {
 
   /**
    * Draw the wireframe of the classification meshes.
-   * @type {Boolean}
+   * @type {boolean}
    * @default false
    */
   this.debugWireframe = false;
@@ -117,7 +117,7 @@ function Vector3DTilePrimitive(options) {
 
   /**
    * Forces a re-batch instead of waiting after a number of frames have been rendered. For testing only.
-   * @type {Boolean}
+   * @type {boolean}
    * @default false
    */
   this.forceRebatch = false;
@@ -156,7 +156,7 @@ Object.defineProperties(Vector3DTilePrimitive.prototype, {
    *
    * @memberof Vector3DTilePrimitive.prototype
    *
-   * @type {Number}
+   * @type {number}
    * @readonly
    */
   trianglesLength: {
@@ -170,7 +170,7 @@ Object.defineProperties(Vector3DTilePrimitive.prototype, {
    *
    * @memberof Vector3DTilePrimitive.prototype
    *
-   * @type {Number}
+   * @type {number}
    * @readonly
    */
   geometryByteLength: {
@@ -962,7 +962,7 @@ Vector3DTilePrimitive.prototype.createFeatures = function (content, features) {
 /**
  * Colors the entire tile when enabled is true. The resulting color will be (mesh batch table color * color).
  *
- * @param {Boolean} enabled Whether to enable debug coloring.
+ * @param {boolean} enabled Whether to enable debug coloring.
  * @param {Color} color The debug color.
  */
 Vector3DTilePrimitive.prototype.applyDebugSettings = function (enabled, color) {
@@ -1053,7 +1053,7 @@ Vector3DTilePrimitive.prototype.applyStyle = function (style, features) {
  * Call when updating the color of a mesh with batchId changes color. The meshes will need to be re-batched
  * on the next update.
  *
- * @param {Number} batchId The batch id of the meshes whose color has changed.
+ * @param {number} batchId The batch id of the meshes whose color has changed.
  * @param {Color} color The new polygon color.
  */
 Vector3DTilePrimitive.prototype.updateCommands = function (batchId, color) {
@@ -1255,7 +1255,7 @@ Vector3DTilePrimitive.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>.
  */
 Vector3DTilePrimitive.prototype.isDestroyed = function () {
   return false;

package/Source/Scene/VertexAttributeSemantic.js

@@ -5,7 +5,7 @@ import DeveloperError from "../Core/DeveloperError.js";
 /**
  * An enum describing the built-in vertex attribute semantics.
  *
- * @enum {String}
+ * @enum {string}
  *
  * @private
  */
@@ -13,7 +13,7 @@ const VertexAttributeSemantic = {
   /**
    * Per-vertex position.
    *
-   * @type {String}
+   * @type {string}
    * @constant
    */
   POSITION: "POSITION",
@@ -21,7 +21,7 @@ const VertexAttributeSemantic = {
   /**
    * Per-vertex normal.
    *
-   * @type {String}
+   * @type {string}
    * @constant
    */
   NORMAL: "NORMAL",
@@ -29,7 +29,7 @@ const VertexAttributeSemantic = {
   /**
    * Per-vertex tangent.
    *
-   * @type {String}
+   * @type {string}
    * @constant
    */
   TANGENT: "TANGENT",
@@ -37,7 +37,7 @@ const VertexAttributeSemantic = {
   /**
    * Per-vertex texture coordinates.
    *
-   * @type {String}
+   * @type {string}
    * @constant
    */
   TEXCOORD: "TEXCOORD",
@@ -45,7 +45,7 @@ const VertexAttributeSemantic = {
   /**
    * Per-vertex color.
    *
-   * @type {String}
+   * @type {string}
    * @constant
    */
   COLOR: "COLOR",
@@ -53,7 +53,7 @@ const VertexAttributeSemantic = {
   /**
    * Per-vertex joint IDs for skinning.
    *
-   * @type {String}
+   * @type {string}
    * @constant
    */
   JOINTS: "JOINTS",
@@ -61,7 +61,7 @@ const VertexAttributeSemantic = {
   /**
    * Per-vertex joint weights for skinning.
    *
-   * @type {String}
+   * @type {string}
    * @constant
    */
   WEIGHTS: "WEIGHTS",
@@ -69,7 +69,7 @@ const VertexAttributeSemantic = {
   /**
    * Per-vertex feature ID.
    *
-   * @type {String}
+   * @type {string}
    * @constant
    */
   FEATURE_ID: "_FEATURE_ID",
@@ -105,7 +105,7 @@ function semanticToVariableName(semantic) {
  *
  * @param {VertexAttributeSemantic} semantic The semantic.
  *
- * @returns {Boolean} Whether the semantic can have a set index.
+ * @returns {boolean} Whether the semantic can have a set index.
  *
  * @private
  */
@@ -135,7 +135,7 @@ VertexAttributeSemantic.hasSetIndex = function (semantic) {
 /**
  * Gets the vertex attribute semantic matching the glTF semantic.
  *
- * @param {String} gltfSemantic The glTF semantic.
+ * @param {string} gltfSemantic The glTF semantic.
  *
  * @returns {VertexAttributeSemantic|undefined} The vertex attribute semantic, or undefined if there is no match.
  *
@@ -180,7 +180,7 @@ VertexAttributeSemantic.fromGltfSemantic = function (gltfSemantic) {
 /**
  * Gets the vertex attribute semantic matching the pnts semantic.
  *
- * @param {String} pntsSemantic The pnts semantic.
+ * @param {string} pntsSemantic The pnts semantic.
  *
  * @returns {VertexAttributeSemantic|undefined} The vertex attribute semantic, or undefined if there is no match.
  *
@@ -217,7 +217,7 @@ VertexAttributeSemantic.fromPntsSemantic = function (pntsSemantic) {
  *
  * @param {VertexAttributeSemantic} semantic The semantic.
  *
- * @returns {String} The shader type.
+ * @returns {string} The shader type.
  *
  * @private
  */
@@ -252,9 +252,9 @@ VertexAttributeSemantic.getGlslType = function (semantic) {
  * Gets the variable name for the given semantic and set index.
  *
  * @param {VertexAttributeSemantic} semantic The semantic.
- * @param {Number} [setIndex] The set index.
+ * @param {number} [setIndex] The set index.
  *
- * @returns {String} The variable name.
+ * @returns {string} The variable name.
  *
  * @private
  */

package/Source/Scene/VerticalOrigin.js

@@ -8,7 +8,7 @@
  * <img src='Images/Billboard.setVerticalOrigin.png' width='695' height='175' /><br />
  * </div>
  *
- * @enum {Number}
+ * @enum {number}
  *
  * @see Billboard#verticalOrigin
  * @see Label#verticalOrigin
@@ -17,7 +17,7 @@ const VerticalOrigin = {
   /**
    * The origin is at the vertical center between <code>BASELINE</code> and <code>TOP</code>.
    *
-   * @type {Number}
+   * @type {number}
    * @constant
    */
   CENTER: 0,
@@ -25,7 +25,7 @@ const VerticalOrigin = {
   /**
    * The origin is at the bottom of the object.
    *
-   * @type {Number}
+   * @type {number}
    * @constant
    */
   BOTTOM: 1,
@@ -33,7 +33,7 @@ const VerticalOrigin = {
   /**
    * If the object contains text, the origin is at the baseline of the text, else the origin is at the bottom of the object.
    *
-   * @type {Number}
+   * @type {number}
    * @constant
    */
   BASELINE: 2,
@@ -41,7 +41,7 @@ const VerticalOrigin = {
   /**
    * The origin is at the top of the object.
    *
-   * @type {Number}
+   * @type {number}
    * @constant
    */
   TOP: -1,

package/Source/Scene/ViewportQuad.js

@@ -27,7 +27,7 @@ function ViewportQuad(rectangle, material) {
   /**
    * Determines if the viewport quad primitive will be shown.
    *
-   * @type {Boolean}
+   * @type {boolean}
    * @default true
    */
   this.show = true;
@@ -147,7 +147,7 @@ ViewportQuad.prototype.update = 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 ViewportQuad#destroy
  */

package/Source/Scene/VoxelBoxShape.js

@@ -72,31 +72,28 @@ function VoxelBoxShape() {
   );
 
   /**
-   * @type {Object.<string, any>}
+   * @type {Object<string, any>}
    * @readonly
    */
   this.shaderUniforms = {
-    boxUvToRenderBoundsTransform: new Matrix4(),
-    boxUvToRenderBoundsScale: new Cartesian3(),
-    boxUvToRenderBoundsTranslate: new Cartesian3(),
+    renderMinBounds: new Cartesian3(),
+    renderMaxBounds: new Cartesian3(),
     boxUvToShapeUvScale: new Cartesian3(),
     boxUvToShapeUvTranslate: new Cartesian3(),
   };
 
   /**
-   * @type {Object.<string, any>}
+   * @type {Object<string, any>}
    * @readonly
    */
   this.shaderDefines = {
     BOX_INTERSECTION_INDEX: undefined,
-    BOX_HAS_RENDER_BOUNDS: undefined,
     BOX_HAS_SHAPE_BOUNDS: undefined,
-    BOX_IS_2D: undefined,
   };
 
   /**
    * The maximum number of intersections against the shape for any ray direction.
-   * @type {Number}
+   * @type {number}
    * @readonly
    */
   this.shaderMaximumIntersectionsLength = 0; // not known until update
@@ -105,34 +102,14 @@ function VoxelBoxShape() {
 const scratchCenter = new Cartesian3();
 const scratchScale = new Cartesian3();
 const scratchRotation = new Matrix3();
-const scratchTransformLocalToBounds = new Matrix4();
-const scratchBoundsTranslation = new Cartesian3();
-const scratchBoundsScale = new Cartesian3();
-const scratchBoundsScaleMatrix = new Matrix3();
 const scratchClipMinBounds = new Cartesian3();
 const scratchClipMaxBounds = new Cartesian3();
 const scratchRenderMinBounds = new Cartesian3();
 const scratchRenderMaxBounds = new Cartesian3();
 
-const transformUvToLocal = Matrix4.fromRotationTranslation(
-  Matrix3.fromUniformScale(2.0, new Matrix3()),
-  new Cartesian3(-1.0, -1.0, -1.0),
-  new Matrix4()
-);
-
-const transformXYZToZYX = Matrix4.fromRotation(
-  Matrix3.fromColumnMajorArray(
-    [0.0, 0.0, 1.0, 0.0, 1.0, 0.0, 1.0, 0.0, 0.0],
-    new Matrix3()
-  ),
-  new Matrix4()
-);
-
-const transformXYZToXZY = Matrix4.fromRotation(
-  Matrix3.fromColumnMajorArray(
-    [1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 1.0, 0.0],
-    new Matrix3()
-  ),
+const transformLocalToUv = Matrix4.fromRotationTranslation(
+  Matrix3.fromUniformScale(0.5, new Matrix3()),
+  new Cartesian3(0.5, 0.5, 0.5),
   new Matrix4()
 );
 
@@ -144,7 +121,7 @@ const transformXYZToXZY = Matrix4.fromRotation(
  * @param {Cartesian3} maxBounds The maximum bounds.
  * @param {Cartesian3} [clipMinBounds=VoxelBoxShape.DefaultMinBounds] The minimum clip bounds.
  * @param {Cartesian3} [clipMaxBounds=VoxelBoxShape.DefaultMaxBounds] The maximum clip bounds.
- * @returns {Boolean} Whether the shape is visible.
+ * @returns {boolean} Whether the shape is visible.
  */
 VoxelBoxShape.prototype.update = function (
   modelMatrix,
@@ -253,8 +230,7 @@ VoxelBoxShape.prototype.update = function (
     this.boundingSphere
   );
 
-  const shaderUniforms = this.shaderUniforms;
-  const shaderDefines = this.shaderDefines;
+  const { shaderUniforms, shaderDefines } = this;
 
   // To keep things simple, clear the defines every time
   for (const key in shaderDefines) {
@@ -263,21 +239,9 @@ VoxelBoxShape.prototype.update = function (
     }
   }
 
-  const hasRenderBounds =
-    renderMinBounds.x !== defaultMinBounds.x ||
-    renderMaxBounds.x !== defaultMaxBounds.x ||
-    renderMinBounds.y !== defaultMinBounds.y ||
-    renderMaxBounds.y !== defaultMaxBounds.y ||
-    renderMinBounds.z !== defaultMinBounds.z ||
-    renderMaxBounds.z !== defaultMaxBounds.z;
-
   const hasShapeBounds =
-    minBounds.x !== defaultMinBounds.x ||
-    maxBounds.x !== defaultMaxBounds.x ||
-    minBounds.y !== defaultMinBounds.y ||
-    maxBounds.y !== defaultMaxBounds.y ||
-    minBounds.z !== defaultMinBounds.z ||
-    maxBounds.z !== defaultMaxBounds.z;
+    !Cartesian3.equals(minBounds, defaultMinBounds) ||
+    !Cartesian3.equals(maxBounds, defaultMaxBounds);
 
   // Keep track of how many intersections there are going to be.
   let intersectionCount = 0;
@@ -285,71 +249,16 @@ VoxelBoxShape.prototype.update = function (
   shaderDefines["BOX_INTERSECTION_INDEX"] = intersectionCount;
   intersectionCount += 1;
 
-  if (hasRenderBounds) {
-    shaderDefines["BOX_HAS_RENDER_BOUNDS"] = true;
-
-    const min = renderMinBounds;
-    const max = renderMaxBounds;
-
-    // inverse(scale)
-    // inverse(maxBoundsUv - minBoundsUv)
-    // inverse((maxBounds * 0.5 + 0.5) - (minBounds * 0.5 + 0.5))
-    // inverse(0.5 * (maxBounds - minBounds))
-    // 2.0 / (maxBounds - minBounds) // with divide by zero protection
-    const scaleLocalToBounds = Cartesian3.fromElements(
-      2.0 / (min.x === max.x ? 1.0 : max.x - min.x),
-      2.0 / (min.y === max.y ? 1.0 : max.y - min.y),
-      2.0 / (min.z === max.z ? 1.0 : max.z - min.z),
-      scratchBoundsScale
-    );
-
-    // -inverse(scale) * translation // affine inverse
-    // -inverse(scale) * 0.5 * (minBounds + maxBounds)
-    const translateLocalToBounds = Cartesian3.fromElements(
-      -scaleLocalToBounds.x * 0.5 * (min.x + max.x),
-      -scaleLocalToBounds.y * 0.5 * (min.y + max.y),
-      -scaleLocalToBounds.z * 0.5 * (min.z + max.z),
-      scratchBoundsTranslation
-    );
-
-    let transformLocalToBounds = Matrix4.fromRotationTranslation(
-      Matrix3.fromScale(scaleLocalToBounds, scratchBoundsScaleMatrix),
-      translateLocalToBounds,
-      scratchTransformLocalToBounds
-    );
-
-    if (min.x === max.x || min.y === max.y || min.z === max.z) {
-      shaderDefines["BOX_IS_2D"] = true;
-
-      let transformAxisConversion;
-      if (min.x === max.x) {
-        transformAxisConversion = transformXYZToZYX;
-      } else if (min.y === max.y) {
-        transformAxisConversion = transformXYZToXZY;
-      } else if (min.z === max.z) {
-        transformAxisConversion = Matrix4.IDENTITY;
-      }
-      transformLocalToBounds = Matrix4.multiplyTransformation(
-        transformAxisConversion,
-        transformLocalToBounds,
-        transformLocalToBounds
-      );
-    }
-
-    shaderUniforms.boxUvToRenderBoundsTransform = Matrix4.multiplyTransformation(
-      transformLocalToBounds,
-      transformUvToLocal,
-      shaderUniforms.boxUvToRenderBoundsTransform
-    );
-    shaderUniforms.boxUvToRenderBoundsScale = Matrix4.getScale(
-      shaderUniforms.boxUvToRenderBoundsTransform,
-      shaderUniforms.boxUvToRenderBoundsScale
-    );
-    shaderUniforms.boxUvToRenderBoundsTranslate = Matrix4.getTranslation(
-      shaderUniforms.boxUvToRenderBoundsTransform,
-      shaderUniforms.boxUvToRenderBoundsTranslate
-    );
-  }
+  shaderUniforms.renderMinBounds = Matrix4.multiplyByPoint(
+    transformLocalToUv,
+    renderMinBounds,
+    shaderUniforms.renderMinBounds
+  );
+  shaderUniforms.renderMaxBounds = Matrix4.multiplyByPoint(
+    transformLocalToUv,
+    renderMaxBounds,
+    shaderUniforms.renderMaxBounds
+  );
 
   if (hasShapeBounds) {
     shaderDefines["BOX_HAS_SHAPE_BOUNDS"] = true;
@@ -394,10 +303,10 @@ const scratchTileMaxBounds = new Cartesian3();
  * Computes an oriented bounding box for a specified tile.
  * The update function must be called before calling this function.
  *
- * @param {Number} tileLevel The tile's level.
- * @param {Number} tileX The tile's x coordinate.
- * @param {Number} tileY The tile's y coordinate.
- * @param {Number} tileZ The tile's z coordinate.
+ * @param {number} tileLevel The tile's level.
+ * @param {number} tileX The tile's x coordinate.
+ * @param {number} tileY The tile's y coordinate.
+ * @param {number} tileZ The tile's z coordinate.
  * @param {OrientedBoundingBox} result The oriented bounding box that will be set to enclose the specified tile
  * @returns {OrientedBoundingBox} The oriented bounding box.
  */
@@ -447,7 +356,7 @@ VoxelBoxShape.prototype.computeOrientedBoundingBoxForTile = function (
  * The update function must be called before calling this function.
  *
  * @param {Cartesian3} dimensions The voxel grid dimensions for a tile.
- * @returns {Number} The step size.
+ * @returns {number} The step size.
  */
 VoxelBoxShape.prototype.computeApproximateStepSize = function (dimensions) {
   //>>includeStart('debug', pragmas.debug);

package/Source/Scene/VoxelContent.js

@@ -11,7 +11,7 @@ import MetadataTable from "./MetadataTable.js";
  * @constructor
  *
  * @param {Resource} resource The resource for this voxel content. This is used for fetching external buffers as needed.
- * @param {Object} [json] Voxel JSON contents. Mutually exclusive with binary.
+ * @param {object} [json] Voxel JSON contents. Mutually exclusive with binary.
  * @param {Uint8Array} [binary] Voxel binary contents. Mutually exclusive with json.
  * @param {MetadataSchema} metadataSchema The metadata schema used by property tables in the voxel content
  *
@@ -128,8 +128,8 @@ function requestBuffers(content, json, binary) {
 /**
  * A helper object for storing the two parts of the binary voxel content
  *
- * @typedef {Object} VoxelChunks
- * @property {Object} json The json chunk of the binary voxel content
+ * @typedef {object} VoxelChunks
+ * @property {object} json The json chunk of the binary voxel content
  * @property {Uint8Array} binary The binary chunk of the binary voxel content. This represents the internal buffer.
  * @private
  */

package/Source/Scene/VoxelCylinderShape.js

@@ -56,43 +56,43 @@ function VoxelCylinderShape() {
   this.shapeTransform = new Matrix4();
 
   /**
-   * @type {Number}
+   * @type {number}
    * @private
    */
   this._minimumRadius = VoxelCylinderShape.DefaultMinBounds.x;
 
   /**
-   * @type {Number}
+   * @type {number}
    * @private
    */
   this._maximumRadius = VoxelCylinderShape.DefaultMaxBounds.x;
 
   /**
-   * @type {Number}
+   * @type {number}
    * @private
    */
   this._minimumHeight = VoxelCylinderShape.DefaultMinBounds.y;
 
   /**
-   * @type {Number}
+   * @type {number}
    * @private
    */
   this._maximumHeight = VoxelCylinderShape.DefaultMaxBounds.y;
 
   /**
-   * @type {Number}
+   * @type {number}
    * @private
    */
   this._minimumAngle = VoxelCylinderShape.DefaultMinBounds.z;
 
   /**
-   * @type {Number}
+   * @type {number}
    * @private
    */
   this._maximumAngle = VoxelCylinderShape.DefaultMaxBounds.z;
 
   /**
-   * @type {Object.<string, any>}
+   * @type {Object<string, any>}
    * @readonly
    */
   this.shaderUniforms = {
@@ -108,7 +108,7 @@ function VoxelCylinderShape() {
   };
 
   /**
-   * @type {Object.<string, any>}
+   * @type {Object<string, any>}
    * @readonly
    */
   this.shaderDefines = {
@@ -140,7 +140,7 @@ function VoxelCylinderShape() {
 
   /**
    * The maximum number of intersections against the shape for any ray direction.
-   * @type {Number}
+   * @type {number}
    * @readonly
    */
   this.shaderMaximumIntersectionsLength = 0; // not known until update
@@ -167,7 +167,7 @@ const transformUvToLocal = Matrix4.fromRotationTranslation(
  * @param {Cartesian3} maxBounds The maximum bounds.
  * @param {Cartesian3} [clipMinBounds=VoxelCylinderShape.DefaultMinBounds] The minimum clip bounds.
  * @param {Cartesian3} [clipMaxBounds=VoxelCylinderShape.DefaultMaxBounds] The maximum clip bounds.
- * @returns {Boolean} Whether the shape is visible.
+ * @returns {boolean} Whether the shape is visible.
  */
 VoxelCylinderShape.prototype.update = function (
   modelMatrix,
@@ -571,10 +571,10 @@ VoxelCylinderShape.prototype.update = function (
  * Computes an oriented bounding box for a specified tile.
  * The update function must be called before calling this function.
  *
- * @param {Number} tileLevel The tile's level.
- * @param {Number} tileX The tile's x coordinate.
- * @param {Number} tileY The tile's y coordinate.
- * @param {Number} tileZ The tile's z coordinate.
+ * @param {number} tileLevel The tile's level.
+ * @param {number} tileX The tile's x coordinate.
+ * @param {number} tileY The tile's y coordinate.
+ * @param {number} tileZ The tile's z coordinate.
  * @param {OrientedBoundingBox} result The oriented bounding box that will be set to enclose the specified tile
  * @returns {OrientedBoundingBox} The oriented bounding box.
  */
@@ -655,7 +655,7 @@ const scratchScaleRatio = new Cartesian3();
  * The update function must be called before calling this function.
  *
  * @param {Cartesian3} dimensions The voxel grid dimensions for a tile.
- * @returns {Number} The step size.
+ * @returns {number} The step size.
  */
 VoxelCylinderShape.prototype.computeApproximateStepSize = function (
   dimensions
@@ -788,12 +788,12 @@ function computeLooseOrientedBoundingBox(matrix, result) {
  *
  * @function
  *
- * @param {Number} radiusStart The radiusStart.
- * @param {Number} radiusEnd The radiusEnd.
- * @param {Number} heightStart The heightStart.
- * @param {Number} heightEnd The heightEnd.
- * @param {Number} angleStart The angleStart.
- * @param {Number} angleEnd The angleEnd.
+ * @param {number} radiusStart The radiusStart.
+ * @param {number} radiusEnd The radiusEnd.
+ * @param {number} heightStart The heightStart.
+ * @param {number} heightEnd The heightEnd.
+ * @param {number} angleStart The angleStart.
+ * @param {number} angleEnd The angleEnd.
  * @param {Matrix4} matrix The matrix to transform the points.
  * @param {OrientedBoundingBox} result The object onto which to store the result.
  * @returns {OrientedBoundingBox} The oriented bounding box that contains this subregion.