@cesium/engine 15.0.0 → 17.0.0

package/Source/Scene/VoxelCylinderShape.js

@@ -1,13 +1,12 @@
-import defaultValue from "../Core/defaultValue.js";
 import BoundingSphere from "../Core/BoundingSphere.js";
 import Cartesian2 from "../Core/Cartesian2.js";
 import Cartesian3 from "../Core/Cartesian3.js";
-import Check from "../Core/Check.js";
+import Cartesian4 from "../Core/Cartesian4.js";
 import CesiumMath from "../Core/Math.js";
+import Check from "../Core/Check.js";
 import Matrix3 from "../Core/Matrix3.js";
 import Matrix4 from "../Core/Matrix4.js";
 import OrientedBoundingBox from "../Core/OrientedBoundingBox.js";
-import Cartesian4 from "../Core/Cartesian4.js";
 
 /**
  * A cylinder {@link VoxelShape}.
@@ -60,40 +59,18 @@ function VoxelCylinderShape() {
   this.shapeTransform = new Matrix4();
 
   /**
-   * @type {number}
-   * @private
-   */
-  this._minimumRadius = VoxelCylinderShape.DefaultMinBounds.x;
-
-  /**
-   * @type {number}
+   * The minimum bounds of the shape, corresponding to minimum radius, angle, and height.
+   * @type {Cartesian3}
    * @private
    */
-  this._maximumRadius = VoxelCylinderShape.DefaultMaxBounds.x;
+  this._minBounds = VoxelCylinderShape.DefaultMinBounds.clone();
 
   /**
-   * @type {number}
+   * The maximum bounds of the shape, corresponding to maximum radius, angle, and height.
+   * @type {Cartesian3}
    * @private
    */
