Merge branch 'main' into splat-spz-concept

Author: ggetz

Apps/Sandcastle/CesiumSandcastle.css

@@ -53,7 +53,7 @@ body {
   width: 40%;
 }
 
-#bottomPanel {
+#bottomSection {
   height: 225px;
 }
 

Apps/Sandcastle/index.html

@@ -303,12 +303,13 @@
         </div>
       </div>
       <div
-        id="bottomPanel"
+        id="bottomSection"
         class="bottomPanel"
         data-dojo-type="dijit.layout.BorderContainer"
         data-dojo-props="region: 'bottom', splitter: true"
       >
         <div
+          id="bottomPanel"
           class="bottomPanel"
           data-dojo-type="dijit.layout.TabContainer"
           data-dojo-props="region: 'center', splitter: false"

CHANGES.md

@@ -1,6 +1,19 @@
 # Change Log
 
-## 1.131 - TBD
+
+## 1.131 - 2025-07-01
+
+### @cesium/engine
+
+### Fixes :wrench:
+
+- Updates use of deprecated options on createImageBitmap. [#12664](https://github.com/CesiumGS/cesium/pull/12664)
+
+#### Additions :tada:
+
+- Added `HeightReference` to `Cesium3DTileset.ConstructorOptions` to allow clamping point features in 3D Tile vector data to terrain or 3D Tiles [#11710](https://github.com/CesiumGS/cesium/pull/11710)
+
+## 1.130.1 - 2025-06-16
 
 ### @cesium/engine
 

CONTRIBUTORS.md

@@ -207,6 +207,8 @@ See [CONTRIBUTING.md](CONTRIBUTING.md) for details on how to contribute to Cesiu
   - [IKangXu](https://github.com/IKangXu)
   - [EMapGIS](https://github.com/EMapGIS)
   - [CandyACE](https://github.com/CandyACE)
+- [EARTHBRAIN, Ltd.](https://www.earthbrain.com/en/)
+  - [Gregory Diehl](https://github.com/gdiehleb)
 
 ## [Individual CLA](Documentation/Contributors/CLAs/individual-contributor-license-agreement-v1.0.pdf)
 
@@ -421,3 +423,4 @@ See [CONTRIBUTING.md](CONTRIBUTING.md) for details on how to contribute to Cesiu
 - [Andrew Dassonville](https://github.com/andrewda)
 - [Cody Butler](https://github.com/CodyBu)
 - [Hiwen](https://github.com/Hiwen)
+- [Matt Schwartz](https://github.com/mzschwartz5)

packages/engine/Source/Core/Resource.js

@@ -231,7 +231,7 @@ Resource.supportsImageBitmapOptions = function () {
   })
     .then(function (blob) {
       const imageBitmapOptions = {
-        imageOrientation: "flipY", // default is "none"
+        imageOrientation: "flipY", // default is "from-image"
         premultiplyAlpha: "none", // default is "default"
         colorSpaceConversion: "none", // default is "default"
       };
@@ -2036,7 +2036,7 @@ Resource.createImageBitmapFromBlob = function (blob, options) {
   );
 
   return createImageBitmap(blob, {
-    imageOrientation: options.flipY ? "flipY" : "none",
+    imageOrientation: options.flipY ? "flipY" : "from-image",
     premultiplyAlpha: options.premultiplyAlpha ? "premultiply" : "none",
     colorSpaceConversion: options.skipColorSpaceConversion ? "none" : "default",
   });

packages/engine/Source/Scene/Cesium3DTileset.js

@@ -102,6 +102,8 @@ import ImageryLayerCollection from "./ImageryLayerCollection.js";
  * @property {ClippingPlaneCollection} [clippingPlanes] The {@link ClippingPlaneCollection} used to selectively disable rendering the tileset.
  * @property {ClippingPolygonCollection} [clippingPolygons] The {@link ClippingPolygonCollection} used to selectively disable rendering the tileset.
  * @property {ClassificationType} [classificationType] Determines whether terrain, 3D Tiles or both will be classified by this tileset. See {@link Cesium3DTileset#classificationType} for details about restrictions and limitations.
+ * @property {HeightReference} [heightReference] Sets the {@link HeightReference} for point features in vector tilesets.
+ * @property {Scene} [scene] The {@link CesiumWidget#scene} that the tileset will be rendered in, required for tilesets that specify a {@link heightReference} value for clamping 3D Tiles vector data content- like points, lines, and labels- to terrain or 3D tiles.
  * @property {Ellipsoid} [ellipsoid=Ellipsoid.WGS84] The ellipsoid determining the size and shape of the globe.
  * @property {object} [pointCloudShading] Options for constructing a {@link PointCloudShading} object to control point attenuation based on geometric error and lighting.
  * @property {Cartesian3} [lightColor] The light color when shading models. When <code>undefined</code> the scene's light color is used instead.
@@ -337,6 +339,8 @@ function Cesium3DTileset(options) {
   this._tileDebugLabels = undefined;
 
   this._classificationType = options.classificationType;
+  this._heightReference = options.heightReference;
+  this._scene = options.scene;
 
   this._ellipsoid = options.ellipsoid ?? Ellipsoid.WGS84;
 
@@ -1820,6 +1824,43 @@ Object.defineProperties(Cesium3DTileset.prototype, {
     },
   },
 
+  /**
+   * Specifies if the height is relative to terrain, 3D Tiles, or both.
+   * <p>
+   * This option is only applied to point features in tilesets containing vector data.
+   * This option requires the Viewer's scene to be passed in through options.scene.
+   * </p>
+   *
+   * @memberof Cesium3DTileset.prototype
+   *
+   * @type {HeightReference | undefined}
+   * @default undefined
+   *
+   * @experimental This feature is using part of the 3D Tiles spec that is not final and is subject to change without Cesium's standard deprecation policy.
+   * @readonly
+   */
+  heightReference: {
+    get: function () {
+      return this._heightReference;
+    },
+  },
+
+  /**
+   * The {@link CesiumWidget#scene} that the tileset will be rendered in, required for tilesets that specify a {@link heightReference} value for clamping 3D Tiles vector data content- like points, lines, and labels- to terrain or 3D tiles.
+   *
+   * @member of Cesium3DTileset.prototype
+   *
+   * @type {Scene | undefined}
+   * @default undefined
+   * @readonly
+   *
+   */
+  scene: {
+    get: function () {
+      return this._scene;
+    },
+  },
+
   /**
    * Gets an ellipsoid describing the shape of the globe.
    *

packages/engine/Source/Scene/Model/UniformType.js

@@ -106,7 +106,7 @@ const UniformType = {
    */
   MAT3: "mat3",
   /**
-   * A 3x3 matrix of floating point values.
+   * A 4x4 matrix of floating point values.
    *
    * @type {string}
    * @constant

packages/engine/Source/Scene/Vector3DTileContent.js

@@ -524,7 +524,7 @@ function initialize(content, arrayBuffer, byteOffset) {
       modelMatrix: modelMatrix,
     });
   }
-
+  const tileset = content._tileset;
   if (numberOfPolylines > 0) {
     featureTable.featuresLength = numberOfPolylines;
 
@@ -570,7 +570,6 @@ function initialize(content, arrayBuffer, byteOffset) {
     );
     byteOffset += polylinePositionByteLength;
 
-    const tileset = content._tileset;
     const examineVectorLinesFunction = tileset.examineVectorLinesFunction;
     if (defined(examineVectorLinesFunction)) {
       const decodedPositions = decodeVectorPolylinePositions(
@@ -625,6 +624,8 @@ function initialize(content, arrayBuffer, byteOffset) {
       maximumHeight: maxHeight,
       rectangle: rectangle,
       batchTable: batchTable,
+      heightReference: tileset.heightReference,
+      scene: tileset.scene,
     });
   }
 }

packages/engine/Source/Scene/Vector3DTilePoints.js

@@ -15,6 +15,7 @@ import LabelCollection from "./LabelCollection.js";
 import LabelStyle from "./LabelStyle.js";
 import PolylineCollection from "./PolylineCollection.js";
 import VerticalOrigin from "./VerticalOrigin.js";
+import HeightReference from "./HeightReference.js";
 
 /**
  * Creates a batch of points or billboards and labels.
@@ -27,8 +28,10 @@ import VerticalOrigin from "./VerticalOrigin.js";
  * @param {number} options.minimumHeight The minimum height of the terrain covered by the tile.
  * @param {number} options.maximumHeight The maximum height of the terrain covered by the tile.
  * @param {Rectangle} options.rectangle The rectangle containing the tile.
+ * @param {HeightReference} options.heightReference Determines how billboard and label features are positioned relative to terrain or 3d tiles.
  * @param {Cesium3DTileBatchTable} options.batchTable The batch table for the tile containing the batched polygons.
  * @param {Uint16Array} options.batchIds The batch ids for each polygon.
+ * @param {Scene} options.scene  The Cesium Viewer {@link Scene}. This is required for clamping billboards and labels with {@link HeightReference}
  *
  * @private
  */
@@ -42,12 +45,15 @@ function Vector3DTilePoints(options) {
   this._rectangle = options.rectangle;
   this._minHeight = options.minimumHeight;
   this._maxHeight = options.maximumHeight;
+  this._heightReference = options.heightReference;
 
   this._billboardCollection = new BillboardCollection({
     batchTable: options.batchTable,
+    scene: options.scene,
   });
   this._labelCollection = new LabelCollection({
     batchTable: options.batchTable,
+    scene: options.scene,
   });
   this._polylineCollection = new PolylineCollection();
   this._polylineCollection._useHighlightColor = true;
@@ -175,6 +181,8 @@ function createPoints(points, ellipsoid) {
       const batchIds = points._batchIds;
       const numberOfPoints = positions.length / 3;
 
+      const heightReference = points._heightReference ?? HeightReference.NONE;
+
       for (let i = 0; i < numberOfPoints; ++i) {
         const id = batchIds[i];
 
@@ -183,11 +191,13 @@ function createPoints(points, ellipsoid) {
         const b = billboardCollection.add();
         b.position = position;
         b._batchIndex = id;
+        b.heightReference = heightReference;
 
         const l = labelCollection.add();
         l.text = " ";
         l.position = position;
         l._batchIndex = id;
+        l.heightReference = heightReference;
 
         const p = polylineCollection.add();
         p.positions = [Cartesian3.clone(position), Cartesian3.clone(position)];

packages/engine/Specs/Core/loadImageFromTypedArraySpec.js

@@ -59,7 +59,7 @@ describe("Core/loadImageFromTypedArray", function () {
         })
         .then(function () {
           expect(window.createImageBitmap).toHaveBeenCalledWith(blob, {
-            imageOrientation: "none",
+            imageOrientation: "from-image",
             premultiplyAlpha: "none",
             colorSpaceConversion: "default",
           });
@@ -91,7 +91,7 @@ describe("Core/loadImageFromTypedArray", function () {
       return loadImageFromTypedArray(options)
         .then(function () {
           expect(window.createImageBitmap).toHaveBeenCalledWith(blob, {
-            imageOrientation: "none",
+            imageOrientation: "from-image",
             premultiplyAlpha: "none",
             colorSpaceConversion: "none",
           });
@@ -102,7 +102,7 @@ describe("Core/loadImageFromTypedArray", function () {
         })
         .then(function () {
           expect(window.createImageBitmap).toHaveBeenCalledWith(blob, {
-            imageOrientation: "none",
+            imageOrientation: "from-image",
             premultiplyAlpha: "none",
             colorSpaceConversion: "default",
           });