@cesium/engine 15.0.0 → 17.0.0

package/Source/Scene/Cesium3DTileBatchTable.js

@@ -3,7 +3,6 @@ import Check from "../Core/Check.js";
 import clone from "../Core/clone.js";
 import Color from "../Core/Color.js";
 import combine from "../Core/combine.js";
-import defaultValue from "../Core/defaultValue.js";
 import defined from "../Core/defined.js";
 import deprecationWarning from "../Core/deprecationWarning.js";
 import destroyObject from "../Core/destroyObject.js";
@@ -48,7 +47,7 @@ function Cesium3DTileBatchTable(
   if (defined(batchTableJson)) {
     extensions = batchTableJson.extensions;
   }
-  this._extensions = defaultValue(extensions, {});
+  this._extensions = extensions ?? {};
 
   const properties = initializeProperties(batchTableJson);
   this._properties = properties;
@@ -266,13 +265,11 @@ Cesium3DTileBatchTable.prototype.applyStyle = function (style) {
   for (let i = 0; i < length; ++i) {
     const feature = content.getFeature(i);
     const color = defined(style.color)
-      ? defaultValue(
-          style.color.evaluateColor(feature, scratchColor),
-          DEFAULT_COLOR_VALUE,
-        )
+      ? (style.color.evaluateColor(feature, scratchColor) ??
+        DEFAULT_COLOR_VALUE)
       : DEFAULT_COLOR_VALUE;
     const show = defined(style.show)
-      ? defaultValue(style.show.evaluate(feature), DEFAULT_SHOW_VALUE)
+      ? (style.show.evaluate(feature) ?? DEFAULT_SHOW_VALUE)
       : DEFAULT_SHOW_VALUE;
     this.setColor(i, color);
     this.setShow(i, show);
@@ -783,45 +780,6 @@ Cesium3DTileBatchTable.prototype.getFragmentShaderCallback = function (
   };
 };
 
-Cesium3DTileBatchTable.prototype.getClassificationFragmentShaderCallback =
-  function () {
-    if (this.featuresLength === 0) {
-      return;
-    }
-    return function (source) {
-      source = ShaderSource.replaceMain(source, "tile_main");
-      if (ContextLimits.maximumVertexTextureImageUnits > 0) {
-        // When VTF is supported, per-feature show/hide already happened in the fragment shader
-        source +=
-          "uniform sampler2D tile_pickTexture;\n" +
-          "in vec2 tile_featureSt; \n" +
-          "in vec4 tile_featureColor; \n" +
-          "void main() \n" +
-          "{ \n" +
-          "    tile_main(); \n" +
-          "    out_FragColor = tile_featureColor; \n" +
-          "    out_FragColor.rgb *= out_FragColor.a; \n" +
-          "}";
-      } else {
-        source +=
-          "uniform sampler2D tile_batchTexture; \n" +
-          "uniform sampler2D tile_pickTexture;\n" +
-          "in vec2 tile_featureSt; \n" +
-          "void main() \n" +
-          "{ \n" +
-          "    tile_main(); \n" +
-          "    vec4 featureProperties = texture(tile_batchTexture, tile_featureSt); \n" +
-          "    if (featureProperties.a == 0.0) { \n" + // show: alpha == 0 - false, non-zero - true
-          "        discard; \n" +
-          "    } \n" +
-          "    out_FragColor = featureProperties; \n" +
-          "    out_FragColor.rgb *= out_FragColor.a; \n" +
-          "} \n";
-      }
-      return source;
-    };
-  };
-
 function getColorBlend(batchTable) {
   const tileset = batchTable._content.tileset;
   const colorBlendMode = tileset.colorBlendMode;
@@ -851,9 +809,8 @@ Cesium3DTileBatchTable.prototype.getUniformMapCallback = function () {
     const batchUniformMap = {
       tile_batchTexture: function () {
         // PERFORMANCE_IDEA: we could also use a custom shader that avoids the texture read.
-        return defaultValue(
-          that._batchTexture.batchTexture,
-          that._batchTexture.defaultTexture,
+        return (
+          that._batchTexture.batchTexture ?? that._batchTexture.defaultTexture
         );
       },
       tile_textureDimensions: function () {

package/Source/Scene/Cesium3DTileFeatureTable.js

@@ -1,5 +1,4 @@
 import ComponentDatatype from "../Core/ComponentDatatype.js";
-import defaultValue from "../Core/defaultValue.js";
 import defined from "../Core/defined.js";
 
 /**
@@ -55,8 +54,8 @@ Cesium3DTileFeatureTable.prototype.getGlobalProperty = function (
   }
 
   if (defined(jsonValue.byteOffset)) {
-    componentType = defaultValue(componentType, ComponentDatatype.UNSIGNED_INT);
-    componentLength = defaultValue(componentLength, 1);
+    componentType = componentType ?? ComponentDatatype.UNSIGNED_INT;
+    componentLength = componentLength ?? 1;
     return getTypedArrayFromBinary(
       this,
       semantic,

package/Source/Scene/Cesium3DTilePointFeature.js

@@ -1,6 +1,5 @@
 import Cartographic from "../Core/Cartographic.js";
 import Color from "../Core/Color.js";
-import defaultValue from "../Core/defaultValue.js";
 import defined from "../Core/defined.js";
 import Cesium3DTileFeature from "./Cesium3DTileFeature.js";
 import createBillboardPointCallback from "./createBillboardPointCallback.js";
@@ -411,7 +410,7 @@ Object.defineProperties(Cesium3DTilePointFeature.prototype, {
       return this._heightOffset;
     },
     set: function (value) {
-      const offset = defaultValue(this._heightOffset, 0.0);
+      const offset = this._heightOffset ?? 0.0;
 
       const ellipsoid = this._content.tileset.ellipsoid;
       const cart = ellipsoid.cartesianToCartographic(
@@ -652,22 +651,15 @@ function setBillboardImage(feature) {
     return;
   }
 
-  const newColor = defaultValue(
-    feature._color,
-    Cesium3DTilePointFeature.defaultColor,
-  );
-  const newOutlineColor = defaultValue(
-    feature._pointOutlineColor,
-    Cesium3DTilePointFeature.defaultPointOutlineColor,
-  );
-  const newOutlineWidth = defaultValue(
-    feature._pointOutlineWidth,
-    Cesium3DTilePointFeature.defaultPointOutlineWidth,
-  );
-  const newPointSize = defaultValue(
-    feature._pointSize,
-    Cesium3DTilePointFeature.defaultPointSize,
-  );
+  const newColor = feature._color ?? Cesium3DTilePointFeature.defaultColor;
+  const newOutlineColor =
+    feature._pointOutlineColor ??
+    Cesium3DTilePointFeature.defaultPointOutlineColor;
+  const newOutlineWidth =
+    feature._pointOutlineWidth ??
+    Cesium3DTilePointFeature.defaultPointOutlineWidth;
+  const newPointSize =
+    feature._pointSize ?? Cesium3DTilePointFeature.defaultPointSize;
 
   const currentColor = feature._billboardColor;
   const currentOutlineColor = feature._billboardOutlineColor;

package/Source/Scene/Cesium3DTileStyle.js

@@ -1,5 +1,5 @@
 import clone from "../Core/clone.js";
-import defaultValue from "../Core/defaultValue.js";
+import Frozen from "../Core/Frozen.js";
 import defined from "../Core/defined.js";
 import DeveloperError from "../Core/DeveloperError.js";
 import Resource from "../Core/Resource.js";
@@ -86,7 +86,7 @@ function Cesium3DTileStyle(style) {
 }
 
 function setup(that, styleJson) {
-  styleJson = defaultValue(clone(styleJson, true), that._style);
+  styleJson = clone(styleJson, true) ?? that._style;
   that._style = styleJson;
 
   that.show = styleJson.show;
@@ -119,7 +119,7 @@ function setup(that, styleJson) {
   const meta = {};
   if (defined(styleJson.meta)) {
     const defines = styleJson.defines;
-    const metaJson = defaultValue(styleJson.meta, defaultValue.EMPTY_OBJECT);
+    const metaJson = styleJson.meta ?? Frozen.EMPTY_OBJECT;
     for (const property in metaJson) {
       if (metaJson.hasOwnProperty(property)) {
         meta[property] = new Expression(metaJson[property], defines);
@@ -133,10 +133,7 @@ function setup(that, styleJson) {
 }
 
 function getExpression(tileStyle, value) {
-  const defines = defaultValue(
-    tileStyle._style,
-    defaultValue.EMPTY_OBJECT,
-  ).defines;
+  const defines = (tileStyle._style ?? Frozen.EMPTY_OBJECT).defines;
 
   if (!defined(value)) {
     return undefined;

package/Source/Scene/Cesium3DTilesVoxelProvider.js

@@ -1,7 +1,7 @@
 import Cartesian3 from "../Core/Cartesian3.js";
 import Cesium3DTilesetMetadata from "./Cesium3DTilesetMetadata.js";
 import Check from "../Core/Check.js";
-import defaultValue from "../Core/defaultValue.js";
+import Frozen from "../Core/Frozen.js";
 import defined from "../Core/defined.js";
 import Ellipsoid from "../Core/Ellipsoid.js";
 import hasExtension from "./hasExtension.js";
@@ -9,6 +9,7 @@ import ImplicitSubtree from "./ImplicitSubtree.js";
 import ImplicitSubtreeCache from "./ImplicitSubtreeCache.js";
 import ImplicitTileCoordinates from "./ImplicitTileCoordinates.js";
 import ImplicitTileset from "./ImplicitTileset.js";
+import Matrix3 from "../Core/Matrix3.js";
 import Matrix4 from "../Core/Matrix4.js";
 import MetadataSemantic from "./MetadataSemantic.js";
 import MetadataType from "./MetadataType.js";
@@ -17,11 +18,11 @@ import preprocess3DTileContent from "./preprocess3DTileContent.js";
 import Resource from "../Core/Resource.js";
 import ResourceCache from "./ResourceCache.js";
 import RuntimeError from "../Core/RuntimeError.js";
-import VoxelBoxShape from "./VoxelBoxShape.js";
 import VoxelContent from "./VoxelContent.js";
-import VoxelCylinderShape from "./VoxelCylinderShape.js";
 import VoxelMetadataOrder from "./VoxelMetadataOrder.js";
 import VoxelShapeType from "./VoxelShapeType.js";
+import CesiumMath from "../Core/Math.js";
+import Quaternion from "../Core/Quaternion.js";
 
 /**
  * @typedef {Object} Cesium3DTilesVoxelProvider.ConstructorOptions
@@ -68,7 +69,7 @@ import VoxelShapeType from "./VoxelShapeType.js";
  * @experimental This feature is not final and is subject to change without Cesium's standard deprecation policy.
  */
 function Cesium3DTilesVoxelProvider(options) {
-  options = defaultValue(options, defaultValue.EMPTY_OBJECT);
+  options = options ?? Frozen.EMPTY_OBJECT;
 
   const {
     className,
@@ -109,7 +110,10 @@ function Cesium3DTilesVoxelProvider(options) {
   this._names = names;
   this._types = types;
   this._componentTypes = componentTypes;
-  this._metadataOrder = VoxelMetadataOrder.GLTF;
+  this._metadataOrder =
+    shape === VoxelShapeType.ELLIPSOID
+      ? VoxelMetadataOrder.Z_UP
+      : VoxelMetadataOrder.Y_UP;
   this._minimumValues = minimumValues;
   this._maximumValues = maximumValues;
   this._maximumTileCount = maximumTileCount;
@@ -287,6 +291,7 @@ Object.defineProperties(Cesium3DTilesVoxelProvider.prototype, {
    * @memberof Cesium3DTilesVoxelProvider.prototype
    * @type {VoxelMetadataOrder}
    * @readonly
+   * @private
    */
   metadataOrder: {
     get: function () {
@@ -406,6 +411,11 @@ Cesium3DTilesVoxelProvider.fromUrl = async function (url) {
 
   const providerOptions = getAttributeInfo(tilesetMetadata, className);
   Object.assign(providerOptions, getShape(root));
+  if (defined(root.transform)) {
+    providerOptions.globalTransform = Matrix4.unpack(root.transform);
+  } else {
+    providerOptions.globalTransform = Matrix4.clone(Matrix4.IDENTITY);
+  }
 
   providerOptions.dimensions = Cartesian3.unpack(voxel.dimensions);
   providerOptions.maximumTileCount = getTileCount(tilesetMetadata);
@@ -472,21 +482,13 @@ function validate(tileset) {
 function getShape(tile) {
   const boundingVolume = tile.boundingVolume;
 
-  let tileTransform;
-  if (defined(tile.transform)) {
-    tileTransform = Matrix4.unpack(tile.transform);
-  } else {
-    tileTransform = Matrix4.clone(Matrix4.IDENTITY);
-  }
-
   if (defined(boundingVolume.box)) {
-    return getBoxShape(boundingVolume.box, tileTransform);
+    return getBoxShape(boundingVolume.box);
   } else if (defined(boundingVolume.region)) {
     return getEllipsoidShape(boundingVolume.region);
   } else if (hasExtension(boundingVolume, "3DTILES_bounding_volume_cylinder")) {
     return getCylinderShape(
-      boundingVolume.extensions["3DTILES_bounding_volume_cylinder"].cylinder,
-      tileTransform,
+      boundingVolume.extensions["3DTILES_bounding_volume_cylinder"],
     );
   }
 
@@ -513,39 +515,60 @@ function getEllipsoidShape(region) {
     minBounds: minBounds,
     maxBounds: maxBounds,
     shapeTransform: shapeTransform,
-    globalTransform: Matrix4.clone(Matrix4.IDENTITY),
   };
 }
 
-function getBoxShape(box, tileTransform) {
+const scratchScale = new Cartesian3();
+const scratchRotation = new Matrix3();
+
+function getBoxShape(box) {
   const obb = OrientedBoundingBox.unpack(box);
-  const shapeTransform = Matrix4.fromRotationTranslation(
-    obb.halfAxes,
-    obb.center,
-  );
+  const scale = Matrix3.getScale(obb.halfAxes, scratchScale);
+  const rotation = Matrix3.getRotation(obb.halfAxes, scratchRotation);
 
   return {
     shape: VoxelShapeType.BOX,
-    minBounds: Cartesian3.clone(VoxelBoxShape.DefaultMinBounds),
-    maxBounds: Cartesian3.clone(VoxelBoxShape.DefaultMaxBounds),
-    shapeTransform: shapeTransform,
-    globalTransform: tileTransform,
+    minBounds: Cartesian3.negate(scale, new Cartesian3()),
+    maxBounds: Cartesian3.clone(scale),
+    shapeTransform: Matrix4.fromRotationTranslation(rotation, obb.center),
   };
 }
 
-function getCylinderShape(cylinder, tileTransform) {
-  const obb = OrientedBoundingBox.unpack(cylinder);
-  const shapeTransform = Matrix4.fromRotationTranslation(
-    obb.halfAxes,
-    obb.center,
+function getCylinderShape(cylinder) {
+  const {
+    minRadius,
+    maxRadius,
+    height,
+    minAngle = -CesiumMath.PI,
+    maxAngle = CesiumMath.PI,
+    translation = [0, 0, 0],
+    rotation = [0, 0, 0, 1],
+  } = cylinder;
+
+  //>>includeStart('debug', pragmas.debug);
+  Check.typeOf.number("minRadius", minRadius);
+  Check.typeOf.number("maxRadius", maxRadius);
+  Check.typeOf.number("height", height);
+  Check.typeOf.number("minAngle", minAngle);
+  Check.typeOf.number("maxAngle", maxAngle);
+  Check.typeOf.object("translation", translation);
+  Check.typeOf.object("rotation", rotation);
+  //>>includeEnd('debug');
+
+  const minHeight = -0.5 * height + translation[2];
+  const maxHeight = 0.5 * height + translation[2];
+
+  const shapeTransform = Matrix4.fromTranslationQuaternionRotationScale(
+    Cartesian3.unpack(translation),
+    Quaternion.unpack(rotation),
+    Cartesian3.ONE,
   );
 
   return {
     shape: VoxelShapeType.CYLINDER,
-    minBounds: Cartesian3.clone(VoxelCylinderShape.DefaultMinBounds),
-    maxBounds: Cartesian3.clone(VoxelCylinderShape.DefaultMaxBounds),
+    minBounds: Cartesian3.fromElements(minRadius, minAngle, minHeight),
+    maxBounds: Cartesian3.fromElements(maxRadius, maxAngle, maxHeight),
     shapeTransform: shapeTransform,
-    globalTransform: tileTransform,
   };
 }
 
@@ -668,7 +691,7 @@ async function getSubtree(provider, subtreeCoord) {
  * @returns {Promise<VoxelContent>|undefined} A promise resolving to a VoxelContent containing the data for the tile, or undefined if the request could not be scheduled this frame.
  */
 Cesium3DTilesVoxelProvider.prototype.requestData = async function (options) {
-  options = defaultValue(options, defaultValue.EMPTY_OBJECT);
+  options = options ?? Frozen.EMPTY_OBJECT;
   const {
     tileLevel = 0,
     tileX = 0,