@cesium/engine 7.0.0 → 9.0.0

package/Source/DataSources/GeometryUpdaterSet.js

@@ -0,0 +1,114 @@
+import destroyObject from "../Core/destroyObject.js";
+import Event from "../Core/Event.js";
+import EventHelper from "../Core/EventHelper.js";
+import BoxGeometryUpdater from "./BoxGeometryUpdater.js";
+import CorridorGeometryUpdater from "./CorridorGeometryUpdater.js";
+import CylinderGeometryUpdater from "./CylinderGeometryUpdater.js";
+import EllipseGeometryUpdater from "./EllipseGeometryUpdater.js";
+import EllipsoidGeometryUpdater from "./EllipsoidGeometryUpdater.js";
+import PlaneGeometryUpdater from "./PlaneGeometryUpdater.js";
+import PolygonGeometryUpdater from "./PolygonGeometryUpdater.js";
+import PolylineVolumeGeometryUpdater from "./PolylineVolumeGeometryUpdater.js";
+import RectangleGeometryUpdater from "./RectangleGeometryUpdater.js";
+import WallGeometryUpdater from "./WallGeometryUpdater.js";
+
+/** @type {GeometryUpdater[]} */
+const geometryUpdaters = [
+  BoxGeometryUpdater,
+  CylinderGeometryUpdater,
+  CorridorGeometryUpdater,
+  EllipseGeometryUpdater,
+  EllipsoidGeometryUpdater,
+  PlaneGeometryUpdater,
+  PolygonGeometryUpdater,
+  PolylineVolumeGeometryUpdater,
+  RectangleGeometryUpdater,
+  WallGeometryUpdater,
+];
+
+/**
+ * Manages a set of "updater" classes for the {@link GeometryVisualizer} for each entity
+ *
+ * @private
+ * @param {Entity} entity
+ * @param {Scene} scene
+ */
+function GeometryUpdaterSet(entity, scene) {
+  this.entity = entity;
+  this.scene = scene;
+  const updaters = new Array(geometryUpdaters.length);
+  const geometryChanged = new Event();
+  const eventHelper = new EventHelper();
+  for (let i = 0; i < updaters.length; i++) {
+    const updater = new geometryUpdaters[i](entity, scene);
+    eventHelper.add(updater.geometryChanged, (geometry) => {
+      geometryChanged.raiseEvent(geometry);
+    });
+    updaters[i] = updater;
+  }
+  this.updaters = updaters;
+  this.geometryChanged = geometryChanged;
+  this.eventHelper = eventHelper;
+
+  this._removeEntitySubscription = entity.definitionChanged.addEventListener(
+    GeometryUpdaterSet.prototype._onEntityPropertyChanged,
+    this
+  );
+}
+
+GeometryUpdaterSet.prototype._onEntityPropertyChanged = function (
+  entity,
+  propertyName,
+  newValue,
+  oldValue
+) {
+  const updaters = this.updaters;
+  for (let i = 0; i < updaters.length; i++) {
+    updaters[i]._onEntityPropertyChanged(
+      entity,
+      propertyName,
+      newValue,
+      oldValue
+    );
+  }
+};
+
+GeometryUpdaterSet.prototype.forEach = function (callback) {
+  const updaters = this.updaters;
+  for (let i = 0; i < updaters.length; i++) {
+    callback(updaters[i]);
+  }
+};
+
+GeometryUpdaterSet.prototype.destroy = function () {
+  this.eventHelper.removeAll();
+  const updaters = this.updaters;
+  for (let i = 0; i < updaters.length; i++) {
+    updaters[i].destroy();
+  }
+  this._removeEntitySubscription();
+  destroyObject(this);
+};
+
+/**
+ * Add the provided updater to the default list of updaters if not already included
+ * @param {GeometryUpdater} updater
+ */
+GeometryUpdaterSet.registerUpdater = function (updater) {
+  if (!geometryUpdaters.includes(updater)) {
+    geometryUpdaters.push(updater);
+  }
+};
+
+/**
+ * Remove the provided updater from the default list of updaters if included
+ * @param {GeometryUpdater} updater
+ */
+GeometryUpdaterSet.unregisterUpdater = function (updater) {
+  if (geometryUpdaters.includes(updater)) {
+    const index = geometryUpdaters.indexOf(updater);
+    geometryUpdaters.splice(index, 1);
+  }
+};
+
+export default GeometryUpdaterSet;