-  this._minimumAngle = VoxelCylinderShape.DefaultMinBounds.y;
-
-  /**
-   * @type {number}
-   * @private
-   */
-  this._maximumAngle = VoxelCylinderShape.DefaultMaxBounds.y;
-
-  /**
-   * @type {number}
-   * @private
-   */
-  this._minimumHeight = VoxelCylinderShape.DefaultMinBounds.z;
-
-  /**
-   * @type {number}
-   * @private
-   */
-  this._maximumHeight = VoxelCylinderShape.DefaultMaxBounds.z;
+  this._maxBounds = VoxelCylinderShape.DefaultMaxBounds.clone();
 
   /**
    * @private
@@ -146,6 +123,10 @@ function VoxelCylinderShape() {
 }
 
 const scratchScale = new Cartesian3();
+const scratchClipMinBounds = new Cartesian3();
+const scratchClipMaxBounds = new Cartesian3();
+const scratchRenderMinBounds = new Cartesian3();
+const scratchRenderMaxBounds = new Cartesian3();
 
 /**
  * Update the shape's state.
@@ -153,8 +134,8 @@ const scratchScale = new Cartesian3();
  * @param {Matrix4} modelMatrix The model matrix.
  * @param {Cartesian3} minBounds The minimum bounds.
  * @param {Cartesian3} maxBounds The maximum bounds.
- * @param {Cartesian3} [clipMinBounds=VoxelCylinderShape.DefaultMinBounds] The minimum clip bounds.
- * @param {Cartesian3} [clipMaxBounds=VoxelCylinderShape.DefaultMaxBounds] The maximum clip bounds.
+ * @param {Cartesian3} [clipMinBounds] The minimum clip bounds.
+ * @param {Cartesian3} [clipMaxBounds] The maximum clip bounds.
  * @returns {boolean} Whether the shape is visible.
  */
 VoxelCylinderShape.prototype.update = function (
@@ -164,90 +145,45 @@ VoxelCylinderShape.prototype.update = function (
   clipMinBounds,
   clipMaxBounds,
 ) {
-  clipMinBounds = defaultValue(
-    clipMinBounds,
-    VoxelCylinderShape.DefaultMinBounds,
-  );
-  clipMaxBounds = defaultValue(
-    clipMaxBounds,
-    VoxelCylinderShape.DefaultMaxBounds,
-  );
   //>>includeStart('debug', pragmas.debug);
   Check.typeOf.object("modelMatrix", modelMatrix);
   Check.typeOf.object("minBounds", minBounds);
   Check.typeOf.object("maxBounds", maxBounds);
   //>>includeEnd('debug');
 
-  const defaultMinRadius = VoxelCylinderShape.DefaultMinBounds.x;
-  const defaultMaxRadius = VoxelCylinderShape.DefaultMaxBounds.x;
-  const defaultMinAngle = VoxelCylinderShape.DefaultMinBounds.y;
-  const defaultMaxAngle = VoxelCylinderShape.DefaultMaxBounds.y;
-  const defaultMinHeight = VoxelCylinderShape.DefaultMinBounds.z;
-  const defaultMaxHeight = VoxelCylinderShape.DefaultMaxBounds.z;
-  const defaultAngleRange = defaultMaxAngle - defaultMinAngle;
+  clipMinBounds = clipMinBounds ?? minBounds.clone(scratchClipMinBounds);
+  clipMaxBounds = clipMaxBounds ?? maxBounds.clone(scratchClipMaxBounds);
+
+  minBounds = Cartesian3.clone(minBounds, this._minBounds);
+  maxBounds = Cartesian3.clone(maxBounds, this._maxBounds);
+
+  const { DefaultMinBounds, DefaultMaxBounds } = VoxelCylinderShape;
+  const defaultAngleRange = DefaultMaxBounds.y - DefaultMinBounds.y;
   const defaultAngleRangeHalf = 0.5 * defaultAngleRange;
 
   const epsilonZeroScale = CesiumMath.EPSILON10;
   const epsilonAngleDiscontinuity = CesiumMath.EPSILON3; // 0.001 radians = 0.05729578 degrees
   const epsilonAngle = CesiumMath.EPSILON10;
 
-  // Clamp the radii to the valid range
-  const shapeMinRadius = CesiumMath.clamp(
-    minBounds.x,
-    defaultMinRadius,
-    defaultMaxRadius,
-  );
-  const shapeMaxRadius = CesiumMath.clamp(
-    maxBounds.x,
-    defaultMinRadius,
-    defaultMaxRadius,
-  );
-  const clipMinRadius = CesiumMath.clamp(
-    clipMinBounds.x,
-    defaultMinRadius,
-    defaultMaxRadius,
-  );
-  const clipMaxRadius = CesiumMath.clamp(
-    clipMaxBounds.x,
-    defaultMinRadius,
-    defaultMaxRadius,
-  );
-  const renderMinRadius = Math.max(shapeMinRadius, clipMinRadius);
-  const renderMaxRadius = Math.min(shapeMaxRadius, clipMaxRadius);
-
-  // Clamp the angles to the valid range
-  const shapeMinAngle = CesiumMath.negativePiToPi(minBounds.y);
-  const shapeMaxAngle = CesiumMath.negativePiToPi(maxBounds.y);
-  const clipMinAngle = CesiumMath.negativePiToPi(clipMinBounds.y);
-  const clipMaxAngle = CesiumMath.negativePiToPi(clipMaxBounds.y);
-  const renderMinAngle = Math.max(shapeMinAngle, clipMinAngle);
-  const renderMaxAngle = Math.min(shapeMaxAngle, clipMaxAngle);
-
-  // Clamp the heights to the valid range
-  const shapeMinHeight = CesiumMath.clamp(
-    minBounds.z,
-    defaultMinHeight,
-    defaultMaxHeight,
-  );
-  const shapeMaxHeight = CesiumMath.clamp(
-    maxBounds.z,
-    defaultMinHeight,
-    defaultMaxHeight,
-  );
-  const clipMinHeight = CesiumMath.clamp(
-    clipMinBounds.z,
-    defaultMinHeight,
-    defaultMaxHeight,
+  // Clamp the bounds to the valid range
+  minBounds.x = Math.max(0.0, minBounds.x);
+  maxBounds.x = Math.max(0.0, maxBounds.x);
+  minBounds.y = CesiumMath.negativePiToPi(minBounds.y);
+  maxBounds.y = CesiumMath.negativePiToPi(maxBounds.y);
+
+  clipMinBounds.y = CesiumMath.negativePiToPi(clipMinBounds.y);
+  clipMaxBounds.y = CesiumMath.negativePiToPi(clipMaxBounds.y);
+
+  const renderMinBounds = Cartesian3.maximumByComponent(
+    minBounds,
+    clipMinBounds,
+    scratchRenderMinBounds,
   );
-  const clipMaxHeight = CesiumMath.clamp(
-    clipMaxBounds.z,
-    defaultMinHeight,
-    defaultMaxHeight,
+  const renderMaxBounds = Cartesian3.minimumByComponent(
+    maxBounds,
+    clipMaxBounds,
+    scratchRenderMaxBounds,
   );
-  const renderMinHeight = Math.max(shapeMinHeight, clipMinHeight);
-  const renderMaxHeight = Math.min(shapeMaxHeight, clipMaxHeight);
-
-  const scale = Matrix4.getScale(modelMatrix, scratchScale);
 
   // Exit early if the shape is not visible.
   // Note that minAngle may be greater than maxAngle when crossing the 180th meridian.
@@ -257,10 +193,11 @@ VoxelCylinderShape.prototype.update = function (
   // - minRadius is greater than maxRadius
   // - minHeight is greater than maxHeight
   // - scale is 0 for any component (too annoying to reconstruct rotation matrix)
+  const scale = Matrix4.getScale(modelMatrix, scratchScale);
   if (
-    renderMaxRadius === 0.0 ||
-    renderMinRadius > renderMaxRadius ||
-    renderMinHeight > renderMaxHeight ||
+    renderMaxBounds.x === 0.0 ||
+    renderMinBounds.x > renderMaxBounds.x ||
+    renderMinBounds.z > renderMaxBounds.z ||
     CesiumMath.equalsEpsilon(scale.x, 0.0, undefined, epsilonZeroScale) ||
     CesiumMath.equalsEpsilon(scale.y, 0.0, undefined, epsilonZeroScale) ||
     CesiumMath.equalsEpsilon(scale.z, 0.0, undefined, epsilonZeroScale)
@@ -268,22 +205,11 @@ VoxelCylinderShape.prototype.update = function (
     return false;
   }
 
-  this._minimumRadius = shapeMinRadius; // [0,1]
-  this._maximumRadius = shapeMaxRadius; // [0,1]
-  this._minimumAngle = shapeMinAngle; // [-pi,+pi]
-  this._maximumAngle = shapeMaxAngle; // [-pi,+pi]
-  this._minimumHeight = shapeMinHeight; // [-1,+1]
-  this._maximumHeight = shapeMaxHeight; // [-1,+1]
-
   this.shapeTransform = Matrix4.clone(modelMatrix, this.shapeTransform);
 
   this.orientedBoundingBox = getCylinderChunkObb(
-    renderMinRadius,
-    renderMaxRadius,
-    renderMinAngle,
-    renderMaxAngle,
-    renderMinHeight,
-    renderMaxHeight,
+    renderMinBounds,
+    renderMaxBounds,
     this.shapeTransform,
     this.orientedBoundingBox,
   );
@@ -299,13 +225,11 @@ VoxelCylinderShape.prototype.update = function (
     this.boundingSphere,
   );
 
-  const shapeIsDefaultMaxRadius = shapeMaxRadius === defaultMaxRadius;
-  const shapeIsDefaultMinRadius = shapeMinRadius === defaultMinRadius;
   const shapeIsDefaultRadius =
-    shapeIsDefaultMinRadius && shapeIsDefaultMaxRadius;
-  const shapeIsAngleReversed = shapeMaxAngle < shapeMinAngle;
+    minBounds.x === DefaultMinBounds.x && maxBounds.x === DefaultMaxBounds.x;
+  const shapeIsAngleReversed = maxBounds.y < minBounds.y;
   const shapeAngleRange =
-    shapeMaxAngle - shapeMinAngle + shapeIsAngleReversed * defaultAngleRange;
+    maxBounds.y - minBounds.y + shapeIsAngleReversed * defaultAngleRange;
   const shapeIsAngleRegular =
     shapeAngleRange > defaultAngleRangeHalf + epsilonAngle &&
     shapeAngleRange < defaultAngleRange - epsilonAngle;
@@ -317,24 +241,26 @@ VoxelCylinderShape.prototype.update = function (
   const shapeHasAngle =
     shapeIsAngleRegular || shapeIsAngleFlipped || shapeIsAngleRangeHalf;
   const shapeIsMinAngleDiscontinuity = CesiumMath.equalsEpsilon(
-    shapeMinAngle,
-    defaultMinAngle,
+    minBounds.y,
+    DefaultMinBounds.y,
     undefined,
     epsilonAngleDiscontinuity,
   );
   const shapeIsMaxAngleDiscontinuity = CesiumMath.equalsEpsilon(
-    shapeMaxAngle,
-    defaultMaxAngle,
+    maxBounds.y,
+    DefaultMaxBounds.y,
     undefined,
     epsilonAngleDiscontinuity,
   );
   const shapeIsDefaultHeight =
-    shapeMinHeight === defaultMinHeight && shapeMaxHeight === defaultMaxHeight;
+    minBounds.z === DefaultMinBounds.z && maxBounds.z === DefaultMaxBounds.z;
 
-  const renderIsDefaultMinRadius = renderMinRadius === defaultMinRadius;
-  const renderIsAngleReversed = renderMaxAngle < renderMinAngle;
+  const renderIsDefaultMinRadius = renderMinBounds.x === DefaultMinBounds.x;
+  const renderIsAngleReversed = renderMaxBounds.y < renderMinBounds.y;
   const renderAngleRange =
-    renderMaxAngle - renderMinAngle + renderIsAngleReversed * defaultAngleRange;
+    renderMaxBounds.y -
+    renderMinBounds.y +
+    renderIsAngleReversed * defaultAngleRange;
   const renderIsAngleRegular =
     renderAngleRange >= defaultAngleRangeHalf - epsilonAngle &&
     renderAngleRange < defaultAngleRange - epsilonAngle;
@@ -366,12 +292,12 @@ VoxelCylinderShape.prototype.update = function (
     intersectionCount += 1;
   }
   shaderUniforms.cylinderRenderRadiusMinMax = Cartesian2.fromElements(
-    renderMinRadius,
-    renderMaxRadius,
+    renderMinBounds.x,
+    renderMaxBounds.x,
     shaderUniforms.cylinderRenderRadiusMinMax,
   );
 
-  if (renderMinRadius === renderMaxRadius) {
+  if (renderMinBounds.x === renderMaxBounds.x) {
     shaderDefines["CYLINDER_HAS_RENDER_BOUNDS_RADIUS_FLAT"] = true;
   }
   if (!shapeIsDefaultRadius) {
@@ -383,12 +309,12 @@ VoxelCylinderShape.prototype.update = function (
     // scale = 1.0 / (maxRadius - minRadius)
     // offset = -minRadius / (maxRadius - minRadius)
     // offset = minRadius / (minRadius - maxRadius)
-    const radiusRange = shapeMaxRadius - shapeMinRadius;
+    const radiusRange = maxBounds.x - minBounds.x;
     let scale = 0.0;
     let offset = 1.0;
     if (radiusRange !== 0.0) {
       scale = 1.0 / radiusRange;
-      offset = -shapeMinRadius / radiusRange;
+      offset = -minBounds.x / radiusRange;
     }
     shaderUniforms.cylinderUvToShapeUvRadius = Cartesian2.fromElements(
       scale,
@@ -411,12 +337,12 @@ VoxelCylinderShape.prototype.update = function (
     // offset = -2.0 * (minHeight * 0.5 + 0.5) / (maxHeight - minHeight)
     // offset = -(minHeight + 1.0) / (maxHeight - minHeight)
     // offset = (minHeight + 1.0) / (minHeight - maxHeight)
-    const heightRange = shapeMaxHeight - shapeMinHeight;
+    const heightRange = maxBounds.z - minBounds.z;
     let scale = 0.0;
     let offset = 1.0;
     if (heightRange !== 0.0) {
       scale = 2.0 / heightRange;
-      offset = -(shapeMinHeight + 1.0) / heightRange;
+      offset = -(minBounds.z + 1.0) / heightRange;
     }
     shaderUniforms.cylinderUvToShapeUvHeight = Cartesian2.fromElements(
       scale,
@@ -425,8 +351,8 @@ VoxelCylinderShape.prototype.update = function (
     );
   }
   shaderUniforms.cylinderRenderHeightMinMax = Cartesian2.fromElements(
-    renderMinHeight,
-    renderMaxHeight,
+    renderMinBounds.z,
+    renderMaxBounds.z,
     shaderUniforms.cylinderRenderHeightMinMax,
   );
 
@@ -450,8 +376,8 @@ VoxelCylinderShape.prototype.update = function (
     }
 
     shaderUniforms.cylinderRenderAngleMinMax = Cartesian2.fromElements(
-      renderMinAngle,
-      renderMaxAngle,
+      renderMinBounds.y,
+      renderMaxBounds.y,
       shaderUniforms.cylinderRenderAngleMinMax,
     );
   }
@@ -465,8 +391,8 @@ VoxelCylinderShape.prototype.update = function (
       shaderDefines["CYLINDER_HAS_SHAPE_BOUNDS_ANGLE_MAX_DISCONTINUITY"] = true;
     }
 
-    const uvMinAngle = (shapeMinAngle - defaultMinAngle) / defaultAngleRange;
-    const uvMaxAngle = (shapeMaxAngle - defaultMinAngle) / defaultAngleRange;
+    const uvMinAngle = (minBounds.y - DefaultMinBounds.y) / defaultAngleRange;
+    const uvMaxAngle = (maxBounds.y - DefaultMinBounds.y) / defaultAngleRange;
     const uvAngleRangeZero = 1.0 - shapeAngleRange / defaultAngleRange;
 
     shaderUniforms.cylinderShapeUvAngleMinMax = Cartesian2.fromElements(
@@ -494,7 +420,7 @@ VoxelCylinderShape.prototype.update = function (
       );
     } else {
       const scale = defaultAngleRange / shapeAngleRange;
-      const offset = -(shapeMinAngle - defaultMinAngle) / shapeAngleRange;
+      const offset = -(minBounds.y - DefaultMinBounds.y) / shapeAngleRange;
       shaderUniforms.cylinderUvToShapeUvAngle = Cartesian2.fromElements(
         scale,
         offset,
@@ -508,6 +434,9 @@ VoxelCylinderShape.prototype.update = function (
   return true;
 };
 
+const scratchMinBounds = new Cartesian3();
+const scratchMaxBounds = new Cartesian3();
+
 /**
  * Computes an oriented bounding box for a specified tile.
  * The update function must be called before calling this function.
@@ -534,61 +463,33 @@ VoxelCylinderShape.prototype.computeOrientedBoundingBoxForTile = function (
   Check.typeOf.object("result", result);
   //>>includeEnd('debug');
 
-  const minimumRadius = this._minimumRadius;
-  const maximumRadius = this._maximumRadius;
-  const minimumAngle = this._minimumAngle;
-  const maximumAngle = this._maximumAngle;
-  const minimumHeight = this._minimumHeight;
-  const maximumHeight = this._maximumHeight;
+  const minBounds = this._minBounds;
+  const maxBounds = this._maxBounds;
 
   const sizeAtLevel = 1.0 / Math.pow(2.0, tileLevel);
 
-  const radiusStart = CesiumMath.lerp(
-    minimumRadius,
-    maximumRadius,
-    tileX * sizeAtLevel,
+  const tileMinBounds = Cartesian3.fromElements(
+    CesiumMath.lerp(minBounds.x, maxBounds.x, tileX * sizeAtLevel),
+    CesiumMath.lerp(minBounds.y, maxBounds.y, tileY * sizeAtLevel),
+    CesiumMath.lerp(minBounds.z, maxBounds.z, tileZ * sizeAtLevel),
+    scratchMinBounds,
   );
-  const radiusEnd = CesiumMath.lerp(
-    minimumRadius,
-    maximumRadius,
-    (tileX + 1) * sizeAtLevel,
-  );
-  const angleStart = CesiumMath.lerp(
-    minimumAngle,
-    maximumAngle,
-    tileY * sizeAtLevel,
-  );
-  const angleEnd = CesiumMath.lerp(
-    minimumAngle,
-    maximumAngle,
-    (tileY + 1) * sizeAtLevel,
-  );
-  const heightStart = CesiumMath.lerp(
-    minimumHeight,
-    maximumHeight,
-    tileZ * sizeAtLevel,
-  );
-  const heightEnd = CesiumMath.lerp(
-    minimumHeight,
-    maximumHeight,
-    (tileZ + 1) * sizeAtLevel,
+  const tileMaxBounds = Cartesian3.fromElements(
+    CesiumMath.lerp(minBounds.x, maxBounds.x, (tileX + 1) * sizeAtLevel),
+    CesiumMath.lerp(minBounds.y, maxBounds.y, (tileY + 1) * sizeAtLevel),
+    CesiumMath.lerp(minBounds.z, maxBounds.z, (tileZ + 1) * sizeAtLevel),
+    scratchMaxBounds,
   );
 
   return getCylinderChunkObb(
-    radiusStart,
-    radiusEnd,
-    angleStart,
-    angleEnd,
-    heightStart,
-    heightEnd,
+    tileMinBounds,
+    tileMaxBounds,
     this.shapeTransform,
     result,
   );
 };
 
 const sampleSizeScratch = new Cartesian3();
-const scratchTileMinBounds = new Cartesian3();
-const scratchTileMaxBounds = new Cartesian3();
 
 /**
  * Computes an oriented bounding box for a specified sample within a specified tile.
@@ -630,45 +531,39 @@ VoxelCylinderShape.prototype.computeOrientedBoundingBoxForSample = function (
       spatialNode.x + tileUv.x,
       spatialNode.y + tileUv.y,
       spatialNode.z + tileUv.z,
-      scratchTileMinBounds,
+      scratchMinBounds,
     ),
     tileSizeAtLevel,
-    scratchTileMinBounds,
-  );
-  const maxLerp = Cartesian3.add(
-    minLerp,
-    sampleSizeAtLevel,
-    scratchTileMaxBounds,
+    scratchMinBounds,
   );
+  const maxLerp = Cartesian3.add(minLerp, sampleSizeAtLevel, scratchMaxBounds);
 
-  const minimumRadius = this._minimumRadius;
-  const maximumRadius = this._maximumRadius;
-  const minimumHeight = this._minimumHeight;
-  const maximumHeight = this._maximumHeight;
-  const minimumAngle = this._minimumAngle;
-  const maximumAngle = this._maximumAngle;
+  const minBounds = this._minBounds;
+  const maxBounds = this._maxBounds;
 
-  const radiusStart = CesiumMath.lerp(minimumRadius, maximumRadius, minLerp.x);
-  const radiusEnd = CesiumMath.lerp(minimumRadius, maximumRadius, maxLerp.x);
-  const heightStart = CesiumMath.lerp(minimumHeight, maximumHeight, minLerp.y);
-  const heightEnd = CesiumMath.lerp(minimumHeight, maximumHeight, maxLerp.y);
-  const angleStart = CesiumMath.lerp(minimumAngle, maximumAngle, minLerp.z);
-  const angleEnd = CesiumMath.lerp(minimumAngle, maximumAngle, maxLerp.z);
+  const sampleMinBounds = Cartesian3.fromElements(
+    CesiumMath.lerp(minBounds.x, maxBounds.x, minLerp.x),
+    CesiumMath.lerp(minBounds.y, maxBounds.y, minLerp.y),
+    CesiumMath.lerp(minBounds.z, maxBounds.z, minLerp.z),
+    scratchMinBounds,
+  );
+  const sampleMaxBounds = Cartesian3.fromElements(
+    CesiumMath.lerp(minBounds.x, maxBounds.x, maxLerp.x),
+    CesiumMath.lerp(minBounds.y, maxBounds.y, maxLerp.y),
+    CesiumMath.lerp(minBounds.z, maxBounds.z, maxLerp.z),
+    scratchMaxBounds,
+  );
 
   return getCylinderChunkObb(
-    radiusStart,
-    radiusEnd,
-    angleStart,
-    angleEnd,
-    heightStart,
-    heightEnd,
+    sampleMinBounds,
+    sampleMaxBounds,
     this.shapeTransform,
     result,
   );
 };
 
 /**
- * Defines the minimum bounds of the shape. Corresponds to minimum radius, height, angle.
+ * Defines the minimum bounds of the shape. Corresponds to minimum radius, angle, and height.
  *
  * @type {Cartesian3}
  * @constant
@@ -681,7 +576,7 @@ VoxelCylinderShape.DefaultMinBounds = Object.freeze(
 );
 
 /**
- * Defines the maximum bounds of the shape. Corresponds to maximum radius, height, angle.
+ * Defines the maximum bounds of the shape. Corresponds to maximum radius, angle, height.
  *
  * @type {Cartesian3}
  * @constant
@@ -749,56 +644,24 @@ function computeLooseOrientedBoundingBox(matrix, result) {
  *
  * @function
  *
- * @param {number} radiusStart The radiusStart.
- * @param {number} radiusEnd The radiusEnd.
- * @param {number} angleStart The angleStart.
- * @param {number} angleEnd The angleEnd.
- * @param {number} heightStart The heightStart.
- * @param {number} heightEnd The heightEnd.
+ * @param {Cartesian3} chunkMinBounds The minimum bounds of the subregion.
+ * @param {Cartesian3} chunkMaxBounds The maximum bounds of the subregion.
  * @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.
  *
  * @private
  */
-function getCylinderChunkObb(
-  radiusStart,
-  radiusEnd,
-  angleStart,
-  angleEnd,
-  heightStart,
-  heightEnd,
-  matrix,
-  result,
-) {
-  const defaultMinBounds = VoxelCylinderShape.DefaultMinBounds;
-  const defaultMaxBounds = VoxelCylinderShape.DefaultMaxBounds;
-  const defaultMinRadius = defaultMinBounds.x; // 0
-  const defaultMaxRadius = defaultMaxBounds.x; // 1
-  const defaultMinAngle = defaultMinBounds.y; // -pi
-  const defaultMaxAngle = defaultMaxBounds.y; // +pi
-  const defaultMinHeight = defaultMinBounds.z; // -1
-  const defaultMaxHeight = defaultMaxBounds.z; // +1
-
-  // Return early if using the default bounds
-  if (
-    radiusStart === defaultMinRadius &&
-    radiusEnd === defaultMaxRadius &&
-    heightStart === defaultMinHeight &&
-    heightEnd === defaultMaxHeight &&
-    angleStart === defaultMinAngle &&
-    angleEnd === defaultMaxAngle
-  ) {
-    result.center = Matrix4.getTranslation(matrix, result.center);
-    result.halfAxes = Matrix4.getMatrix3(matrix, result.halfAxes);
-    return result;
-  }
-
-  const isAngleReversed = angleEnd < angleStart;
-
-  if (isAngleReversed) {
-    angleEnd += CesiumMath.TWO_PI;
-  }
+function getCylinderChunkObb(chunkMinBounds, chunkMaxBounds, matrix, result) {
+  const radiusStart = chunkMinBounds.x;
+  const radiusEnd = chunkMaxBounds.x;
+  const angleStart = chunkMinBounds.y;
+  const angleEnd =
+    chunkMaxBounds.y < angleStart
+      ? chunkMaxBounds.y + CesiumMath.TWO_PI
+      : chunkMaxBounds.y;
+  const heightStart = chunkMinBounds.z;
+  const heightEnd = chunkMaxBounds.z;
 
   const angleRange = angleEnd - angleStart;
   const angleMid = angleStart + angleRange * 0.5;
@@ -816,10 +679,10 @@ function getCylinderChunkObb(
   }
 
   // Find bounding box in shape space relative to angleMid
-  let minX = 1.0;
-  let minY = 1.0;
-  let maxX = -1.0;
-  let maxY = -1.0;
+  let minX = Number.POSITIVE_INFINITY;
+  let minY = Number.POSITIVE_INFINITY;
+  let maxX = Number.NEGATIVE_INFINITY;
+  let maxY = Number.NEGATIVE_INFINITY;
 
   for (let i = 0; i < testAngleCount; ++i) {
     const angle = testAngles[i] - angleMid;
@@ -830,14 +693,10 @@ function getCylinderChunkObb(
     const x2 = cosAngle * radiusEnd;
     const y2 = sinAngle * radiusEnd;
 
-    minX = Math.min(minX, x1);
-    minY = Math.min(minY, y1);
-    minX = Math.min(minX, x2);
-    minY = Math.min(minY, y2);
-    maxX = Math.max(maxX, x1);
-    maxY = Math.max(maxY, y1);
-    maxX = Math.max(maxX, x2);
-    maxY = Math.max(maxY, y2);
+    minX = Math.min(minX, x1, x2);
+    minY = Math.min(minY, y1, y2);
+    maxX = Math.max(maxX, x1, x2);
+    maxY = Math.max(maxY, y1, y2);
   }
 
   const extentX = maxX - minX;

package/Source/Scene/VoxelEllipsoidShape.js

@@ -8,7 +8,6 @@ import Matrix3 from "../Core/Matrix3.js";
 import Matrix4 from "../Core/Matrix4.js";
 import OrientedBoundingBox from "../Core/OrientedBoundingBox.js";
 import Rectangle from "../Core/Rectangle.js";
-import defaultValue from "../Core/defaultValue.js";
 
 /**
  * An ellipsoid {@link VoxelShape}.
@@ -183,8 +182,8 @@ VoxelEllipsoidShape.prototype.update = function (
   clipMaxBounds,
 ) {
   const { DefaultMinBounds, DefaultMaxBounds } = VoxelEllipsoidShape;
-  clipMinBounds = defaultValue(clipMinBounds, DefaultMinBounds);
-  clipMaxBounds = defaultValue(clipMaxBounds, DefaultMaxBounds);
+  clipMinBounds = clipMinBounds ?? DefaultMinBounds;
+  clipMaxBounds = clipMaxBounds ?? DefaultMaxBounds;
   //>>includeStart('debug', pragmas.debug);
   Check.typeOf.object("modelMatrix", modelMatrix);
   Check.typeOf.object("minBounds", minBounds);

package/Source/Scene/VoxelMetadataOrder.js

@@ -3,10 +3,22 @@
  * In all cases, x data is contiguous in strides along the y axis,
  * and each group of y strides represents a z slice.
  * However, the orientation of the axes follows different conventions.
+ *
  * @enum {number}
+ * @private
  */
 const VoxelMetadataOrder = {
-  XYZ: 0, // Default ordering following the 3D Tiles convention. Z-axis points upward.
-  GLTF: 1, // Ordering following the glTF convention. Y-axis points upward.
+  /**
+   * The default ordering following the 3D Tiles convention. Z-axis points upward.
+   * @type {number}
+   * @constant
+   */
+  Z_UP: 0,
+  /**
+   * The ordering following the glTF convention. Y-axis points upward.
+   * @type {number}
+   * @constant
+   */
+  Y_UP: 1,
 };
 export default Object.freeze(VoxelMetadataOrder);