@cesium/engine 24.0.0 → 25.0.0

package/Source/Scene/VoxelEllipsoidShape.js

@@ -67,6 +67,14 @@ function VoxelEllipsoidShape() {
    */
   this._rotation = new Matrix3();
 
+  /**
+   * UV space transformation translations (JS-only, not shader uniforms)
+   * Components: [longitude, latitude, height] translation
+   * @type {Cartesian3}
+   * @private
+   */
+  this._localToShapeUvTranslate = new Cartesian3();
+
   this._shaderUniforms = {
     cameraPositionCartographic: new Cartesian3(),
     ellipsoidEcToEastNorthUp: new Matrix3(),
@@ -78,10 +86,8 @@ function VoxelEllipsoidShape() {
     ellipsoidRenderLongitudeMinMax: new Cartesian2(),
     ellipsoidShapeUvLongitudeRangeOrigin: 0.0,
     ellipsoidShapeUvLongitudeMinMaxMid: new Cartesian3(),
-    ellipsoidLocalToShapeUvLongitude: new Cartesian2(),
-    ellipsoidLocalToShapeUvLatitude: new Cartesian2(),
+    ellipsoidLocalToShapeUvScale: new Cartesian3(),
     ellipsoidRenderLatitudeSinMinMax: new Cartesian2(),
-    ellipsoidInverseHeightDifference: 0.0,
     clipMinMaxHeight: new Cartesian2(),
   };
 
@@ -90,10 +96,7 @@ function VoxelEllipsoidShape() {
     ELLIPSOID_HAS_RENDER_BOUNDS_LONGITUDE_RANGE_EQUAL_ZERO: undefined,
     ELLIPSOID_HAS_RENDER_BOUNDS_LONGITUDE_RANGE_UNDER_HALF: undefined,
     ELLIPSOID_HAS_RENDER_BOUNDS_LONGITUDE_RANGE_OVER_HALF: undefined,
-    ELLIPSOID_HAS_RENDER_BOUNDS_LONGITUDE_MIN_DISCONTINUITY: undefined,
-    ELLIPSOID_HAS_RENDER_BOUNDS_LONGITUDE_MAX_DISCONTINUITY: undefined,
     ELLIPSOID_HAS_SHAPE_BOUNDS_LONGITUDE: undefined,
-    ELLIPSOID_HAS_SHAPE_BOUNDS_LONGITUDE_MIN_MAX_REVERSED: undefined,
     ELLIPSOID_HAS_RENDER_BOUNDS_LATITUDE_MAX_UNDER_HALF: undefined,
     ELLIPSOID_HAS_RENDER_BOUNDS_LATITUDE_MAX_EQUAL_HALF: undefined,
     ELLIPSOID_HAS_RENDER_BOUNDS_LATITUDE_MAX_OVER_HALF: undefined,
@@ -245,7 +248,6 @@ VoxelEllipsoidShape.prototype.update = function (
   //>>includeEnd('debug');
 
   const epsilonZeroScale = CesiumMath.EPSILON10;
-  const epsilonLongitudeDiscontinuity = CesiumMath.EPSILON3; // 0.001 radians = 0.05729578 degrees
   const epsilonLongitude = CesiumMath.EPSILON10;
   const epsilonLatitude = CesiumMath.EPSILON10;
   const epsilonLatitudeFlat = CesiumMath.EPSILON3; // 0.001 radians = 0.05729578 degrees
@@ -519,10 +521,7 @@ VoxelEllipsoidShape.prototype.update = function (
 
   // The percent of space that is between the inner and outer ellipsoid.
   const thickness = shapeMaxBounds.z - shapeMinBounds.z;
-  shaderUniforms.ellipsoidInverseHeightDifference = 1.0 / thickness;
-  if (shapeMinBounds.z === shapeMaxBounds.z) {
-    shaderUniforms.ellipsoidInverseHeightDifference = 0.0;
-  }
+  const heightScale = thickness === 0.0 ? 0.0 : 1.0 / thickness;
 
   // Intersects a wedge for the min and max longitude.
   if (renderHasLongitude) {
@@ -550,6 +549,10 @@ VoxelEllipsoidShape.prototype.update = function (
     );
   }
 
+  // Defaults are for the case where shapeLongitudeRange is zero, to avoid division by zero.
+  let longitudeScale = 0.0;
+  let longitudeOffset = 1.0;
+
   if (shapeHasLongitude) {
     shaderDefines["ELLIPSOID_HAS_SHAPE_BOUNDS_LONGITUDE"] = true;
 
@@ -565,73 +568,15 @@ VoxelEllipsoidShape.prototype.update = function (
     shaderUniforms.ellipsoidShapeUvLongitudeRangeOrigin =
       uvLongitudeRangeOrigin;
 
-    const shapeIsLongitudeReversed = shapeMaxBounds.x < shapeMinBounds.x;
-    if (shapeIsLongitudeReversed) {
-      shaderDefines["ELLIPSOID_HAS_SHAPE_BOUNDS_LONGITUDE_MIN_MAX_REVERSED"] =
-        true;
-    }
-
-    if (shapeLongitudeRange <= epsilonLongitude) {
-      shaderUniforms.ellipsoidLocalToShapeUvLongitude = Cartesian2.fromElements(
-        0.0,
-        1.0,
-        shaderUniforms.ellipsoidLocalToShapeUvLongitude,
-      );
-    } else {
-      const scale = defaultLongitudeRange / shapeLongitudeRange;
+    if (shapeLongitudeRange > epsilonLongitude) {
+      longitudeScale = defaultLongitudeRange / shapeLongitudeRange;
       const shiftedMinLongitude = uvShapeMinLongitude - uvLongitudeRangeOrigin;
-      const offset =
-        -scale * (shiftedMinLongitude - Math.floor(shiftedMinLongitude));
-      shaderUniforms.ellipsoidLocalToShapeUvLongitude = Cartesian2.fromElements(
-        scale,
-        offset,
-        shaderUniforms.ellipsoidLocalToShapeUvLongitude,
-      );
+      longitudeOffset =
+        -longitudeScale *
+        (shiftedMinLongitude - Math.floor(shiftedMinLongitude));
     }
   }
 
-  if (renderHasLongitude) {
-    const renderIsMinLongitudeDiscontinuity = CesiumMath.equalsEpsilon(
-      renderMinBounds.x,
-      DefaultMinBounds.x,
-      undefined,
-      epsilonLongitudeDiscontinuity,
-    );
-    const renderIsMaxLongitudeDiscontinuity = CesiumMath.equalsEpsilon(
-      renderMaxBounds.x,
-      DefaultMaxBounds.x,
-      undefined,
-      epsilonLongitudeDiscontinuity,
-    );
-
-    if (renderIsMinLongitudeDiscontinuity) {
-      shaderDefines["ELLIPSOID_HAS_RENDER_BOUNDS_LONGITUDE_MIN_DISCONTINUITY"] =
-        true;
-    }
-    if (renderIsMaxLongitudeDiscontinuity) {
-      shaderDefines["ELLIPSOID_HAS_RENDER_BOUNDS_LONGITUDE_MAX_DISCONTINUITY"] =
-        true;
-    }
-    const uvShapeMinLongitude =
-      (shapeMinBounds.x - DefaultMinBounds.x) / defaultLongitudeRange;
-    const uvShapeMaxLongitude =
-      (shapeMaxBounds.x - DefaultMinBounds.x) / defaultLongitudeRange;
-
-    const uvRenderMaxLongitude =
-      (renderMaxBounds.x - DefaultMinBounds.x) / defaultLongitudeRange;
-    const uvRenderLongitudeRangeZero =
-      1.0 - renderLongitudeRange / defaultLongitudeRange;
-    const uvRenderLongitudeRangeZeroMid =
-      (uvRenderMaxLongitude + 0.5 * uvRenderLongitudeRangeZero) % 1.0;
-
-    shaderUniforms.ellipsoidShapeUvLongitudeMinMaxMid = Cartesian3.fromElements(
-      uvShapeMinLongitude,
-      uvShapeMaxLongitude,
-      uvRenderLongitudeRangeZeroMid,
-      shaderUniforms.ellipsoidShapeUvLongitudeMinMaxMid,
-    );
-  }
-
   if (renderHasLatitude) {
     // Intersects a cone for min latitude
     if (renderHasLatitudeMin) {
@@ -682,28 +627,36 @@ VoxelEllipsoidShape.prototype.update = function (
     );
   }
 
+  // Defaults are for the case where shapeLatitudeRange is zero, to avoid division by zero.
+  let latitudeScale = 0.0;
+  let latitudeOffset = 1.0;
+
   if (shapeHasLatitude) {
     shaderDefines["ELLIPSOID_HAS_SHAPE_BOUNDS_LATITUDE"] = true;
 
-    if (shapeLatitudeRange < epsilonLatitude) {
-      shaderUniforms.ellipsoidLocalToShapeUvLatitude = Cartesian2.fromElements(
-        0.0,
-        1.0,
-        shaderUniforms.ellipsoidLocalToShapeUvLatitude,
-      );
-    } else {
+    if (shapeLatitudeRange > epsilonLatitude) {
       const defaultLatitudeRange = DefaultMaxBounds.y - DefaultMinBounds.y;
-      const scale = defaultLatitudeRange / shapeLatitudeRange;
-      const offset =
+      latitudeScale = defaultLatitudeRange / shapeLatitudeRange;
+      latitudeOffset =
         (DefaultMinBounds.y - shapeMinBounds.y) / shapeLatitudeRange;
-      shaderUniforms.ellipsoidLocalToShapeUvLatitude = Cartesian2.fromElements(
-        scale,
-        offset,
-        shaderUniforms.ellipsoidLocalToShapeUvLatitude,
-      );
     }
   }
 
+  // Store scales in shader uniforms (GPU) and translates in private property (JS-only)
+  shaderUniforms.ellipsoidLocalToShapeUvScale = Cartesian3.fromElements(
+    longitudeScale,
+    latitudeScale,
+    heightScale,
+    shaderUniforms.ellipsoidLocalToShapeUvScale,
+  );
+
+  this._localToShapeUvTranslate = Cartesian3.fromElements(
+    longitudeOffset,
+    latitudeOffset,
+    0.0, // Height translate not used (always 1.0 + height * scale)
+    this._localToShapeUvTranslate,
+  );
+
   this._shaderMaximumIntersectionsLength = intersectionCount;
 
   return true;
@@ -943,11 +896,10 @@ VoxelEllipsoidShape.prototype.convertLocalToShapeUvSpace = function (
     ellipsoidRadii,
     evoluteScale,
     ellipsoidInverseRadiiSquared,
-    ellipsoidInverseHeightDifference,
     ellipsoidShapeUvLongitudeRangeOrigin,
-    ellipsoidLocalToShapeUvLongitude,
-    ellipsoidLocalToShapeUvLatitude,
+    ellipsoidLocalToShapeUvScale,
   } = this._shaderUniforms;
+  const localToShapeUvTranslate = this._localToShapeUvTranslate;
 
   const distanceFromZAxis = Math.hypot(positionLocal.x, positionLocal.y);
   const posEllipse = Cartesian2.fromElements(
@@ -999,19 +951,17 @@ VoxelEllipsoidShape.prototype.convertLocalToShapeUvSpace = function (
     longitude = longitude - Math.floor(longitude);
     // Scale and shift so [0, 1] covers the occupied space.
     longitude =
-      longitude * ellipsoidLocalToShapeUvLongitude.x +
-      ellipsoidLocalToShapeUvLongitude.y;
+      longitude * ellipsoidLocalToShapeUvScale.x + localToShapeUvTranslate.x;
   }
 
   latitude = (latitude + Math.PI / 2.0) / Math.PI;
   if (defined(ELLIPSOID_HAS_SHAPE_BOUNDS_LATITUDE)) {
     // Scale and shift so [0, 1] covers the occupied space.
     latitude =
-      latitude * ellipsoidLocalToShapeUvLatitude.x +
-      ellipsoidLocalToShapeUvLatitude.y;
+      latitude * ellipsoidLocalToShapeUvScale.y + localToShapeUvTranslate.y;
   }
 
-  height = 1.0 + height * ellipsoidInverseHeightDifference;
+  height = 1.0 + height * ellipsoidLocalToShapeUvScale.z;
 
   return Cartesian3.fromElements(longitude, latitude, height, result);
 };

package/Source/Scene/VoxelMetadataOrder.js

@@ -1,3 +1,5 @@
+// @ts-check
+
 /**
  * Metadata ordering for voxel content.
  * In all cases, x data is contiguous in strides along the y axis,
@@ -21,4 +23,7 @@ const VoxelMetadataOrder = {
    */
   Y_UP: 1,
 };
-export default Object.freeze(VoxelMetadataOrder);
+
+Object.freeze(VoxelMetadataOrder);
+
+export default VoxelMetadataOrder;

package/Source/Scene/VoxelProvider.js

@@ -183,6 +183,7 @@ Object.defineProperties(VoxelProvider.prototype, {
   /**
    * The number of levels of detail containing available tiles in the tileset.
    *
+   * @memberof VoxelProvider.prototype
    * @type {number|undefined}
    * @readonly
    */

package/Source/Scene/VoxelShapeType.js

@@ -102,4 +102,6 @@ VoxelShapeType.getShapeConstructor = function (shapeType) {
   }
 };
 
-export default Object.freeze(VoxelShapeType);
+Object.freeze(VoxelShapeType);
+
+export default VoxelShapeType;

package/Source/Scene/renderBufferPointCollection.js

@@ -19,13 +19,11 @@ import BufferPointMaterialVS from "../Shaders/BufferPointMaterialVS.js";
 import BufferPointMaterialFS from "../Shaders/BufferPointMaterialFS.js";
 import EncodedCartesian3 from "../Core/EncodedCartesian3.js";
 import AttributeCompression from "../Core/AttributeCompression.js";
-import Matrix4 from "../Core/Matrix4.js";
-import BoundingSphere from "../Core/BoundingSphere.js";
 import BufferPointMaterial from "./BufferPointMaterial.js";
 
 /** @import FrameState from "./FrameState.js"; */
 /** @import BufferPointCollection from "./BufferPointCollection.js"; */
-/** @import {Destroyable, TypedArray} from "../Core/globalTypes.js"; */
+/** @import {TypedArray} from "../Core/globalTypes.js"; */
 
 /**
  * TODO(PR#13211): Need 'keyof' syntax to avoid duplicating attribute names.
@@ -52,7 +50,6 @@ const BufferPointAttributeLocations = {
  * @property {RenderState} [renderState]
  * @property {ShaderProgram} [shaderProgram]
  * @property {DrawCommand} [command]
- * @property {Destroyable[]} [pickIds] Unordered list of collection PickIds.
  * @property {Function} destroy
  * @ignore
  */
@@ -87,12 +84,8 @@ function renderBufferPointCollection(collection, frameState, renderContext) {
     };
   }
 
-  if (!defined(renderContext.pickIds)) {
-    renderContext.pickIds = [];
-  }
-
   if (collection._dirtyCount > 0) {
-    const { attributeArrays, pickIds } = renderContext;
+    const { attributeArrays } = renderContext;
 
     const positionHighArray = attributeArrays.positionHigh;
     const positionLowArray = attributeArrays.positionLow;
@@ -110,19 +103,6 @@ function renderBufferPointCollection(collection, frameState, renderContext) {
         continue;
       }
 
-      if (collection._allowPicking && point._pickId === 0) {
-        const pickId = context.createPickId({
-          collection,
-          index: i,
-          get primitive() {
-            // Cannot reuse primitives; scene.drillPick() appends to a list.
-            return collection.get(this.index, new BufferPoint());
-          },
-        });
-        point._pickId = pickId.key;
-        pickIds.push(pickId);
-      }
-
       point.getPosition(cartesian);
       EncodedCartesian3.fromCartesian(cartesian, encodedCartesian);
       point.getMaterial(material);
@@ -168,7 +148,6 @@ function renderBufferPointCollection(collection, frameState, renderContext) {
           vertexBuffer: Buffer.createVertexBuffer({
             typedArray: attributeArrays.positionHigh,
             context,
-            // @ts-expect-error Requires https://github.com/CesiumGS/cesium/pull/13203.
             usage: BufferUsage.STATIC_DRAW,
           }),
         },
@@ -179,7 +158,6 @@ function renderBufferPointCollection(collection, frameState, renderContext) {
           vertexBuffer: Buffer.createVertexBuffer({
             typedArray: attributeArrays.positionLow,
             context,
-            // @ts-expect-error Requires https://github.com/CesiumGS/cesium/pull/13203.
             usage: BufferUsage.STATIC_DRAW,
           }),
         },
@@ -190,7 +168,6 @@ function renderBufferPointCollection(collection, frameState, renderContext) {
           vertexBuffer: Buffer.createVertexBuffer({
             typedArray: attributeArrays.pickColor,
             context,
-            // @ts-expect-error Requires https://github.com/CesiumGS/cesium/pull/13203.
             usage: BufferUsage.STATIC_DRAW,
           }),
         },
@@ -201,7 +178,6 @@ function renderBufferPointCollection(collection, frameState, renderContext) {
           vertexBuffer: Buffer.createVertexBuffer({
             typedArray: attributeArrays.showSizeAndColor,
             context,
-            // @ts-expect-error Requires https://github.com/CesiumGS/cesium/pull/13203.
             usage: BufferUsage.STATIC_DRAW,
           }),
         },
@@ -212,7 +188,6 @@ function renderBufferPointCollection(collection, frameState, renderContext) {
           vertexBuffer: Buffer.createVertexBuffer({
             typedArray: attributeArrays.outlineWidthAndOutlineColor,
             context,
-            // @ts-expect-error Requires https://github.com/CesiumGS/cesium/pull/13203.
             usage: BufferUsage.STATIC_DRAW,
           }),
         },
@@ -252,26 +227,33 @@ function renderBufferPointCollection(collection, frameState, renderContext) {
     });
   }
 
-  if (
-    !defined(renderContext.command) ||
-    isCommandDirty(collection, renderContext.command)
-  ) {
+  if (!defined(renderContext.command)) {
     renderContext.command = new DrawCommand({
       vertexArray: renderContext.vertexArray,
       renderState: renderContext.renderState,
       shaderProgram: renderContext.shaderProgram,
       primitiveType: PrimitiveType.POINTS,
       pass: Pass.OPAQUE,
-      pickId: "v_pickColor",
+      pickId: collection._allowPicking ? "v_pickColor" : undefined,
       owner: collection,
       count: collection.primitiveCount,
-      modelMatrix: collection.modelMatrix,
-      boundingVolume: collection.boundingVolumeWC,
+      modelMatrix: collection.modelMatrix, // shared reference
+      boundingVolume: collection.boundingVolumeWC, // shared reference
       debugShowBoundingVolume: collection.debugShowBoundingVolume,
     });
   }
 
-  frameState.commandList.push(renderContext.command);
+  const command = renderContext.command;
+
+  if (command.count !== collection.primitiveCount) {
+    command.count = collection.primitiveCount;
+  }
+
+  if (command.debugShowBoundingVolume !== collection.debugShowBoundingVolume) {
+    command.debugShowBoundingVolume = collection.debugShowBoundingVolume;
+  }
+
+  frameState.commandList.push(command);
 
   collection._dirtyCount = 0;
   collection._dirtyOffset = 0;
@@ -279,31 +261,6 @@ function renderBufferPointCollection(collection, frameState, renderContext) {
   return renderContext;
 }
 
-/**
- * Returns true if DrawCommand is out of date for the given collection.
- * @param {BufferPointCollection} collection
- * @param {DrawCommand} command
- * @ignore
- */
-function isCommandDirty(collection, command) {
-  const isModelMatrixEqual = Matrix4.equals(
-    collection.modelMatrix,
-    command._modelMatrix,
-  );
-
-  const isBoundingVolumeEqual = BoundingSphere.equals(
-    collection.boundingVolumeWC,
-    command._boundingVolume,
-  );
-
-  return (
-    collection.primitiveCount !== command._count ||
-    collection.debugShowBoundingVolume !== command.debugShowBoundingVolume ||
-    !isModelMatrixEqual ||
-    !isBoundingVolumeEqual
-  );
-}
-
 /**
  * Destroys render context resources. Deleting properties from the context
  * object isn't necessary, as collection.destroy() will discard the object.
@@ -323,12 +280,6 @@ function destroyRenderContext() {
   if (defined(context.renderState)) {
     RenderState.removeFromCache(context.renderState);
   }
-
-  if (defined(context.pickIds)) {
-    for (const pickId of context.pickIds) {
-      pickId.destroy();
-    }
-  }
 }
 
 export default renderBufferPointCollection;

package/Source/Scene/renderBufferPolygonCollection.js

@@ -20,11 +20,9 @@ import BufferPolygonMaterialFS from "../Shaders/BufferPolygonMaterialFS.js";
 import EncodedCartesian3 from "../Core/EncodedCartesian3.js";
 import AttributeCompression from "../Core/AttributeCompression.js";
 import IndexDatatype from "../Core/IndexDatatype.js";
-import BoundingSphere from "../Core/BoundingSphere.js";
-import Matrix4 from "../Core/Matrix4.js";
 import BufferPolygonMaterial from "./BufferPolygonMaterial.js";
 
-/** @import {Destroyable, TypedArray} from "../Core/globalTypes.js"; */
+/** @import {TypedArray} from "../Core/globalTypes.js"; */
 /** @import FrameState from "./FrameState.js"; */
 /** @import BufferPolygonCollection from "./BufferPolygonCollection.js"; */
 
@@ -53,7 +51,6 @@ const BufferPolygonAttributeLocations = {
  * @property {RenderState} [renderState]
  * @property {ShaderProgram} [shaderProgram]
  * @property {DrawCommand} [command]
- * @property {Destroyable[]} [pickIds]
  * @property {Function} destroy
  * @ignore
  */
@@ -96,12 +93,8 @@ function renderBufferPolygonCollection(collection, frameState, renderContext) {
     };
   }
 
-  if (!defined(renderContext.pickIds)) {
-    renderContext.pickIds = [];
-  }
-
   if (collection._dirtyCount > 0) {
-    const { attributeArrays, pickIds } = renderContext;
+    const { attributeArrays } = renderContext;
     const { _dirtyOffset, _dirtyCount } = collection;
 
     const indexArray = renderContext.indexArray;
@@ -117,19 +110,6 @@ function renderBufferPolygonCollection(collection, frameState, renderContext) {
         continue;
       }
 
-      if (collection._allowPicking && polygon._pickId === 0) {
-        const pickId = context.createPickId({
-          collection,
-          index: i,
-          get primitive() {
-            // Cannot reuse primitives; scene.drillPick() appends to a list.
-            return collection.get(i, new BufferPolygon());
-          },
-        });
-        polygon._pickId = pickId.key;
-        pickIds.push(pickId);
-      }
-
       let tOffset = polygon.triangleOffset;
       let vOffset = polygon.vertexOffset;
 
@@ -188,9 +168,8 @@ function renderBufferPolygonCollection(collection, frameState, renderContext) {
       indexBuffer: Buffer.createIndexBuffer({
         context,
         typedArray: renderContext.indexArray,
-        // @ts-expect-error Requires https://github.com/CesiumGS/cesium/pull/13203.
         usage: BufferUsage.STATIC_DRAW,
-        // @ts-expect-error Requires https://github.com/CesiumGS/cesium/pull/13203.
+        // @ts-expect-error https://github.com/CesiumGS/cesium/issues/13420
         indexDatatype: IndexDatatype.fromTypedArray(renderContext.indexArray),
       }),
 
@@ -202,7 +181,6 @@ function renderBufferPolygonCollection(collection, frameState, renderContext) {
           vertexBuffer: Buffer.createVertexBuffer({
             typedArray: attributeArrays.positionHigh,
             context,
-            // @ts-expect-error Requires https://github.com/CesiumGS/cesium/pull/13203.
             usage: BufferUsage.STATIC_DRAW,
           }),
         },
@@ -213,7 +191,6 @@ function renderBufferPolygonCollection(collection, frameState, renderContext) {
           vertexBuffer: Buffer.createVertexBuffer({
             typedArray: attributeArrays.positionLow,
             context,
-            // @ts-expect-error Requires https://github.com/CesiumGS/cesium/pull/13203.
             usage: BufferUsage.STATIC_DRAW,
           }),
         },
@@ -224,7 +201,6 @@ function renderBufferPolygonCollection(collection, frameState, renderContext) {
           vertexBuffer: Buffer.createVertexBuffer({
             typedArray: attributeArrays.pickColor,
             context,
-            // @ts-expect-error Requires https://github.com/CesiumGS/cesium/pull/13203.
             usage: BufferUsage.STATIC_DRAW,
           }),
         },
@@ -235,7 +211,6 @@ function renderBufferPolygonCollection(collection, frameState, renderContext) {
           vertexBuffer: Buffer.createVertexBuffer({
             typedArray: attributeArrays.showAndColor,
             context,
-            // @ts-expect-error Requires https://github.com/CesiumGS/cesium/pull/13203.
             usage: BufferUsage.STATIC_DRAW,
           }),
         },
@@ -284,26 +259,35 @@ function renderBufferPolygonCollection(collection, frameState, renderContext) {
     });
   }
 
-  if (
-    !defined(renderContext.command) ||
-    isCommandDirty(collection, renderContext.command)
-  ) {
+  const drawCount = collection.triangleCount * 3;
+
+  if (!defined(renderContext.command)) {
     renderContext.command = new DrawCommand({
       vertexArray: renderContext.vertexArray,
       renderState: renderContext.renderState,
       shaderProgram: renderContext.shaderProgram,
       primitiveType: PrimitiveType.TRIANGLES,
       pass: Pass.OPAQUE,
-      pickId: "v_pickColor",
+      pickId: collection._allowPicking ? "v_pickColor" : undefined,
       owner: collection,
-      count: collection.triangleCount * 3,
-      modelMatrix: collection.modelMatrix,
-      boundingVolume: collection.boundingVolumeWC,
+      count: drawCount,
+      modelMatrix: collection.modelMatrix, // shared reference
+      boundingVolume: collection.boundingVolumeWC, // shared reference
       debugShowBoundingVolume: collection.debugShowBoundingVolume,
     });
   }
 
-  frameState.commandList.push(renderContext.command);
+  const command = renderContext.command;
+
+  if (command.count !== drawCount) {
+    command.count = drawCount;
+  }
+
+  if (command.debugShowBoundingVolume !== collection.debugShowBoundingVolume) {
+    command.debugShowBoundingVolume = collection.debugShowBoundingVolume;
+  }
+
+  frameState.commandList.push(command);
 
   collection._dirtyCount = 0;
   collection._dirtyOffset = 0;
@@ -311,31 +295,6 @@ function renderBufferPolygonCollection(collection, frameState, renderContext) {
   return renderContext;
 }
 
-/**
- * Returns true if DrawCommand is out of date for the given collection.
- * @param {BufferPolygonCollection} collection
- * @param {DrawCommand} command
- * @ignore
- */
-function isCommandDirty(collection, command) {
-  const isModelMatrixEqual = Matrix4.equals(
-    collection.modelMatrix,
-    command._modelMatrix,
-  );
-
-  const isBoundingVolumeEqual = BoundingSphere.equals(
-    collection.boundingVolumeWC,
-    command._boundingVolume,
-  );
-
-  return (
-    collection.triangleCount * 3 !== command._count ||
-    collection.debugShowBoundingVolume !== command.debugShowBoundingVolume ||
-    !isModelMatrixEqual ||
-    !isBoundingVolumeEqual
-  );
-}
-
 /**
  * Computes dirty ranges for attribute and index buffers in a collection.
  * @param {BufferPolygonCollection} collection
@@ -375,12 +334,6 @@ function destroyRenderContext() {
   if (defined(context.renderState)) {
     RenderState.removeFromCache(context.renderState);
   }
-
-  if (defined(context.pickIds)) {
-    for (const pickId of context.pickIds) {
-      pickId.destroy();
-    }
-  }
 }
 
 export default renderBufferPolygonCollection;