@cesium/engine 15.0.0 → 17.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}.
@@ -58,22 +57,18 @@ function VoxelBoxShape() {
   this.shapeTransform = new Matrix4();
 
   /**
+   * The minimum bounds of the shape.
    * @type {Cartesian3}
    * @private
    */
-  this._minBounds = Cartesian3.clone(
-    VoxelBoxShape.DefaultMinBounds,
-    new Cartesian3(),
-  );
+  this._minBounds = VoxelBoxShape.DefaultMinBounds.clone();
 
   /**
+   * The maximum bounds of the shape.
    * @type {Cartesian3}
    * @private
    */
-  this._maxBounds = Cartesian3.clone(
-    VoxelBoxShape.DefaultMaxBounds,
-    new Cartesian3(),
-  );
+  this._maxBounds = VoxelBoxShape.DefaultMaxBounds.clone();
 
   /**
    * @private
@@ -126,8 +121,8 @@ const transformLocalToUv = Matrix4.fromRotationTranslation(
  * @param {Matrix4} modelMatrix The model matrix.
  * @param {Cartesian3} minBounds The minimum bounds.
  * @param {Cartesian3} maxBounds The maximum bounds.
- * @param {Cartesian3} [clipMinBounds=VoxelBoxShape.DefaultMinBounds] The minimum clip bounds.
- * @param {Cartesian3} [clipMaxBounds=VoxelBoxShape.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.
  */
 VoxelBoxShape.prototype.update = function (
@@ -137,44 +132,17 @@ VoxelBoxShape.prototype.update = function (
   clipMinBounds,
   clipMaxBounds,
 ) {
-  clipMinBounds = defaultValue(clipMinBounds, VoxelBoxShape.DefaultMinBounds);
-  clipMaxBounds = defaultValue(clipMaxBounds, VoxelBoxShape.DefaultMaxBounds);
   //>>includeStart('debug', pragmas.debug);
   Check.typeOf.object("modelMatrix", modelMatrix);
   Check.typeOf.object("minBounds", minBounds);
   Check.typeOf.object("maxBounds", maxBounds);
   //>>includeEnd('debug');
 
-  const defaultMinBounds = VoxelBoxShape.DefaultMinBounds;
-  const defaultMaxBounds = VoxelBoxShape.DefaultMaxBounds;
+  clipMinBounds = clipMinBounds ?? minBounds.clone(scratchClipMinBounds);
+  clipMaxBounds = clipMaxBounds ?? maxBounds.clone(scratchClipMaxBounds);
 
-  minBounds = this._minBounds = Cartesian3.clamp(
-    minBounds,
-    defaultMinBounds,
-    defaultMaxBounds,
-    this._minBounds,
-  );
-
-  maxBounds = this._maxBounds = Cartesian3.clamp(
-    maxBounds,
-    defaultMinBounds,
-    defaultMaxBounds,
-    this._maxBounds,
-  );
-
-  clipMinBounds = Cartesian3.clamp(
-    clipMinBounds,
-    defaultMinBounds,
-    defaultMaxBounds,
-    scratchClipMinBounds,
-  );
-
-  clipMaxBounds = Cartesian3.clamp(
-    clipMaxBounds,
-    defaultMinBounds,
-    defaultMaxBounds,
-    scratchClipMaxBounds,
-  );
+  minBounds = Cartesian3.clone(minBounds, this._minBounds);
+  maxBounds = Cartesian3.clone(maxBounds, this._maxBounds);
 
   const renderMinBounds = Cartesian3.clamp(
     minBounds,
@@ -182,7 +150,6 @@ VoxelBoxShape.prototype.update = function (
     clipMaxBounds,
     scratchRenderMinBounds,
   );
-
   const renderMaxBounds = Cartesian3.clamp(
     maxBounds,
     clipMinBounds,
@@ -190,13 +157,11 @@ VoxelBoxShape.prototype.update = function (
     scratchRenderMaxBounds,
   );
 
-  const scale = Matrix4.getScale(modelMatrix, scratchScale);
-
   // Box is not visible if:
   // - any of the min render bounds exceed the max render bounds
   // - two or more of the min bounds equal the max bounds (line / point)
-  // - any of the min clip bounds exceed the max clip bounds
   // - scale is 0 for any component (too annoying to reconstruct rotation matrix)
+  const scale = Matrix4.getScale(modelMatrix, scratchScale);
   if (
     renderMinBounds.x > renderMaxBounds.x ||
     renderMinBounds.y > renderMaxBounds.y ||
@@ -205,9 +170,6 @@ VoxelBoxShape.prototype.update = function (
       (renderMinBounds.y === renderMaxBounds.y) +
       (renderMinBounds.z === renderMaxBounds.z) >=
       2 ||
-    clipMinBounds.x > clipMaxBounds.x ||
-    clipMinBounds.y > clipMaxBounds.y ||
-    clipMinBounds.z > clipMaxBounds.z ||
     scale.x === 0.0 ||
     scale.y === 0.0 ||
     scale.z === 0.0
@@ -246,10 +208,6 @@ VoxelBoxShape.prototype.update = function (
     }
   }
 
-  const hasShapeBounds =
-    !Cartesian3.equals(minBounds, defaultMinBounds) ||
-    !Cartesian3.equals(maxBounds, defaultMaxBounds);
-
   // Keep track of how many intersections there are going to be.
   let intersectionCount = 0;
 
@@ -267,36 +225,34 @@ VoxelBoxShape.prototype.update = function (
     shaderUniforms.renderMaxBounds,
   );
 
-  if (hasShapeBounds) {
-    shaderDefines["BOX_HAS_SHAPE_BOUNDS"] = true;
-
-    const min = minBounds;
-    const max = maxBounds;
-
-    // Go from UV space to bounded UV space:
-    // delerp(posUv, minBoundsUv, maxBoundsUv)
-    // (posUv - minBoundsUv) / (maxBoundsUv - minBoundsUv)
-    // posUv / (maxBoundsUv - minBoundsUv) - minBoundsUv / (maxBoundsUv - minBoundsUv)
-    // scale = 1.0 / (maxBoundsUv - minBoundsUv)
-    // scale = 1.0 / ((maxBounds * 0.5 + 0.5) - (minBounds * 0.5 + 0.5))
-    // scale = 2.0 / (maxBounds - minBounds)
-    // offset = -minBoundsUv / ((maxBounds * 0.5 + 0.5) - (minBounds * 0.5 + 0.5))
-    // offset = -2.0 * (minBounds * 0.5 + 0.5) / (maxBounds - minBounds)
-    // offset = -scale * (minBounds * 0.5 + 0.5)
-    shaderUniforms.boxUvToShapeUvScale = 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),
-      shaderUniforms.boxUvToShapeUvScale,
-    );
+  shaderDefines["BOX_HAS_SHAPE_BOUNDS"] = true;
+
+  const min = minBounds;
+  const max = maxBounds;
+
+  // Go from UV space to bounded UV space:
+  // delerp(posUv, minBoundsUv, maxBoundsUv)
+  // (posUv - minBoundsUv) / (maxBoundsUv - minBoundsUv)
+  // posUv / (maxBoundsUv - minBoundsUv) - minBoundsUv / (maxBoundsUv - minBoundsUv)
+  // scale = 1.0 / (maxBoundsUv - minBoundsUv)
+  // scale = 1.0 / ((maxBounds * 0.5 + 0.5) - (minBounds * 0.5 + 0.5))
+  // scale = 2.0 / (maxBounds - minBounds)
+  // offset = -minBoundsUv / ((maxBounds * 0.5 + 0.5) - (minBounds * 0.5 + 0.5))
+  // offset = -2.0 * (minBounds * 0.5 + 0.5) / (maxBounds - minBounds)
+  // offset = -scale * (minBounds * 0.5 + 0.5)
+  shaderUniforms.boxUvToShapeUvScale = 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),
+    shaderUniforms.boxUvToShapeUvScale,
+  );
 
-    shaderUniforms.boxUvToShapeUvTranslate = Cartesian3.fromElements(
-      -shaderUniforms.boxUvToShapeUvScale.x * (min.x * 0.5 + 0.5),
-      -shaderUniforms.boxUvToShapeUvScale.y * (min.y * 0.5 + 0.5),
-      -shaderUniforms.boxUvToShapeUvScale.z * (min.z * 0.5 + 0.5),
-      shaderUniforms.boxUvToShapeUvTranslate,
-    );
-  }
+  shaderUniforms.boxUvToShapeUvTranslate = Cartesian3.fromElements(
+    -shaderUniforms.boxUvToShapeUvScale.x * (min.x * 0.5 + 0.5),
+    -shaderUniforms.boxUvToShapeUvScale.y * (min.y * 0.5 + 0.5),
+    -shaderUniforms.boxUvToShapeUvScale.z * (min.z * 0.5 + 0.5),
+    shaderUniforms.boxUvToShapeUvTranslate,
+  );
 
   this.shaderMaximumIntersectionsLength = intersectionCount;