package/Source/DataSources/GeometryVisualizer.js

@@ -4,105 +4,23 @@ import Check from "../Core/Check.js";
 import defaultValue from "../Core/defaultValue.js";
 import defined from "../Core/defined.js";
 import destroyObject from "../Core/destroyObject.js";
-import Event from "../Core/Event.js";
-import EventHelper from "../Core/EventHelper.js";
 import ClassificationType from "../Scene/ClassificationType.js";
 import MaterialAppearance from "../Scene/MaterialAppearance.js";
 import PerInstanceColorAppearance from "../Scene/PerInstanceColorAppearance.js";
 import ShadowMode from "../Scene/ShadowMode.js";
 import BoundingSphereState from "./BoundingSphereState.js";
-import BoxGeometryUpdater from "./BoxGeometryUpdater.js";
 import ColorMaterialProperty from "./ColorMaterialProperty.js";
-import CorridorGeometryUpdater from "./CorridorGeometryUpdater.js";
-import CylinderGeometryUpdater from "./CylinderGeometryUpdater.js";
 import DynamicGeometryBatch from "./DynamicGeometryBatch.js";
-import EllipseGeometryUpdater from "./EllipseGeometryUpdater.js";
-import EllipsoidGeometryUpdater from "./EllipsoidGeometryUpdater.js";
 import Entity from "./Entity.js";
-import PlaneGeometryUpdater from "./PlaneGeometryUpdater.js";
-import PolygonGeometryUpdater from "./PolygonGeometryUpdater.js";
-import PolylineVolumeGeometryUpdater from "./PolylineVolumeGeometryUpdater.js";
-import RectangleGeometryUpdater from "./RectangleGeometryUpdater.js";
+import GeometryUpdaterSet from "./GeometryUpdaterSet.js";
 import StaticGeometryColorBatch from "./StaticGeometryColorBatch.js";
 import StaticGeometryPerMaterialBatch from "./StaticGeometryPerMaterialBatch.js";
 import StaticGroundGeometryColorBatch from "./StaticGroundGeometryColorBatch.js";
 import StaticGroundGeometryPerMaterialBatch from "./StaticGroundGeometryPerMaterialBatch.js";
 import StaticOutlineGeometryBatch from "./StaticOutlineGeometryBatch.js";
-import WallGeometryUpdater from "./WallGeometryUpdater.js";
 
 const emptyArray = [];
 
