Merge branch 'main' into patch-release-guide

Author: ggetz

CHANGES.md

@@ -4,10 +4,17 @@
 
 ### @cesium/engine
 
+#### Breaking Changes :mega:
+
+- `scene.drillPick` now uses a breadth-first search strategy instead of depth-first. This may change which entities are picked when
+  using large values of `width` and `height` when providing a `limit`, prioritizing entities closer to the camera.
+
 #### Fixes :wrench:
 
 - Fixes an event bug following recent changes, where adding a new listener during an event callback caused an infinite loop. [#12955](https://github.com/CesiumGS/cesium/pull/12955)
 - Fix issues with label background when updating properties while `label.show` is `false`. [#12138](https://github.com/CesiumGS/cesium/issues/12138)
+- Improved performance of `scene.drillPick`. [#12916](https://github.com/CesiumGS/cesium/pull/12916)
+- Improved performance when removing primitives. [#3018](https://github.com/CesiumGS/cesium/pull/3018)
 
 ## 1.134 - 2025-10-01
 

Specs/TypeScript/tsconfig.json

@@ -3,7 +3,8 @@
     "noEmit": true,
     "types": [],
     "strict": true,
-    "isolatedModules": true
+    "isolatedModules": true,
+    "lib": ["ES2020", "DOM"]
   },
   "include": [
     "index.ts",

Tools/jsdoc/tsconfig.json

@@ -1,7 +1,8 @@
 {
   "compilerOptions": {
-      "noEmit": true,
-      "types": []
+    "noEmit": true,
+    "types": [],
+    "lib": ["ES2020", "DOM"]
   },
   "files": [
     "../../Source/Cesium.d.ts"

gulpfile.js

@@ -425,17 +425,6 @@ export async function buildDocsWatch() {
   return gulp.watch(sourceFiles, buildDocs);
 }
 
-function combineForSandcastle() {
-  const outputDirectory = join("Build", "Sandcastle", "CesiumUnminified");
-  return buildCesium({
-    development: false,
-    minify: false,
-    removePragmas: false,
-    node: false,
-    outputDirectory: outputDirectory,
-  });
-}
-
 export const websiteRelease = gulp.series(
   buildEngine,
   buildWidgets,
@@ -447,14 +436,23 @@ export const websiteRelease = gulp.series(
       node: false,
     });
   },
-  function () {
+  function websiteReleaseBuildMinified() {
     return buildCesium({
       minify: true,
       removePragmas: true,
       node: false,
     });
   },
-  combineForSandcastle,
+  function combineForSandcastle() {
+    const outputDirectory = join("Build", "Sandcastle", "CesiumUnminified");
+    return buildCesium({
+      development: false,
+      minify: false,
+      removePragmas: false,
+      node: false,
+      outputDirectory: outputDirectory,
+    });
+  },
   buildDocs,
 );
 
@@ -712,17 +710,21 @@ export async function deploySetVersion() {
 export async function deployStatus() {
   const status = argv.status;
   const message = argv.message;
-
   const deployUrl = `${devDeployUrl}`;
   const zipUrl = `${deployUrl}Cesium-${version}.zip`;
   const npmUrl = `${deployUrl}cesium-${version}.tgz`;
-  const coverageUrl = `${devDeployUrl}Build/Coverage/index.html`;
+  const coverageUrl = `${deployUrl}Build/Coverage/index.html`;
 
   return Promise.all([
-    setStatus(status, deployUrl, message, "deployment"),
-    setStatus(status, zipUrl, message, "zip file"),
-    setStatus(status, npmUrl, message, "npm package"),
-    setStatus(status, coverageUrl, message, "coverage results"),
+    setStatus(status, deployUrl, message, "deploy / artifact: deployment"),
+    setStatus(status, zipUrl, message, "deploy / artifact: zip file"),
+    setStatus(status, npmUrl, message, "deploy / artifact: npm package"),
+    setStatus(
+      status,
+      coverageUrl,
+      message,
+      "deploy / artifact: coverage results",
+    ),
   ]);
 }
 

package.json

@@ -63,11 +63,11 @@
     "esbuild": "^0.25.8",
     "eslint": "^9.32.0",
     "eslint-plugin-html": "^8.1.1",
-    "eslint-plugin-react-hooks": "^5.2.0",
+    "eslint-plugin-react-hooks": "^7.0.0",
     "eslint-plugin-react-refresh": "^0.4.19",
     "express": "^5.1.0",
     "globals": "^16.0.0",
-    "globby": "^14.0.0",
+    "globby": "^15.0.0",
     "glsl-strip-comments": "^1.0.0",
     "gulp": "^5.0.0",
     "gulp-clean-css": "^4.3.0",
@@ -101,7 +101,7 @@
     "prismjs": "^1.28.0",
     "rimraf": "^6.0.1",
     "tsd-jsdoc": "^2.5.0",
-    "typescript": "~5.8.3",
+    "typescript": "^5.9.3",
     "typescript-eslint": "^8.30.1",
     "yargs": "^18.0.0"
   },

packages/engine/Source/Core/Color.js

@@ -679,6 +679,23 @@ Color.prototype.toBytes = function (result) {
   return result;
 };
 
+/**
+ * Converts RGBA values in bytes to a single numeric unsigned 32-bit RGBA value, using the endianness
+ * of the system.
+ *
+ * @returns {number} A single numeric unsigned 32-bit RGBA value.
+ *
+ * @see Color.toRgba
+ */
+Color.bytesToRgba = function (red, green, blue, alpha) {
+  // scratchUint32Array and scratchUint8Array share an underlying array buffer
+  scratchUint8Array[0] = red;
+  scratchUint8Array[1] = green;
+  scratchUint8Array[2] = blue;
+  scratchUint8Array[3] = alpha;
+  return scratchUint32Array[0];
+};
+
 /**
  * Converts this color to a single numeric unsigned 32-bit RGBA value, using the endianness
  * of the system.
@@ -692,12 +709,12 @@ Color.prototype.toBytes = function (result) {
  * @see Color.fromRgba
  */
 Color.prototype.toRgba = function () {
-  // scratchUint32Array and scratchUint8Array share an underlying array buffer
-  scratchUint8Array[0] = Color.floatToByte(this.red);
-  scratchUint8Array[1] = Color.floatToByte(this.green);
-  scratchUint8Array[2] = Color.floatToByte(this.blue);
-  scratchUint8Array[3] = Color.floatToByte(this.alpha);
-  return scratchUint32Array[0];
+  return Color.bytesToRgba(
+    Color.floatToByte(this.red),
+    Color.floatToByte(this.green),
+    Color.floatToByte(this.blue),
+    Color.floatToByte(this.alpha),
+  );
 };
 
 /**

packages/engine/Source/Renderer/Context.js

@@ -356,7 +356,7 @@ function Context(canvas, options) {
     this._vertexAttribDivisors.push(0);
   }
 
-  this._pickObjects = {};
+  this._pickObjects = new Map();
   this._nextPickColor = new Uint32Array(1);
 
   /**
@@ -1562,7 +1562,7 @@ Context.prototype.createViewportQuadCommand = function (
 /**
  * Gets the object associated with a pick color.
  *
- * @param {Color} pickColor The pick color.
+ * @param {number} pickColor The unsigned 32-bit RGBA pick color
  * @returns {object} The object associated with the pick color, or undefined if no object is associated with that color.
  *
  * @example
@@ -1575,9 +1575,15 @@ Context.prototype.getObjectByPickColor = function (pickColor) {
   Check.defined("pickColor", pickColor);
   //>>includeEnd('debug');
 
-  return this._pickObjects[pickColor.toRgba()];
+  return this._pickObjects.get(pickColor);
 };
 
+/**
+ *
+ * @param {Map<number, object>} pickObjects
+ * @param {number} key
+ * @param {Color} color
+ */
 function PickId(pickObjects, key, color) {
   this._pickObjects = pickObjects;
   this.key = key;
@@ -1587,16 +1593,16 @@ function PickId(pickObjects, key, color) {
 Object.defineProperties(PickId.prototype, {
   object: {
     get: function () {
-      return this._pickObjects[this.key];
+      return this._pickObjects.get(this.key);
     },
     set: function (value) {
-      this._pickObjects[this.key] = value;
+      this._pickObjects.set(this.key, value);
     },
   },
 });
 
 PickId.prototype.destroy = function () {
-  delete this._pickObjects[this.key];
+  this._pickObjects.delete(this.key);
   return undefined;
 };
 
@@ -1633,7 +1639,7 @@ Context.prototype.createPickId = function (object) {
     throw new RuntimeError("Out of unique Pick IDs.");
   }
 
-  this._pickObjects[key] = object;
+  this._pickObjects.set(key, object);
   return new PickId(this._pickObjects, key, Color.fromRgba(key));
 };
 

packages/engine/Source/Scene/PickFramebuffer.js

@@ -48,15 +48,14 @@ PickFramebuffer.prototype.begin = function (screenSpaceRectangle, viewport) {
   return this._passState;
 };
 
-const colorScratchForPickFramebuffer = new Color();
-
 /**
- * Return the picked object rendered within a given rectangle.
+ * Return the picked objects rendered within a given rectangle.
  *
  * @param {BoundingRectangle} screenSpaceRectangle
- * @returns {object|undefined} The object rendered in the middle of the rectangle, or undefined if nothing was rendered.
+ * @param {number} [limit=1] If supplied, stop iterating after collecting this many objects.
+ * @returns {object[]} A list of rendered objects, ordered by distance to the middle of the rectangle.
  */
-PickFramebuffer.prototype.end = function (screenSpaceRectangle) {
+PickFramebuffer.prototype.end = function (screenSpaceRectangle, limit = 1) {
   const width = screenSpaceRectangle.width ?? 1.0;
   const height = screenSpaceRectangle.height ?? 1.0;
 
@@ -84,6 +83,7 @@ PickFramebuffer.prototype.end = function (screenSpaceRectangle) {
 
   // The region does not have to square and the dimensions do not have to be odd, but
   // loop iterations would be wasted. Prefer square regions where the size is odd.
+  const objects = new Set();
   for (let i = 0; i < length; ++i) {
     if (
       -halfWidth <= x &&
@@ -93,22 +93,19 @@ PickFramebuffer.prototype.end = function (screenSpaceRectangle) {
     ) {
       const index = 4 * ((halfHeight - y) * width + x + halfWidth);
 
-      colorScratchForPickFramebuffer.red = Color.byteToFloat(pixels[index]);
-      colorScratchForPickFramebuffer.green = Color.byteToFloat(
+      const pickColor = Color.bytesToRgba(
+        pixels[index],
         pixels[index + 1],
-      );
-      colorScratchForPickFramebuffer.blue = Color.byteToFloat(
         pixels[index + 2],
-      );
-      colorScratchForPickFramebuffer.alpha = Color.byteToFloat(
         pixels[index + 3],
       );
 
-      const object = context.getObjectByPickColor(
-        colorScratchForPickFramebuffer,
-      );
+      const object = context.getObjectByPickColor(pickColor);
       if (defined(object)) {
-        return object;
+        objects.add(object);
+        if (objects.size >= limit) {
+          break;
+        }
       }
     }
 
@@ -123,8 +120,7 @@ PickFramebuffer.prototype.end = function (screenSpaceRectangle) {
     x += dx;
     y += dy;
   }
-
-  return undefined;
+  return [...objects];
 };
 
 /**