Merge branch 'main' into polygon-culling-2d-fix

ggetz · ggetz · commit d7313ae6c0d3 · 2025-07-22T10:59:28.000-04:00
diff --git a/CHANGES.md b/CHANGES.md
@@ -4,11 +4,15 @@
 
 ### @cesium/engine
 
-### Fixes :wrench:
+#### Fixes :wrench:
 
-- Fixes incorrect polygon culling in 2D scene mode [#1552](https://github.com/CesiumGS/cesium/issues/1552)
-- Fixes material flashing when changing properties [#1640](https://github.com/CesiumGS/cesium/issues/1640), [12716](https://github.com/CesiumGS/cesium/issues/12716)
+- Fixes incorrect polygon culling in 2D scene mode. [#1552](https://github.com/CesiumGS/cesium/issues/1552)
+- Fixes material flashing when changing properties. [#1640](https://github.com/CesiumGS/cesium/issues/1640), [#12716](https://github.com/CesiumGS/cesium/issues/12716)
+- Fixed an issue where draped imagery on tilesets was not updated based on the visibility of the imagery layer. [#12742](https://github.com/CesiumGS/cesium/issues/12742)
+- Fixes an exception when removing a Gaussian splat tileset from the scene primitives when it has more than one tile. [#12726](https://github.com/CesiumGS/cesium/pull/12726)
+- Fixes rendering of Gaussian splats when they are scaled by the glTF transform, tileset transform, or model matrix. [#12721](https://github.com/CesiumGS/cesium/issues/12721), [#12718](https://github.com/CesiumGS/cesium/issues/12718)
 - Updated the type of many properties and functions of `Scene` to clarify that they may be `undefined`. For the full list check PR: [#12736](https://github.com/CesiumGS/cesium/pull/12736)
+- Fixes Gaussian splats incorrectly rendering when `Cesium3DTileset.show` is `false`. [#12748](https://github.com/CesiumGS/cesium/pull/12748)
 
 #### Additions :tada:
 
@@ -18,7 +22,7 @@
 
 ### @cesium/engine
 
-### Fixes :wrench:
+#### Fixes :wrench:
 
 - Updates use of deprecated options on createImageBitmap. [#12664](https://github.com/CesiumGS/cesium/pull/12664)
 - Fixed raymarching step size for cylindrical voxels. [#12681](https://github.com/CesiumGS/cesium/pull/12681)
diff --git a/ThirdParty.json b/ThirdParty.json
@@ -12,7 +12,7 @@
     "license": [
       "BSD-3-Clause"
     ],
-    "version": "2.7.62",
+    "version": "2.7.63",
     "url": "https://www.npmjs.com/package/@zip.js/zip.js"
   },
   {
@@ -61,7 +61,7 @@
     "license": [
       "ISC"
     ],
-    "version": "3.0.1",
+    "version": "3.0.2",
     "url": "https://www.npmjs.com/package/earcut"
   },
   {
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cesium",
-  "version": "1.131.0",
+  "version": "1.131.1-ion.0",
   "description": "CesiumJS is a JavaScript library for creating 3D globes and 2D maps in a web browser without a plugin.",
   "homepage": "http://cesium.com/cesiumjs/",
   "license": "Apache-2.0",
@@ -51,8 +51,8 @@
     "./Specs/**/*"
   ],
   "dependencies": {
-    "@cesium/engine": "^18.3.0",
-    "@cesium/widgets": "^12.3.0"
+    "@cesium/engine": "^18.3.1-ion.0",
+    "@cesium/widgets": "^12.3.1-ion.0"
   },
   "devDependencies": {
     "@cesium/eslint-config": "^12.0.0",
@@ -159,4 +159,4 @@
     "packages/engine",
     "packages/widgets"
   ]
-}
+}
diff --git a/packages/engine/Source/Scene/GaussianSplat3DTileContent.js b/packages/engine/Source/Scene/GaussianSplat3DTileContent.js
@@ -513,8 +513,15 @@ GaussianSplat3DTileContent.prototype.isDestroyed = function () {
  */
 GaussianSplat3DTileContent.prototype.destroy = function () {
   this.splatPrimitive = undefined;
-  this._tileset.gaussianSplatPrimitive.destroy();
+
+  if (
+    defined(this._tileset.gaussianSplatPrimitive) &&
+    !this._tileset.gaussianSplatPrimitive.isDestroyed()
+  ) {
+    this._tileset.gaussianSplatPrimitive.destroy();
+  }
   this._tileset.gaussianSplatPrimitive = undefined;
+
   this._tile = undefined;
   this._tileset = undefined;
   this._resource = undefined;
diff --git a/packages/engine/Source/Scene/GaussianSplatPrimitive.js b/packages/engine/Source/Scene/GaussianSplatPrimitive.js
@@ -3,7 +3,6 @@ import Matrix4 from "../Core/Matrix4.js";
 import ModelUtility from "./Model/ModelUtility.js";
 import GaussianSplatSorter from "./GaussianSplatSorter.js";
 import GaussianSplatTextureGenerator from "./GaussianSplatTextureGenerator.js";
-import Check from "../Core/Check.js";
 import ComponentDatatype from "../Core/ComponentDatatype.js";
 import PixelDatatype from "../Renderer/PixelDatatype.js";
 import PixelFormat from "../Core/PixelFormat.js";
@@ -123,13 +122,7 @@ function GaussianSplatPrimitive(options) {
    * @private
    */
   this._needsGaussianSplatTexture = true;
-  /**
-   * The scale of the Gaussian splats.
-   * This is used to control the size of the splats when rendered.
-   * @type {number}
-   * @private
-   */
-  this._splatScale = 1.0;
+
   /**
    * The previous view matrix used to determine if the primitive needs to be updated.
    * This is used to avoid unnecessary updates when the view matrix hasn't changed.
@@ -297,26 +290,6 @@ Object.defineProperties(GaussianSplatPrimitive.prototype, {
       return this._ready;
     },
   },
-  /**
-   * Scaling factor applied to the Gaussian splats indepdendent of the
-   * Gaussian splat scale attribute. Applied uniformly to all splats.
-   * @memberof GaussianSplatPrimitive.prototype
-   * @type {number}
-   * @default 1.0
-   */
-
-  splatScale: {
-    get: function () {
-      return this._splatScale;
-    },
-    set: function (splatScale) {
-      //>>includeStart('debug', pragmas.debug);
-      Check.typeOf.number("splatScale", splatScale);
-      //>>includeEnd('debug');
-
-      this._splatScale = splatScale;
-    },
-  },
 
   /**
    * The {@link SplitDirection} to apply to this point.
@@ -628,14 +601,8 @@ GaussianSplatPrimitive.buildGSplatDrawCommand = function (
     ShaderDestination.VERTEX,
   );
 
-  shaderBuilder.addUniform("float", "u_splatScale", ShaderDestination.VERTEX);
-
   const uniformMap = renderResources.uniformMap;
 
-  uniformMap.u_splatScale = function () {
-    return primitive.splatScale;
-  };
-
   uniformMap.u_splatAttributeTexture = function () {
     return primitive.gaussianSplatTexture;
   };
@@ -753,7 +720,7 @@ GaussianSplatPrimitive.prototype.update = function (frameState) {
     this._rootTransform = tileset.root.computedTransform;
   }
 
-  if (this._drawCommand) {
+  if (this._drawCommand && tileset.show) {
     frameState.commandList.push(this._drawCommand);
   }
 
diff --git a/packages/engine/Source/Scene/Model/ImageryConfiguration.js b/packages/engine/Source/Scene/Model/ImageryConfiguration.js
@@ -12,6 +12,7 @@
  */
 class ImageryConfiguration {
   constructor(imageryLayer) {
+    this.show = imageryLayer.show;
     this.alpha = imageryLayer.alpha;
     this.brightness = imageryLayer.brightness;
     this.contrast = imageryLayer.contrast;
diff --git a/packages/engine/Source/Scene/Model/ImageryPipelineStage.js b/packages/engine/Source/Scene/Model/ImageryPipelineStage.js
@@ -109,7 +109,9 @@ class ImageryPipelineStage {
     );
 
     // This can happen when none of the imagery textures could
-    // be obtained, because they had all been INVALID/FAILED.
+    // be obtained, because they had all been INVALID/FAILED,
+    // or when none of the imagery layers is actually visible
+    // according to `show==true`
     // Bail out in this case
     if (imageryInputs.length === 0) {
       return;
@@ -758,7 +760,8 @@ class ImageryPipelineStage {
    * pipeline stage for draping the given imagery layers over the primitive
    * that is described by the given model primitive imagery.
    *
-   * This will obtain the <code>ImageryCoverage</code> objects that are provided by
+   * For each imagery layer that is currently visible (as of `show==true`), this
+   * will obtain the <code>ImageryCoverage</code> objects that are provided by
    * the given model primitive imagery (and that describe the imagery tiles
    * that are covered by the primitive), and create one <code>ImageryInput</code> for
    * each of them.
@@ -791,6 +794,9 @@ class ImageryPipelineStage {
 
     for (let i = 0; i < imageryLayers.length; i++) {
       const imageryLayer = imageryLayers.get(i);
+      if (!imageryLayer.show) {
+        continue;
+      }
       const imageryTexCoordAttributeSetIndex =
         imageryTexCoordAttributeSetIndices[i];
       const mappedPositions =
diff --git a/packages/engine/Source/Scene/Model/ModelImagery.js b/packages/engine/Source/Scene/Model/ModelImagery.js
@@ -335,6 +335,9 @@ class ModelImagery {
       const imageryLayer = imageryLayers.get(i);
       const imageryConfiguration = imageryConfigurations[i];
 
+      if (imageryLayer.show !== imageryConfiguration.show) {
+        return true;
+      }
       if (imageryLayer.alpha !== imageryConfiguration.alpha) {
         return true;
       }
diff --git a/packages/engine/Source/Shaders/PrimitiveGaussianSplatVS.glsl b/packages/engine/Source/Shaders/PrimitiveGaussianSplatVS.glsl
@@ -22,24 +22,11 @@ vec4 calcCovVectors(vec3 viewPos, mat3 Vrk) {
         0.0, 0.0, 0.0
     );
 
-    //We need to take our view and remove the scale component
-    //quantized models can have a scaled matrix which will throw our splat size off
     mat3 R = mat3(czm_modelView);
-    vec3 scale;
-    scale.x = length(R[0].xyz);
-    scale.y = length(R[1].xyz);
-    scale.z = length(R[2].xyz);
-
-    mat3 Rs = mat3(
-    R[0].xyz / scale.x,
-    R[1].xyz / scale.y,
-    R[2].xyz / scale.z
-    );
 
     //transform our covariance into view space
     //ensures orientation is correct
-    mat3 Vrk_view = Rs * Vrk * transpose(Rs);
-
+    mat3 Vrk_view = R * Vrk * transpose(R);
     mat3 cov = transpose(J) * Vrk_view * J;
 
     float diagonal1 = cov[0][0] + .3;
@@ -86,9 +73,6 @@ void main() {
     vec2 u3 = unpackHalf2x16(covariance.z);
     mat3 Vrk = mat3(u1.x, u1.y, u2.x, u1.y, u2.y, u3.x, u2.x, u3.x, u3.y);
 
-    //we can still apply scale here even though cov3d is pre-computed
-    Vrk *= u_splatScale;
-
     vec4 covVectors = calcCovVectors(splatViewPos.xyz, Vrk);
 
     if (dot(covVectors.xy, covVectors.xy) < 4.0 && dot(covVectors.zw, covVectors.zw) < 4.0) {
diff --git a/packages/engine/Specs/Scene/GaussianSplat3DTileContentSpec.js b/packages/engine/Specs/Scene/GaussianSplat3DTileContentSpec.js
@@ -96,6 +96,26 @@ describe(
         },
       );
     });
+    it("Create and destroy GaussianSplat3DTileContent", async function () {
+      const tileset = await Cesium3DTilesTester.loadTileset(
+        scene,
+        tilesetUrl,
+        options,
+      );
+      scene.camera.lookAt(
+        tileset.boundingSphere.center,
+        new HeadingPitchRange(0.0, -1.57, tileset.boundingSphere.radius),
+      );
+      const tile = await Cesium3DTilesTester.waitForTileContentReady(
+        scene,
+        tileset.root,
+      );
+
+      scene.primitives.remove(tileset);
+      expect(tileset.isDestroyed()).toBe(true);
+      expect(tile.isDestroyed()).toBe(true);
+      expect(tile.content).toBeUndefined();
+    });
   },
   "WebGL",
 );
diff --git a/packages/engine/Specs/Scene/GaussianSplatPrimitiveSpec.js b/packages/engine/Specs/Scene/GaussianSplatPrimitiveSpec.js
@@ -47,34 +47,53 @@ describe(
       ResourceCache.clearForSpecs();
     });
 
-    it("load a Gaussian Splat tileset", function () {
-      return Cesium3DTilesTester.loadTileset(scene, tilesetUrl, options).then(
-        function (tileset) {
-          scene.camera.lookAt(
-            tileset.boundingSphere.center,
-            new HeadingPitchRange(0.0, -1.57, tileset.boundingSphere.radius),
-          );
-          expect(tileset.hasExtension("3DTILES_content_gltf")).toBe(true);
-          expect(
-            tileset.isGltfExtensionUsed("KHR_spz_gaussian_splats_compression"),
-          ).toBe(true);
-          expect(
-            tileset.isGltfExtensionRequired(
-              "KHR_spz_gaussian_splats_compression",
-            ),
-          ).toBe(true);
+    it("loads a Gaussian splats tileset", async function () {
+      const tileset = await Cesium3DTilesTester.loadTileset(
+        scene,
+        tilesetUrl,
+        options,
+      );
+      scene.camera.lookAt(
+        tileset.boundingSphere.center,
+        new HeadingPitchRange(0.0, -1.57, tileset.boundingSphere.radius),
+      );
+      expect(tileset.hasExtension("3DTILES_content_gltf")).toBe(true);
+      expect(
+        tileset.isGltfExtensionUsed("KHR_spz_gaussian_splats_compression"),
+      ).toBe(true);
+      expect(
+        tileset.isGltfExtensionRequired("KHR_spz_gaussian_splats_compression"),
+      ).toBe(true);
 
-          return Cesium3DTilesTester.waitForTileContentReady(
-            scene,
-            tileset.root,
-          ).then(function (tile) {
-            expect(tile.content).toBeDefined();
-            expect(tile.content instanceof GaussianSplat3DTileContent).toBe(
-              true,
-            );
-          });
-        },
+      const tile = await Cesium3DTilesTester.waitForTileContentReady(
+        scene,
+        tileset.root,
       );
+
+      expect(tile.content).toBeDefined();
+      expect(tile.content instanceof GaussianSplat3DTileContent).toBe(true);
+    });
+
+    xit("loads a Gaussian splats tileset and toggles visibility", async function () {
+      const tileset = await Cesium3DTilesTester.loadTileset(
+        scene,
+        tilesetUrl,
+        options,
+      );
+      scene.camera.lookAt(
+        tileset.boundingSphere.center,
+        new HeadingPitchRange(0.0, -1.57, tileset.boundingSphere.radius),
+      );
+      const tile = await Cesium3DTilesTester.waitForTileContentReady(
+        scene,
+        tileset.root,
+      );
+      expect(tile.content).toBeDefined();
+      expect(tileset.gaussianSplatPrimitive).toBeDefined();
+      expect(scene).notToRender([0, 0, 0, 255]);
+
+      tileset.show = false;
+      expect(scene).toRender([0, 0, 0, 255]);
     });
   },
   "WebGL",
diff --git a/packages/engine/Specs/Scene/Model/ImageryPipelineStageSpec.js b/packages/engine/Specs/Scene/Model/ImageryPipelineStageSpec.js
diff --git a/packages/engine/Specs/Scene/Model/ModelImagerySpec.js b/packages/engine/Specs/Scene/Model/ModelImagerySpec.js
diff --git a/packages/engine/Specs/Scene/Model/loadTilesetWithImagery.js b/packages/engine/Specs/Scene/Model/loadTilesetWithImagery.js
diff --git a/packages/engine/package.json b/packages/engine/package.json
diff --git a/packages/widgets/package.json b/packages/widgets/package.json

Original file line number	Diff line number	Diff line change
`@@ -335,6 +335,9 @@ class ModelImagery {`
`335`	`335`	`const imageryLayer = imageryLayers.get(i);`
`336`	`336`	`const imageryConfiguration = imageryConfigurations[i];`
`337`	`337`
	`338`	`+ if (imageryLayer.show !== imageryConfiguration.show) {`
	`339`	`+ return true;`
	`340`	`+ }`
`338`	`341`	`if (imageryLayer.alpha !== imageryConfiguration.alpha) {`
`339`	`342`	`return true;`
`340`	`343`	`}`