-const geometryUpdaters = [
-  BoxGeometryUpdater,
-  CylinderGeometryUpdater,
-  CorridorGeometryUpdater,
-  EllipseGeometryUpdater,
-  EllipsoidGeometryUpdater,
-  PlaneGeometryUpdater,
-  PolygonGeometryUpdater,
-  PolylineVolumeGeometryUpdater,
-  RectangleGeometryUpdater,
-  WallGeometryUpdater,
-];
-
-function GeometryUpdaterSet(entity, scene) {
-  this.entity = entity;
-  this.scene = scene;
-  const updaters = new Array(geometryUpdaters.length);
-  const geometryChanged = new Event();
-  function raiseEvent(geometry) {
-    geometryChanged.raiseEvent(geometry);
-  }
-  const eventHelper = new EventHelper();
-  for (let i = 0; i < updaters.length; i++) {
-    const updater = new geometryUpdaters[i](entity, scene);
-    eventHelper.add(updater.geometryChanged, raiseEvent);
-    updaters[i] = updater;
-  }
-  this.updaters = updaters;
-  this.geometryChanged = geometryChanged;
-  this.eventHelper = eventHelper;
-
-  this._removeEntitySubscription = entity.definitionChanged.addEventListener(
-    GeometryUpdaterSet.prototype._onEntityPropertyChanged,
-    this
-  );
-}
-
-GeometryUpdaterSet.prototype._onEntityPropertyChanged = function (
-  entity,
-  propertyName,
-  newValue,
-  oldValue
-) {
-  const updaters = this.updaters;
-  for (let i = 0; i < updaters.length; i++) {
-    updaters[i]._onEntityPropertyChanged(
-      entity,
-      propertyName,
-      newValue,
-      oldValue
-    );
-  }
-};
-
-GeometryUpdaterSet.prototype.forEach = function (callback) {
-  const updaters = this.updaters;
-  for (let i = 0; i < updaters.length; i++) {
-    callback(updaters[i]);
-  }
-};
-
-GeometryUpdaterSet.prototype.destroy = function () {
-  this.eventHelper.removeAll();
-  const updaters = this.updaters;
-  for (let i = 0; i < updaters.length; i++) {
-    updaters[i].destroy();
-  }
-  this._removeEntitySubscription();
-  destroyObject(this);
-};
-
 /**
  * A general purpose visualizer for geometry represented by {@link Primitive} instances.
  * @alias GeometryVisualizer
@@ -293,6 +211,24 @@ function GeometryVisualizer(
   );
 }
 
+/**
+ * Add the provided updater to the default list of updaters if not already included
+ * @private
+ * @param {GeometryUpdater} updater
+ */
+GeometryVisualizer.registerUpdater = function (updater) {
+  GeometryUpdaterSet.registerUpdater(updater);
+};
+
+/**
+ * Remove the provided updater from the default list of updaters if included
+ * @private
+ * @param {GeometryUpdater} updater
+ */
+GeometryVisualizer.unregisterUpdater = function (updater) {
+  GeometryUpdaterSet.unregisterUpdater(updater);
+};
+
 /**
  * Updates all of the primitives created by this visualizer to match their
  * Entity counterpart at the given time.

package/Source/Renderer/Context.js

@@ -1432,6 +1432,16 @@ Context.prototype.endFrame = function () {
   }
 };
 
+/**
+ * @private
+ * @param {object} readState An object with the following properties:
+ * @param {number} [readState.x=0] The x offset of the rectangle to read from.
+ * @param {number} [readState.y=0] The y offset of the rectangle to read from.
+ * @param {number} [readState.width=gl.drawingBufferWidth] The width of the rectangle to read from.
+ * @param {number} [readState.height=gl.drawingBufferHeight] The height of the rectangle to read from.
+ * @param {Framebuffer} [readState.framebuffer] The framebuffer to read from. If undefined, the read will be from the default framebuffer.
+ * @returns {Uint8Array|Uint16Array|Float32Array|Uint32Array} The pixels in the specified rectangle.
+ */
 Context.prototype.readPixels = function (readState) {
   const gl = this._gl;
 

package/Source/Renderer/ContextLimits.js

@@ -1,4 +1,6 @@
 /**
+ * These are set in the constructor for {@link Context}
+ *
  * @private
  */
 const ContextLimits = {

package/Source/Renderer/demodernizeShader.js

@@ -26,7 +26,10 @@ function demodernizeShader(input, isFragmentShader) {
 
   if (isFragmentShader) {
     // Replace the in with varying.
-    output = output.replaceAll(/(in)\s+(vec\d|mat\d|float)/g, `varying $2`);
+    output = output.replaceAll(
+      /\n\s*(in)\s+(vec\d|mat\d|float)/g,
+      `\nvarying $2`
+    );
 
     if (/out_FragData_(\d+)/.test(output)) {
       output = `#extension GL_EXT_draw_buffers : enable\n${output}`;

package/Source/Scene/ArcGisMapService.js

@@ -4,7 +4,7 @@ import Resource from "../Core/Resource.js";
 
 let defaultTokenCredit;
 const defaultAccessToken =
-  "AAPK997c8ac9b63f486188c3bede0b85ba5b2SiLv1qk7ZCEiBYZ_1i90XplcyGpzezMhO7wTadCKmemjXjb1Mtj112fAt6gbfL-";
+  "AAPK3b7fccd1509046758d03c6641e404040gQG5edfR9eun2VcwtbXJKNbQjIZ7ma2vUd9ulqZK4lo3R_DJIAhwoGW9p86JNauB";
 /**
  * Default options for accessing the ArcGIS image tile service.
  *

package/Source/Scene/Axis.js

@@ -1,5 +1,4 @@
 import Check from "../Core/Check.js";
-import CesiumMath from "../Core/Math.js";
 import Matrix3 from "../Core/Matrix3.js";
 import Matrix4 from "../Core/Matrix4.js";
 
@@ -41,7 +40,8 @@ const Axis = {
  * @constant
  */
 Axis.Y_UP_TO_Z_UP = Matrix4.fromRotationTranslation(
-  Matrix3.fromRotationX(CesiumMath.PI_OVER_TWO)
+  // Rotation about PI/2 around the X-axis
+  Matrix3.fromArray([1, 0, 0, 0, 0, 1, 0, -1, 0])
 );
 
 /**
@@ -51,7 +51,8 @@ Axis.Y_UP_TO_Z_UP = Matrix4.fromRotationTranslation(
  * @constant
  */
 Axis.Z_UP_TO_Y_UP = Matrix4.fromRotationTranslation(
-  Matrix3.fromRotationX(-CesiumMath.PI_OVER_TWO)
+  // Rotation about -PI/2 around the X-axis
+  Matrix3.fromArray([1, 0, 0, 0, 0, -1, 0, 1, 0])
 );
 
 /**
@@ -61,7 +62,8 @@ Axis.Z_UP_TO_Y_UP = Matrix4.fromRotationTranslation(
  * @constant
  */
 Axis.X_UP_TO_Z_UP = Matrix4.fromRotationTranslation(
-  Matrix3.fromRotationY(-CesiumMath.PI_OVER_TWO)
+  // Rotation about -PI/2 around the Y-axis
+  Matrix3.fromArray([0, 0, 1, 0, 1, 0, -1, 0, 0])
 );
 
 /**
@@ -71,7 +73,8 @@ Axis.X_UP_TO_Z_UP = Matrix4.fromRotationTranslation(
  * @constant
  */
 Axis.Z_UP_TO_X_UP = Matrix4.fromRotationTranslation(
-  Matrix3.fromRotationY(CesiumMath.PI_OVER_TWO)
+  // Rotation about PI/2 around the Y-axis
+  Matrix3.fromArray([0, 0, -1, 0, 1, 0, 1, 0, 0])
 );
 
 /**
@@ -81,7 +84,8 @@ Axis.Z_UP_TO_X_UP = Matrix4.fromRotationTranslation(
  * @constant
  */
 Axis.X_UP_TO_Y_UP = Matrix4.fromRotationTranslation(
-  Matrix3.fromRotationZ(CesiumMath.PI_OVER_TWO)
+  // Rotation about PI/2 around the Z-axis
+  Matrix3.fromArray([0, 1, 0, -1, 0, 0, 0, 0, 1])
 );
 
 /**
@@ -91,7 +95,8 @@ Axis.X_UP_TO_Y_UP = Matrix4.fromRotationTranslation(
  * @constant
  */
 Axis.Y_UP_TO_X_UP = Matrix4.fromRotationTranslation(
-  Matrix3.fromRotationZ(-CesiumMath.PI_OVER_TWO)
+  // Rotation about -PI/2 around the Z-axis
+  Matrix3.fromArray([0, -1, 0, 1, 0, 0, 0, 0, 1])
 );
 
 /**

package/Source/Scene/Billboard.js

@@ -22,6 +22,35 @@ import SceneMode from "./SceneMode.js";
 import SceneTransforms from "./SceneTransforms.js";
 import VerticalOrigin from "./VerticalOrigin.js";
 
+/**
+ * @typedef {object} Billboard.ConstructorOptions
+ *
+ * Initialization options for the first param of Billboard constructor
+ *
+ * @property {Cartesian3} position The cartesian position of the billboard.
+ * @property {string} [id] A user-defined object to return when the billboard is picked with {@link Scene#pick}.
+ * @property {boolean} [show=true] Determines if this billboard will be shown.
+ * @property {string | HTMLCanvasElement} [image] A loaded HTMLImageElement, ImageData, or a url to an image to use for the billboard.
+ * @property {number} [scale=1.0] A number specifying the uniform scale that is multiplied with the billboard's image size in pixels.
+ * @property {Cartesian2} [pixelOffset=Cartesian2.ZERO] A {@link Cartesian2} Specifying the pixel offset in screen space from the origin of this billboard.
+ * @property {Cartesian3} [eyeOffset=Cartesian3.ZERO] A {@link Cartesian3} Specifying the 3D Cartesian offset applied to this billboard in eye coordinates.
+ * @property {HorizontalOrigin} [horizontalOrigin=HorizontalOrigin.CENTER] A {@link HorizontalOrigin} Specifying the horizontal origin of this billboard.
+ * @property {VerticalOrigin} [verticalOrigin=VerticalOrigin.CENTER] A {@link VerticalOrigin} Specifying the vertical origin of this billboard.
+ * @property {HeightReference} [heightReference=HeightReference.NONE] A {@link HeightReference} Specifying the height reference of this billboard.
+ * @property {Color} [color=Color.WHITE] A {@link Color} Specifying the color that is multiplied with the billboard's texture.
+ * @property {number} [rotation=0] A number specifying the rotation angle in radians.
+ * @property {Cartesian3} [alignedAxis=Cartesian3.ZERO] A {@link Cartesian3} Specifying the aligned axis in world space.
+ * @property {boolean} [sizeInMeters] A boolean specifying if the billboard size is in meters or pixels.
+ * @property {number} [width] A number specifying the width of the billboard. If undefined, the image width will be used.
+ * @property {number} [height] A number specifying the height of the billboard. If undefined, the image height will be used.
+ * @property {NearFarScalar} [scaleByDistance] A {@link NearFarScalar} Specifying near and far scaling properties of a Billboard based on the billboard's distance from the camera.
+ * @property {NearFarScalar} [translucencyByDistance] A {@link NearFarScalar} Specifying near and far translucency properties of a Billboard based on the billboard's distance from the camera.
+ * @property {NearFarScalar} [pixelOffsetScaleByDistance] A {@link NearFarScalar} Specifying near and far pixel offset scaling properties of a Billboard based on the billboard's distance from the camera.
+ * @property {BoundingRectangle} [imageSubRegion] A {@link BoundingRectangle} Specifying the sub-region of the image to use for the billboard, rather than the entire image.
+ * @property {DistanceDisplayCondition} [distanceDisplayCondition] A {@link DistanceDisplayCondition} Specifying the distance from the camera at which this billboard will be displayed.
+ * @property {number} [disableDepthTestDistance] A number specifying the distance from the camera at which to disable the depth test to, for example, prevent clipping against terrain.
+ */
+
 /**
  * <div class="notice">
  * A billboard is created and its initial
@@ -56,6 +85,9 @@ import VerticalOrigin from "./VerticalOrigin.js";
  * @internalConstructor
  * @class
  *
+ * @param {Billboard.ConstructorOptions} options Object describing initialization options
+ * @param {BillboardCollection} billboardCollection Instance of BillboardCollection
+ *
  * @demo {@link https://sandcastle.cesium.com/index.html?src=Billboards.html|Cesium Sandcastle Billboard Demo}
  */
 function Billboard(options, billboardCollection) {

package/Source/Scene/BillboardCollection.js

@@ -426,7 +426,7 @@ function destroyBillboards(billboards) {
  * Creates and adds a billboard with the specified initial properties to the collection.
  * The added billboard is returned so it can be modified or removed from the collection later.
  *
- * @param {object}[options] A template describing the billboard's properties as shown in Example 1.
+ * @param {Billboard.ConstructorOptions}[options] A template describing the billboard's properties as shown in Example 1.
  * @returns {Billboard} The billboard that was added to the collection.
  *
  * @performance Calling <code>add</code> is expected constant time.  However, the collection's vertex buffer

package/Source/Scene/BingMapsImageryProvider.js

@@ -500,6 +500,10 @@ BingMapsImageryProvider.fromUrl = async function (url, options) {
     queryParameters.mapLayer = options.mapLayer;
   }
 
+  if (defined(options.culture)) {
+    queryParameters.culture = options.culture;
+  }
+
   const metadataResource = resource.getDerivedResource({
     url: `REST/v1/Imagery/Metadata/${mapStyle}`,
     queryParameters: queryParameters,

package/Source/Scene/Camera.js

@@ -217,6 +217,7 @@ function Camera(scene) {
   this._changedDirection = undefined;
   this._changedFrustum = undefined;
   this._changedHeading = undefined;
+  this._changedRoll = undefined;
 
   /**
    * The amount the camera has to change before the <code>changed</code> event is raised. The value is a percentage in the [0, 1] range.
@@ -380,25 +381,55 @@ Camera.prototype._updateCameraChanged = function () {
 
   const percentageChanged = camera.percentageChanged;
 
+  // check heading
   const currentHeading = camera.heading;
 
   if (!defined(camera._changedHeading)) {
     camera._changedHeading = currentHeading;
   }
 
-  let delta =
+  let headingDelta =
     Math.abs(camera._changedHeading - currentHeading) % CesiumMath.TWO_PI;
-  delta = delta > CesiumMath.PI ? CesiumMath.TWO_PI - delta : delta;
+  headingDelta =
+    headingDelta > CesiumMath.PI
+      ? CesiumMath.TWO_PI - headingDelta
+      : headingDelta;
 
   // Since delta is computed as the shortest distance between two angles
   // the percentage is relative to the half circle.
-  const headingChangedPercentage = delta / Math.PI;
+  const headingChangedPercentage = headingDelta / Math.PI;
 
   if (headingChangedPercentage > percentageChanged) {
-    camera._changed.raiseEvent(headingChangedPercentage);
     camera._changedHeading = currentHeading;
   }
 
+  // check roll
+  const currentRoll = camera.roll;
+
+  if (!defined(camera._changedRoll)) {
+    camera._changedRoll = currentRoll;
+  }
+
+  let rollDelta =
+    Math.abs(camera._changedRoll - currentRoll) % CesiumMath.TWO_PI;
+  rollDelta =
+    rollDelta > CesiumMath.PI ? CesiumMath.TWO_PI - rollDelta : rollDelta;
+
+  // Since delta is computed as the shortest distance between two angles
+  // the percentage is relative to the half circle.
+  const rollChangedPercentage = rollDelta / Math.PI;
+
+  if (rollChangedPercentage > percentageChanged) {
+    camera._changedRoll = currentRoll;
+  }
+  if (
+    rollChangedPercentage > percentageChanged ||
+    headingChangedPercentage > percentageChanged
+  ) {
+    camera._changed.raiseEvent(
+      Math.max(rollChangedPercentage, headingChangedPercentage)
+    );
+  }
   if (camera._mode === SceneMode.SCENE2D) {
     if (!defined(camera._changedFrustum)) {
       camera._changedPosition = Cartesian3.clone(
@@ -1233,6 +1264,11 @@ const scratchSetViewMatrix3 = new Matrix3();
 const scratchSetViewCartographic = new Cartographic();
 
 function setView3D(camera, position, hpr) {
+  //>>includeStart('debug', pragmas.debug);
+  if (isNaN(position.x) || isNaN(position.y) || isNaN(position.z)) {
+    throw new DeveloperError("position has a NaN component");
+  }
+  //>>includeEnd('debug');
   const currentTransform = Matrix4.clone(
     camera.transform,
     scratchSetViewTransform1
@@ -1473,6 +1509,12 @@ Camera.prototype.setView = function (options) {
       destination,
       scratchSetViewCartesian
     );
+    //>>includeStart('debug', pragmas.debug);
+    // destination.z may be null in 2D, but .x and .y should be numeric
+    if (isNaN(destination.x) || isNaN(destination.y)) {
+      throw new DeveloperError(`destination has a NaN component`);
+    }
+    //>>includeEnd('debug');
     convert = false;
   }
 

package/Source/Scene/Cesium3DTilesVoxelProvider.js

@@ -247,15 +247,8 @@ function getEllipsoidShape(region) {
 
   const shapeTransform = Matrix4.fromScale(Ellipsoid.WGS84.radii);
 
-  const minBoundsX = west;
-  const maxBoundsX = east;
-  const minBoundsY = south;
-  const maxBoundsY = north;
-  const minBoundsZ = minHeight;
-  const maxBoundsZ = maxHeight;
-
-  const minBounds = new Cartesian3(minBoundsX, minBoundsY, minBoundsZ);
-  const maxBounds = new Cartesian3(maxBoundsX, maxBoundsY, maxBoundsZ);
+  const minBounds = new Cartesian3(west, south, minHeight);
+  const maxBounds = new Cartesian3(east, north, maxHeight);
 
   return {
     shape: VoxelShapeType.ELLIPSOID,

package/Source/Scene/Cesium3DTileset.js

@@ -112,7 +112,7 @@ import Ray from "../Core/Ray.js";
  * @property {string|number} [instanceFeatureIdLabel="instanceFeatureId_0"] Label of the instance feature ID set used for picking and styling. If instanceFeatureIdLabel is set to an integer N, it is converted to the string "instanceFeatureId_N" automatically. If both per-primitive and per-instance feature IDs are present, the instance feature IDs take priority.
  * @property {boolean} [showCreditsOnScreen=false] Whether to display the credits of this tileset on screen.
  * @property {SplitDirection} [splitDirection=SplitDirection.NONE] The {@link SplitDirection} split to apply to this tileset.
- * @property {boolean} [disableCollision=false] Whether to turn off collisions for camera collisions or picking. While this is <code>true</code> the camera will be allowed to go in or below the tileset surface if {@link ScreenSpaceCameraController#enableCollisionDetection} is true.
+ * @property {boolean} [enableCollision=false] When <code>true</code>, enables collisions for camera or CPU picking. While this is <code>true</code> the camera will be prevented from going below the tileset surface if {@link ScreenSpaceCameraController#enableCollisionDetection} is true.
  * @property {boolean} [projectTo2D=false] Whether to accurately project the tileset to 2D. If this is true, the tileset will be projected accurately to 2D, but it will use more memory to do so. If this is false, the tileset will use less memory and will still render in 2D / CV mode, but its projected positions may be inaccurate. This cannot be set after the tileset has been created.
  * @property {boolean} [enablePick=false] Whether to allow collision and CPU picking with <code>pick</code> when using WebGL 1. If using WebGL 2 or above, this option will be ignored. If using WebGL 1 and this is true, the <code>pick</code> operation will work correctly, but it will use more memory to do so. If running with WebGL 1 and this is false, the model will use less memory, but <code>pick</code> will always return <code>undefined</code>. This cannot be set after the tileset has loaded.
  * @property {string} [debugHeatmapTilePropertyName] The tile variable to colorize as a heatmap. All rendered tiles will be colorized relative to each other's specified variable value.
@@ -155,11 +155,11 @@ import Ray from "../Core/Ray.js";
  * }
  *
  * @example
- * // Allow camera to go inside and under 3D tileset
+ * // Turn on camera collisions with the tileset.
  * try {
  *   const tileset = await Cesium.Cesium3DTileset.fromUrl(
  *      "http://localhost:8002/tilesets/Seattle/tileset.json",
- *      { disableCollision: true }
+ *      { enableCollision: true }
  *   );
  *   scene.primitives.add(tileset);
  * } catch (error) {
@@ -864,13 +864,12 @@ function Cesium3DTileset(options) {
   );
 
   /**
-   * Whether to turn off collisions for camera collisions or picking. While this is  <code>true</code> the camera will be allowed to go in or below the tileset surface if {@link ScreenSpaceCameraController#enableCollisionDetection} is true.
+   * If <code>true</code>, allows collisions for camera collisions or picking. While this is  <code>true</code> the camera will be prevented from going in or below the tileset surface if {@link ScreenSpaceCameraController#enableCollisionDetection} is true. This can have performance implecations if the tileset contains tile with a larger number of vertices.
    *
    * @type {boolean}
    * @default false
    */
-  this.disableCollision = defaultValue(options.disableCollision, false);
-
+  this.enableCollision = defaultValue(options.enableCollision, false);
   this._projectTo2D = defaultValue(options.projectTo2D, false);
   this._enablePick = defaultValue(options.enablePick, false);
 
@@ -2639,11 +2638,15 @@ const scratchUpdateHeightCartographic = new Cartographic();
 const scratchUpdateHeightCartographic2 = new Cartographic();
 const scratchUpdateHeightCartesian = new Cartesian3();
 function processUpdateHeight(tileset, tile, frameState) {
+  if (!tileset.enableCollision || !tileset.show) {
+    return;
+  }
+
   const heightCallbackData = tileset._addHeightCallbacks;
   const boundingSphere = tile.boundingSphere;
 
   for (const callbackData of heightCallbackData) {
-    // No need to upadate if the tile was already visible last frame
+    // No need to update if the tile was already visible last frame
     if (callbackData.invoked || tile._wasSelectedLastFrame) {
       continue;
     }

package/Source/Scene/Cesium3DTilesetBaseTraversal.js

@@ -271,12 +271,10 @@ function executeEmptyTraversal(root, frameState) {
 
     // Only traverse if the tile is empty - traversal stops at descendants with content
     const traverse = !tile.hasRenderableContent && canTraverse(tile);
-    const emptyLeaf = !tile.hasRenderableContent && tile.children.length === 0;
 
     // Traversal stops but the tile does not have content yet
     // There will be holes if the parent tries to refine to its children, so don't refine
-    // One exception: a parent may refine even if one of its descendants is an empty leaf
-    if (!traverse && !tile.contentAvailable && !emptyLeaf) {
+    if (!traverse && !tile.contentAvailable) {
       allDescendantsLoaded = false;
     }
 
@@ -295,7 +293,7 @@ function executeEmptyTraversal(root, frameState) {
     }
   }
 
-  return allDescendantsLoaded;
+  return root.hasEmptyContent || allDescendantsLoaded;
 }
 
 export default Cesium3DTilesetBaseTraversal;

package/Source/Scene/FrameState.js

@@ -182,6 +182,7 @@ function FrameState(context, creditDisplay, jobScheduler) {
    * @type {object}
    * @property {boolean} render <code>true</code> if the primitive should update for a render pass, <code>false</code> otherwise.
    * @property {boolean} pick <code>true</code> if the primitive should update for a picking pass, <code>false</code> otherwise.
+   * @property {boolean} pickVoxel <code>true</code> if the primitive should update for a voxel picking pass, <code>false</code> otherwise.
    * @property {boolean} depth <code>true</code> if the primitive should update for a depth only pass, <code>false</code> otherwise.
    * @property {boolean} postProcess <code>true</code> if the primitive should update for a per-feature post-process pass, <code>false</code> otherwise.
    * @property {boolean} offscreen <code>true</code> if the primitive should update for an offscreen pass, <code>false</code> otherwise.
@@ -199,6 +200,10 @@ function FrameState(context, creditDisplay, jobScheduler) {
      * @default false
      */
     pick: false,
+    /**
+     * @default false
+     */
+    pickVoxel: false,
     /**
      * @default false
      */