@cesium/engine 15.0.0 → 16.0.0

package/Source/Scene/UrlTemplateImageryProvider.js

@@ -4,7 +4,7 @@ import Cartographic from "../Core/Cartographic.js";
 import Check from "../Core/Check.js";
 import combine from "../Core/combine.js";
 import Credit from "../Core/Credit.js";
-import defaultValue from "../Core/defaultValue.js";
+import Frozen from "../Core/Frozen.js";
 import defined from "../Core/defined.js";
 import Event from "../Core/Event.js";
 import GeographicProjection from "../Core/GeographicProjection.js";
@@ -187,7 +187,7 @@ const pickFeaturesTags = combine(tags, {
  * @see WebMapTileServiceImageryProvider
  */
 function UrlTemplateImageryProvider(options) {
-  options = defaultValue(options, defaultValue.EMPTY_OBJECT);
+  options = options ?? Frozen.EMPTY_OBJECT;
 
   this._errorEvent = new Event();
 
@@ -213,19 +213,15 @@ function UrlTemplateImageryProvider(options) {
   }
   this._subdomains = subdomains;
 
-  this._tileWidth = defaultValue(options.tileWidth, 256);
-  this._tileHeight = defaultValue(options.tileHeight, 256);
-  this._minimumLevel = defaultValue(options.minimumLevel, 0);
+  this._tileWidth = options.tileWidth ?? 256;
+  this._tileHeight = options.tileHeight ?? 256;
+  this._minimumLevel = options.minimumLevel ?? 0;
   this._maximumLevel = options.maximumLevel;
-  this._tilingScheme = defaultValue(
-    options.tilingScheme,
-    new WebMercatorTilingScheme({ ellipsoid: options.ellipsoid }),
-  );
+  this._tilingScheme =
+    options.tilingScheme ??
+    new WebMercatorTilingScheme({ ellipsoid: options.ellipsoid });
 
-  this._rectangle = defaultValue(
-    options.rectangle,
-    this._tilingScheme.rectangle,
-  );
+  this._rectangle = options.rectangle ?? this._tilingScheme.rectangle;
   this._rectangle = Rectangle.intersection(
     this._rectangle,
     this._tilingScheme.rectangle,
@@ -238,7 +234,7 @@ function UrlTemplateImageryProvider(options) {
     credit = new Credit(credit);
   }
   this._credit = credit;
-  this._hasAlphaChannel = defaultValue(options.hasAlphaChannel, true);
+  this._hasAlphaChannel = options.hasAlphaChannel ?? true;
 
   const customTags = options.customTags;
   const allTags = combine(tags, customTags);
@@ -266,7 +262,7 @@ function UrlTemplateImageryProvider(options) {
    * @type {boolean}
    * @default true
    */
-  this.enablePickFeatures = defaultValue(options.enablePickFeatures, true);
+  this.enablePickFeatures = options.enablePickFeatures ?? true;
 }
 
 Object.defineProperties(UrlTemplateImageryProvider.prototype, {

package/Source/Scene/Vector3DTileClampedPolylines.js

@@ -3,7 +3,6 @@ import Cartesian2 from "../Core/Cartesian2.js";
 import Cartesian3 from "../Core/Cartesian3.js";
 import Color from "../Core/Color.js";
 import ComponentDatatype from "../Core/ComponentDatatype.js";
-import defaultValue from "../Core/defaultValue.js";
 import defined from "../Core/defined.js";
 import destroyObject from "../Core/destroyObject.js";
 import Ellipsoid from "../Core/Ellipsoid.js";
@@ -62,7 +61,7 @@ function Vector3DTileClampedPolylines(options) {
   this._counts = options.counts;
   this._batchIds = options.batchIds;
 
-  this._ellipsoid = defaultValue(options.ellipsoid, Ellipsoid.WGS84);
+  this._ellipsoid = options.ellipsoid ?? Ellipsoid.WGS84;
   this._minimumHeight = options.minimumHeight;
   this._maximumHeight = options.maximumHeight;
   this._center = options.center;

package/Source/Scene/Vector3DTileContent.js

@@ -1,5 +1,4 @@
 import Cartesian3 from "../Core/Cartesian3.js";
-import defaultValue from "../Core/defaultValue.js";
 import defined from "../Core/defined.js";
 import destroyObject from "../Core/destroyObject.js";
 import DeveloperError from "../Core/DeveloperError.js";
@@ -193,9 +192,9 @@ function getBatchIds(featureTableJson, featureTableBinary) {
   let pointBatchIds;
   let i;
 
-  const numberOfPolygons = defaultValue(featureTableJson.POLYGONS_LENGTH, 0);
-  const numberOfPolylines = defaultValue(featureTableJson.POLYLINES_LENGTH, 0);
-  const numberOfPoints = defaultValue(featureTableJson.POINTS_LENGTH, 0);
+  const numberOfPolygons = featureTableJson.POLYGONS_LENGTH ?? 0;
+  const numberOfPolylines = featureTableJson.POLYLINES_LENGTH ?? 0;
+  const numberOfPoints = featureTableJson.POINTS_LENGTH ?? 0;
 
   if (numberOfPolygons > 0 && defined(featureTableJson.POLYGON_BATCH_IDS)) {
     const polygonBatchIdsByteOffset =
@@ -289,7 +288,7 @@ function createClampedPolylines(options) {
 }
 
 function initialize(content, arrayBuffer, byteOffset) {
-  byteOffset = defaultValue(byteOffset, 0);
+  byteOffset = byteOffset ?? 0;
 
   const uint8Array = new Uint8Array(arrayBuffer);
   const view = new DataView(arrayBuffer);
@@ -377,9 +376,9 @@ function initialize(content, arrayBuffer, byteOffset) {
     }
   }
 
-  const numberOfPolygons = defaultValue(featureTableJson.POLYGONS_LENGTH, 0);
-  const numberOfPolylines = defaultValue(featureTableJson.POLYLINES_LENGTH, 0);
-  const numberOfPoints = defaultValue(featureTableJson.POINTS_LENGTH, 0);
+  const numberOfPolygons = featureTableJson.POLYGONS_LENGTH ?? 0;
+  const numberOfPolylines = featureTableJson.POLYLINES_LENGTH ?? 0;
+  const numberOfPoints = featureTableJson.POINTS_LENGTH ?? 0;
   const totalPrimitives = numberOfPolygons + numberOfPolylines + numberOfPoints;
 
   const batchTable = new Cesium3DTileBatchTable(
@@ -431,18 +430,17 @@ function initialize(content, arrayBuffer, byteOffset) {
   if (numberOfPolygons > 0) {
     featureTable.featuresLength = numberOfPolygons;
 
-    const polygonCounts = defaultValue(
+    const polygonCounts =
       featureTable.getPropertyArray(
         "POLYGON_COUNTS",
         ComponentDatatype.UNSIGNED_INT,
         1,
-      ),
+      ) ??
       featureTable.getPropertyArray(
         "POLYGON_COUNT",
         ComponentDatatype.UNSIGNED_INT,
         1,
-      ), // Workaround for old vector tilesets using the non-plural name
-    );
+      ); // Workaround for old vector tilesets using the non-plural name;
 
     if (!defined(polygonCounts)) {
       throw new RuntimeError(
@@ -450,18 +448,17 @@ function initialize(content, arrayBuffer, byteOffset) {
       );
     }
 
-    const polygonIndexCounts = defaultValue(
+    const polygonIndexCounts =
       featureTable.getPropertyArray(
         "POLYGON_INDEX_COUNTS",
         ComponentDatatype.UNSIGNED_INT,
         1,
-      ),
+      ) ??
       featureTable.getPropertyArray(
         "POLYGON_INDEX_COUNT",
         ComponentDatatype.UNSIGNED_INT,
         1,
-      ), // Workaround for old vector tilesets using the non-plural name
-    );
+      ); // Workaround for old vector tilesets using the non-plural name;
 
     if (!defined(polygonIndexCounts)) {
       throw new RuntimeError(
@@ -531,18 +528,17 @@ function initialize(content, arrayBuffer, byteOffset) {
   if (numberOfPolylines > 0) {
     featureTable.featuresLength = numberOfPolylines;
 
-    const polylineCounts = defaultValue(
+    const polylineCounts =
       featureTable.getPropertyArray(
         "POLYLINE_COUNTS",
         ComponentDatatype.UNSIGNED_INT,
         1,
-      ),
+      ) ??
       featureTable.getPropertyArray(
         "POLYLINE_COUNT",
         ComponentDatatype.UNSIGNED_INT,
         1,
-      ), // Workaround for old vector tilesets using the non-plural name
-    );
+      ); // Workaround for old vector tilesets using the non-plural name;
 
     if (!defined(polylineCounts)) {
       throw new RuntimeError(

package/Source/Scene/Vector3DTileGeometry.js

@@ -1,7 +1,6 @@
 import BoundingSphere from "../Core/BoundingSphere.js";
 import Cartesian3 from "../Core/Cartesian3.js";
 import Color from "../Core/Color.js";
-import defaultValue from "../Core/defaultValue.js";
 import defined from "../Core/defined.js";
 import destroyObject from "../Core/destroyObject.js";
 import Matrix4 from "../Core/Matrix4.js";
@@ -365,7 +364,7 @@ function finishPrimitive(geometries) {
       boundingVolume: geometries._boundingVolume,
       boundingVolumes: geometries._boundingVolumes,
       center: geometries._center,
-      pickObject: defaultValue(geometries._pickObject, geometries),
+      pickObject: geometries._pickObject ?? geometries,
     });
 
     geometries._boxes = undefined;

package/Source/Scene/Vector3DTilePolygons.js

@@ -1,6 +1,5 @@
 import Cartesian3 from "../Core/Cartesian3.js";
 import Color from "../Core/Color.js";
-import defaultValue from "../Core/defaultValue.js";
 import defined from "../Core/defined.js";
 import destroyObject from "../Core/destroyObject.js";
 import Ellipsoid from "../Core/Ellipsoid.js";
@@ -58,12 +57,12 @@ function Vector3DTilePolygons(options) {
   this._transferrableBatchIds = undefined;
   this._vertexBatchIds = undefined;
 
-  this._ellipsoid = defaultValue(options.ellipsoid, Ellipsoid.WGS84);
+  this._ellipsoid = options.ellipsoid ?? Ellipsoid.WGS84;
   this._minimumHeight = options.minimumHeight;
   this._maximumHeight = options.maximumHeight;
   this._polygonMinimumHeights = options.polygonMinimumHeights;
   this._polygonMaximumHeights = options.polygonMaximumHeights;
-  this._center = defaultValue(options.center, Cartesian3.ZERO);
+  this._center = options.center ?? Cartesian3.ZERO;
   this._rectangle = options.rectangle;
 
   this._center = undefined;

package/Source/Scene/Vector3DTilePolylines.js

@@ -1,7 +1,6 @@
 import Cartesian3 from "../Core/Cartesian3.js";
 import Color from "../Core/Color.js";
 import ComponentDatatype from "../Core/ComponentDatatype.js";
-import defaultValue from "../Core/defaultValue.js";
 import defined from "../Core/defined.js";
 import destroyObject from "../Core/destroyObject.js";
 import Ellipsoid from "../Core/Ellipsoid.js";
@@ -51,7 +50,7 @@ function Vector3DTilePolylines(options) {
   this._counts = options.counts;
   this._batchIds = options.batchIds;
 
-  this._ellipsoid = defaultValue(options.ellipsoid, Ellipsoid.WGS84);
+  this._ellipsoid = options.ellipsoid ?? Ellipsoid.WGS84;
   this._minimumHeight = options.minimumHeight;
   this._maximumHeight = options.maximumHeight;
   this._center = options.center;

package/Source/Scene/Vector3DTilePrimitive.js

@@ -1,7 +1,7 @@
 import Cartesian3 from "../Core/Cartesian3.js";
 import Color from "../Core/Color.js";
 import ComponentDatatype from "../Core/ComponentDatatype.js";
-import defaultValue from "../Core/defaultValue.js";
+import Frozen from "../Core/Frozen.js";
 import defined from "../Core/defined.js";
 import destroyObject from "../Core/destroyObject.js";
 import IndexDatatype from "../Core/IndexDatatype.js";
@@ -51,7 +51,7 @@ import Vector3DTileBatch from "./Vector3DTileBatch.js";
  * @private
  */
 function Vector3DTilePrimitive(options) {
-  options = defaultValue(options, defaultValue.EMPTY_OBJECT);
+  options = options ?? Frozen.EMPTY_OBJECT;
 
   this._batchTable = options.batchTable;
   this._batchIds = options.batchIds;
@@ -70,7 +70,7 @@ function Vector3DTilePrimitive(options) {
   this._boundingVolume = options.boundingVolume;
   this._boundingVolumes = options.boundingVolumes;
 
-  this._center = defaultValue(options.center, Cartesian3.ZERO);
+  this._center = options.center ?? Cartesian3.ZERO;
 
   this._va = undefined;
   this._sp = undefined;
@@ -127,10 +127,8 @@ function Vector3DTilePrimitive(options) {
    * @type {ClassificationType}
    * @default ClassificationType.BOTH
    */
-  this.classificationType = defaultValue(
-    options.classificationType,
-    ClassificationType.BOTH,
-  );
+  this.classificationType =
+    options.classificationType ?? ClassificationType.BOTH;
 
   // Hidden options
   this._vertexShaderSource = options._vertexShaderSource;
@@ -257,10 +255,8 @@ function createShaders(primitive, context) {
   }
 
   const batchTable = primitive._batchTable;
-  const attributeLocations = defaultValue(
-    primitive._attributeLocations,
-    defaultAttributeLocations,
-  );
+  const attributeLocations =
+    primitive._attributeLocations ?? defaultAttributeLocations;
 
   let pickId = primitive._pickId;
   const vertexShaderSource = primitive._vertexShaderSource;
@@ -769,7 +765,7 @@ function createColorCommands(primitive, context) {
 
   const vertexArray = primitive._va;
   const sp = primitive._sp;
-  const modelMatrix = defaultValue(primitive._modelMatrix, Matrix4.IDENTITY);
+  const modelMatrix = primitive._modelMatrix ?? Matrix4.IDENTITY;
   const uniformMap = primitive._uniformMap;
   const bv = primitive._boundingVolume;
 
@@ -876,7 +872,7 @@ function createPickCommands(primitive) {
   const vertexArray = primitive._va;
   const spStencil = primitive._spStencil;
   const spPick = primitive._spPick;
-  const modelMatrix = defaultValue(primitive._modelMatrix, Matrix4.IDENTITY);
+  const modelMatrix = primitive._modelMatrix ?? Matrix4.IDENTITY;
   const uniformMap = primitive._uniformMap;
 
   for (let j = 0; j < length; ++j) {

package/Source/Scene/VoxelBoxShape.js

@@ -5,7 +5,6 @@ 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 defaultValue from "../Core/defaultValue.js";
 
 /**
  * A box {@link VoxelShape}.
@@ -137,8 +136,8 @@ VoxelBoxShape.prototype.update = function (
   clipMinBounds,
   clipMaxBounds,
 ) {
-  clipMinBounds = defaultValue(clipMinBounds, VoxelBoxShape.DefaultMinBounds);
-  clipMaxBounds = defaultValue(clipMaxBounds, VoxelBoxShape.DefaultMaxBounds);
+  clipMinBounds = clipMinBounds ?? VoxelBoxShape.DefaultMinBounds;
+  clipMaxBounds = clipMaxBounds ?? VoxelBoxShape.DefaultMaxBounds;
   //>>includeStart('debug', pragmas.debug);
   Check.typeOf.object("modelMatrix", modelMatrix);
   Check.typeOf.object("minBounds", minBounds);

package/Source/Scene/VoxelCylinderShape.js

@@ -1,4 +1,3 @@
-import defaultValue from "../Core/defaultValue.js";
 import BoundingSphere from "../Core/BoundingSphere.js";
 import Cartesian2 from "../Core/Cartesian2.js";
 import Cartesian3 from "../Core/Cartesian3.js";
@@ -164,14 +163,8 @@ VoxelCylinderShape.prototype.update = function (
   clipMinBounds,
   clipMaxBounds,
 ) {
-  clipMinBounds = defaultValue(
-    clipMinBounds,
-    VoxelCylinderShape.DefaultMinBounds,
-  );
-  clipMaxBounds = defaultValue(
-    clipMaxBounds,
-    VoxelCylinderShape.DefaultMaxBounds,
-  );
+  clipMinBounds = clipMinBounds ?? VoxelCylinderShape.DefaultMinBounds;
+  clipMaxBounds = clipMaxBounds ?? VoxelCylinderShape.DefaultMaxBounds;
   //>>includeStart('debug', pragmas.debug);
   Check.typeOf.object("modelMatrix", modelMatrix);
   Check.typeOf.object("minBounds", minBounds);
@@ -668,7 +661,7 @@ VoxelCylinderShape.prototype.computeOrientedBoundingBoxForSample = function (
 };
 
 /**
- * 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 +674,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

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);

package/Source/Scene/VoxelPrimitive.js

@@ -10,7 +10,7 @@ import Color from "../Core/Color.js";
 import ClippingPlaneCollection from "./ClippingPlaneCollection.js";
 import clone from "../Core/clone.js";
 import CustomShader from "./Model/CustomShader.js";
-import defaultValue from "../Core/defaultValue.js";
+import Frozen from "../Core/Frozen.js";
 import defined from "../Core/defined.js";
 import destroyObject from "../Core/destroyObject.js";
 import Ellipsoid from "../Core/Ellipsoid.js";
@@ -49,7 +49,7 @@ import VoxelMetadataOrder from "./VoxelMetadataOrder.js";
  * @experimental This feature is not final and is subject to change without Cesium's standard deprecation policy.
  */
 function VoxelPrimitive(options) {
-  options = defaultValue(options, defaultValue.EMPTY_OBJECT);
+  options = options ?? Frozen.EMPTY_OBJECT;
 
   /**
    * @type {boolean}
@@ -61,10 +61,7 @@ function VoxelPrimitive(options) {
    * @type {VoxelProvider}
    * @private
    */
-  this._provider = defaultValue(
-    options.provider,
-    VoxelPrimitive.DefaultProvider,
-  );
+  this._provider = options.provider ?? VoxelPrimitive.DefaultProvider;
 
   /**
    * This member is not created until the provider and shape are ready.
@@ -84,7 +81,7 @@ function VoxelPrimitive(options) {
    * @type {boolean}
    * @private
    */
-  this._calculateStatistics = defaultValue(options.calculateStatistics, false);
+  this._calculateStatistics = options.calculateStatistics ?? false;
 
   /**
    * This member is not created until the provider is ready.
@@ -262,9 +259,7 @@ function VoxelPrimitive(options) {
    * @type {Matrix4}
    * @private
    */
-  this._modelMatrix = Matrix4.clone(
-    defaultValue(options.modelMatrix, Matrix4.IDENTITY),
-  );
+  this._modelMatrix = Matrix4.clone(options.modelMatrix ?? Matrix4.IDENTITY);
 
   /**
    * Model matrix with vertical exaggeration applied. Only used for BOX shape type.
@@ -296,10 +291,8 @@ function VoxelPrimitive(options) {
    * @type {CustomShader}
    * @private
    */
-  this._customShader = defaultValue(
-    options.customShader,
-    VoxelPrimitive.DefaultCustomShader,
-  );
+  this._customShader =
+    options.customShader ?? VoxelPrimitive.DefaultCustomShader;
 
   /**
    * @type {Event}
@@ -1365,7 +1358,7 @@ function updateVerticalExaggeration(primitive, frameState) {
       (primitive._minBounds.z - relativeHeight) * exaggeration + relativeHeight;
     primitive._exaggeratedMaxBounds.z =
       (primitive._maxBounds.z - relativeHeight) * exaggeration + relativeHeight;
-  } else if (primitive.shape === VoxelShapeType.BOX) {
+  } else {
     // Apply the exaggeration via the model matrix
     const exaggerationScale = Cartesian3.fromElements(
       1.0,
@@ -1484,7 +1477,7 @@ function initFromProvider(primitive, provider, context) {
     uniforms.dimensions,
   );
   primitive._paddingBefore = Cartesian3.clone(
-    defaultValue(provider.paddingBefore, Cartesian3.ZERO),
+    provider.paddingBefore ?? Cartesian3.ZERO,
     primitive._paddingBefore,
   );
   uniforms.paddingBefore = Cartesian3.clone(
@@ -1492,7 +1485,7 @@ function initFromProvider(primitive, provider, context) {
     uniforms.paddingBefore,
   );
   primitive._paddingAfter = Cartesian3.clone(
-    defaultValue(provider.paddingAfter, Cartesian3.ZERO),
+    provider.paddingAfter ?? Cartesian3.ZERO,
     primitive._paddingAfter,
   );
   uniforms.paddingAfter = Cartesian3.clone(
@@ -1509,7 +1502,7 @@ function initFromProvider(primitive, provider, context) {
     primitive._paddingAfter,
     primitive._inputDimensions,
   );
-  if (provider.metadataOrder === VoxelMetadataOrder.GLTF) {
+  if (provider.metadataOrder === VoxelMetadataOrder.Y_UP) {
     const inputDimensionsY = primitive._inputDimensions.y;
     primitive._inputDimensions.y = primitive._inputDimensions.z;
     primitive._inputDimensions.z = inputDimensionsY;
@@ -1520,7 +1513,7 @@ function initFromProvider(primitive, provider, context) {
   );
 
   // Create the VoxelTraversal, and set related uniforms
-  const keyframeCount = defaultValue(provider.keyframeCount, 1);
+  const keyframeCount = provider.keyframeCount ?? 1;
   primitive._traversal = new VoxelTraversal(primitive, context, keyframeCount);
   primitive.statistics.texturesByteLength =
     primitive._traversal.textureMemoryByteLength;
@@ -1535,14 +1528,8 @@ function initFromProvider(primitive, provider, context) {
  * @private
  */
 function checkTransformAndBounds(primitive, provider) {
-  const shapeTransform = defaultValue(
-    provider.shapeTransform,
-    Matrix4.IDENTITY,
-  );
-  const globalTransform = defaultValue(
-    provider.globalTransform,
-    Matrix4.IDENTITY,
-  );
+  const shapeTransform = provider.shapeTransform ?? Matrix4.IDENTITY;
+  const globalTransform = provider.globalTransform ?? Matrix4.IDENTITY;
 
   // Compound model matrix = global transform * model matrix * shape transform
   Matrix4.multiplyTransformation(
@@ -2141,7 +2128,7 @@ function DefaultVoxelProvider() {
 }
 
 DefaultVoxelProvider.prototype.requestData = function (options) {
-  const tileLevel = defined(options) ? defaultValue(options.tileLevel, 0) : 0;
+  const tileLevel = defined(options) ? (options.tileLevel ?? 0) : 0;
   if (tileLevel >= 1) {
     return undefined;
   }

package/Source/Scene/VoxelProvider.js

@@ -145,18 +145,6 @@ Object.defineProperties(VoxelProvider.prototype, {
     get: DeveloperError.throwInstantiationError,
   },
 
-  /**
-   * Gets the ordering of the metadata in the buffers.
-   *
-   * @memberof VoxelProvider.prototype
-   * @type {VoxelMetadataOrder}
-   * @default VoxelMetadataOrder.XYZ
-   * @readonly
-   */
-  metadataOrder: {
-    get: DeveloperError.throwInstantiationError,
-  },
-
   /**
    * Gets the metadata minimum values.
    *

package/Source/Scene/VoxelRenderResources.js

@@ -87,32 +87,28 @@ function VoxelRenderResources(primitive) {
   // Build shader
   shaderBuilder.addVertexLines([VoxelVS]);
 
+  if (primitive.provider.metadataOrder === VoxelMetadataOrder.Y_UP) {
+    shaderBuilder.addDefine(
+      "Y_UP_METADATA_ORDER",
+      undefined,
+      ShaderDestination.FRAGMENT,
+    );
+  }
   const shapeType = primitive._provider.shape;
-  if (primitive.provider.metadataOrder === VoxelMetadataOrder.GLTF) {
+  if (shapeType === "BOX") {
+    shaderBuilder.addDefine("SHAPE_BOX", undefined, ShaderDestination.FRAGMENT);
+  } else if (shapeType === "CYLINDER") {
     shaderBuilder.addDefine(
-      "GLTF_METADATA_ORDER",
+      "SHAPE_CYLINDER",
+      undefined,
+      ShaderDestination.FRAGMENT,
+    );
+  } else if (shapeType === "ELLIPSOID") {
+    shaderBuilder.addDefine(
+      "SHAPE_ELLIPSOID",
       undefined,
       ShaderDestination.FRAGMENT,
     );
-    if (shapeType === "BOX") {
-      shaderBuilder.addDefine(
-        "SHAPE_BOX",
-        undefined,
-        ShaderDestination.FRAGMENT,
-      );
-    } else if (shapeType === "CYLINDER") {
-      shaderBuilder.addDefine(
-        "SHAPE_CYLINDER",
-        undefined,
-        ShaderDestination.FRAGMENT,
-      );
-    } else if (shapeType === "ELLIPSOID") {
-      shaderBuilder.addDefine(
-        "SHAPE_ELLIPSOID",
-        undefined,
-        ShaderDestination.FRAGMENT,
-      );
-    }
   }
 
   shaderBuilder.addFragmentLines([

package/Source/Scene/VoxelTraversal.js

@@ -2,7 +2,6 @@ import Cartesian2 from "../Core/Cartesian2.js";
 import Cartesian3 from "../Core/Cartesian3.js";
 import CesiumMath from "../Core/Math.js";
 import CullingVolume from "../Core/CullingVolume.js";
-import defaultValue from "../Core/defaultValue.js";
 import defined from "../Core/defined.js";
 import destroyObject from "../Core/destroyObject.js";
 import DoubleEndedPriorityQueue from "../Core/DoubleEndedPriorityQueue.js";
@@ -49,7 +48,7 @@ function VoxelTraversal(
   );
   Cartesian3.add(inputDimensions, paddingAfter, inputDimensions);
 
-  if (metadataOrder === VoxelMetadataOrder.GLTF) {
+  if (metadataOrder === VoxelMetadataOrder.Y_UP) {
     const inputDimensionsY = inputDimensions.y;
     inputDimensions.y = inputDimensions.z;
     inputDimensions.z = inputDimensionsY;
@@ -121,10 +120,7 @@ function VoxelTraversal(
    * @type {boolean}
    * @private
    */
-  this._calculateStatistics = defaultValue(
-    this._primitive._calculateStatistics,
-    false,
-  );
+  this._calculateStatistics = this._primitive._calculateStatistics ?? false;
 
   /**
    * @type {number}