CesiumGS · keyboardspecialist · Jun 7, 2024 · Jun 8, 2024 · Jun 12, 2024 · Jun 13, 2024
diff --git a/.markdownlintignore b/.markdownlintignore
@@ -1,5 +1,6 @@
 /node_modules
 /ThirdParty
 /Tools/**
+temp_wasm/*
 
 LICENSE.md
diff --git a/Apps/Sandcastle/gallery/3D Tiles Gaussian Splatting.html b/Apps/Sandcastle/gallery/3D Tiles Gaussian Splatting.html
@@ -0,0 +1,108 @@
+<!doctype html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8" />
+    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
+    <meta
+      name="viewport"
+      content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1, user-scalable=no"
+    />
+    <meta
+      name="description"
+      content="Use Viewer to start building new applications or easily embed Cesium into existing applications."
+    />
+    <meta name="cesium-sandcastle-labels" content="Showcases, 3D Tiles" />
+    <title>Cesium Demo</title>
+    <script type="text/javascript" src="../Sandcastle-header.js"></script>
+    <script type="module" src="../load-cesium-es6.js"></script>
+  </head>
+  <body class="sandcastle-loading" data-sandcastle-bucket="bucket-requirejs.html">
+    <style>
+      @import url(../templates/bucket.css);
+    </style>
+    <div id="cesiumContainer" class="fullSize"></div>
+    <div id="loadingOverlay"><h1>Loading...</h1></div>
+    <div id="toolbar"></div>
+    <script id="cesium_sandcastle_script">
+      window.startup = async function (Cesium) {
+        "use strict";
+        //Sandcastle_Begin
+        Cesium.Ion.defaultAccessToken =
+          "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiI2MWEyNWI4NS02ZWVmLTQyZTEtOTRjZi02NjljOWNhOWViNGEiLCJpZCI6MTQwNTg1LCJpYXQiOjE3MzYzNjg4OTR9.rIAEC387JLBYOPt3w1fliKTWZgTGCQYJlG8o5HJsTwY";
+        const viewer = new Cesium.Viewer("cesiumContainer");
+        viewer.scene.debugShowFramesPerSecond = true;
+
+        const ORBIT_RANGE_FACTOR = 3;
+        const ORBIT_PITCH_DIVIDEND = 8;
+
+        let cellTowerTileset;
+        Cesium.Cesium3DTileset.fromIonAssetId(2917325, {
+          maximumScreenSpaceError: 1,
+        }).then((tileset) => {
+          cellTowerTileset = tileset;
+          viewer.scene.primitives.add(cellTowerTileset);
+          setupCamera();
+        });
-        Cesium.Cesium3DTileset.fromIonAssetId(2917325, {
-          maximumScreenSpaceError: 1,
-        }).then((tileset) => {
-          cellTowerTileset = tileset;
-          viewer.scene.primitives.add(cellTowerTileset);
-          setupCamera();
-        });
+        const cellTowerTileset = await Cesium.Cesium3DTileset.fromIonAssetId(2917325, {
+          maximumScreenSpaceError: 1,
+        });
+        viewer.scene.primitives.add(cellTowerTileset);
+        setupCamera();
-        Cesium.Cesium3DTileset.fromIonAssetId(2917325, {
-          maximumScreenSpaceError: 1,
-        }).then((tileset) => {
-          cellTowerTileset = tileset;
-          viewer.scene.primitives.add(cellTowerTileset);
-          setupCamera();
-        });
+        const cellTowerTileset = await Cesium.Cesium3DTileset.fromIonAssetId(2917325, {
+          maximumScreenSpaceError: 1,
+        });
+        viewer.scene.primitives.add(cellTowerTileset);
+        setupCamera();
+        let startTime;
+        let isRunning = false;
+
+        function setupCamera() {
+          const boundingSphere = cellTowerTileset.boundingSphere;
+          const heading = 0;
+          const range = boundingSphere.radius * ORBIT_RANGE_FACTOR;
+          const pitch = -Math.PI / ORBIT_PITCH_DIVIDEND;
+
+          viewer.camera.lookAt(
+            boundingSphere.center,
+            new Cesium.HeadingPitchRange(heading, pitch, range),
+          );
+
+          return true;
+        }
+
+        function startCameraOrbit() {
+          if (!setupCamera()) {
+            return;
+          }
+          startTime = performance.now();
+          isRunning = true;
+          requestAnimationFrame(cameraOrbitTickCallback);
+        }
+
+        function cameraOrbitTickCallback(timestamp) {
+          if (!isRunning) {
+            return;
+          }
+
+          const boundingSphere = cellTowerTileset.boundingSphere;
+          const elapsedSeconds = (timestamp - startTime) / 1000;
+          const heading = (elapsedSeconds / 15) * Math.PI * 2;
+
+          const range = boundingSphere.radius * ORBIT_RANGE_FACTOR;
+          const pitch = -Math.PI / ORBIT_PITCH_DIVIDEND;
+
+          viewer.camera.lookAt(
+            boundingSphere.center,
+            new Cesium.HeadingPitchRange(heading, pitch, range),
+          );
+
+          requestAnimationFrame(cameraOrbitTickCallback);
+        }
+
+        Sandcastle.addToolbarButton("Start Orbit", startCameraOrbit);
+        Sandcastle.addToolbarButton("Stop Orbit", () => {
+          isRunning = false;
+        });
+        //Sandcastle_End
+        Sandcastle.finishedLoading();
+      };
+      if (typeof Cesium !== "undefined") {
+        window.startupCalled = true;
+        window.startup(Cesium).catch((error) => {
+          "use strict";
+          console.error(error);
+        });
+      }
+    </script>
+  </body>
+</html>
diff --git a/Apps/Sandcastle/gallery/3D Tiles Gaussian Splatting.jpg b/Apps/Sandcastle/gallery/3D Tiles Gaussian Splatting.jpg
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
@@ -169,6 +169,7 @@ See [CONTRIBUTING.md](CONTRIBUTING.md) for details on how to contribute to Cesiu
   - [Adam Morris](https://github.com/weegeekps)
   - [Luke McKinstry](https://github.com/lukemckinstry)
   - [Ryan Veenstra](https://github.com/r-veenstra)
+  - [Jason Sobotka](https://github.com/keyboardspecialist)
 - [Northrop Grumman](http://www.northropgrumman.com)
   - [Joseph Stein](https://github.com/nahgrin)
 - [EOX IT Services GmbH](https://eox.at)

diff --git a/eslint.config.js b/eslint.config.js
@@ -19,6 +19,7 @@ export default [
       "packages/engine/Source/Shaders/**/*",
       "Specs/jasmine/*",
       "**/*/SpecList.js",
+      "temp_wasm/*",
     ],
   },
   {

diff --git a/gulpfile.js b/gulpfile.js
@@ -373,6 +373,11 @@ export async function prepare() {
     "Tools/jsdoc/cesium_template/static/styles/prism.css",
   );
 
+  copyFileSync(
+    "node_modules/@cesium/wasm-splats/wasm_splats_bg.wasm",
+    "packages/engine/Source/ThirdParty/wasm_splats_bg.wasm",
+  );
+
   // Copy jasmine runner files into Specs
   const files = await globby([
     "node_modules/jasmine-core/lib/jasmine-core",

diff --git a/package.json b/package.json
@@ -52,7 +52,8 @@
   ],
   "dependencies": {
     "@cesium/engine": "^13.1.0",
-    "@cesium/widgets": "^10.1.0"
+    "@cesium/widgets": "^10.1.0",
+    "@cesium/wasm-splats": "file:./temp_wasm/pkg"
   },
   "devDependencies": {
     "@playwright/test": "^1.41.1",
@@ -159,4 +160,4 @@
     "packages/engine",
     "packages/widgets"
   ]
-}
+}
diff --git a/packages/engine/Source/Core/PixelFormat.js b/packages/engine/Source/Core/PixelFormat.js
@@ -63,6 +63,15 @@ const PixelFormat = {
    */
   RGBA: WebGLConstants.RGBA,
 
+  /**
+   * Integral versions of above types. Required if using integral textures.
+   */
+
+  RED_INTEGER: WebGLConstants.RED_INTEGER,
+  RG_INTEGER: WebGLConstants.RG_INTEGER,
+  RGB_INTEGER: WebGLConstants.RGB_INTEGER,
+  RGBA_INTEGER: WebGLConstants.RGBA_INTEGER,
+
   /**
    * A pixel format containing a luminance (intensity) channel.
    *
@@ -190,14 +199,18 @@ const PixelFormat = {
 PixelFormat.componentsLength = function (pixelFormat) {
   switch (pixelFormat) {
     case PixelFormat.RGB:
+    case PixelFormat.RGB_INTEGER:
       return 3;
     case PixelFormat.RGBA:
+    case PixelFormat.RGBA_INTEGER:
       return 4;
     case PixelFormat.LUMINANCE_ALPHA:
     case PixelFormat.RG:
+    case PixelFormat.RG_INTEGER:
       return 2;
     case PixelFormat.ALPHA:
     case PixelFormat.RED:
+    case PixelFormat.RED_INTEGER:
     case PixelFormat.LUMINANCE:
       return 1;
     default:
@@ -217,6 +230,10 @@ PixelFormat.validate = function (pixelFormat) {
     pixelFormat === PixelFormat.RG ||
     pixelFormat === PixelFormat.RGB ||
     pixelFormat === PixelFormat.RGBA ||
+    pixelFormat === PixelFormat.RED_INTEGER ||
+    pixelFormat === PixelFormat.RG_INTEGER ||
+    pixelFormat === PixelFormat.RGB_INTEGER ||
+    pixelFormat === PixelFormat.RGBA_INTEGER ||
     pixelFormat === PixelFormat.LUMINANCE ||
     pixelFormat === PixelFormat.LUMINANCE_ALPHA ||
     pixelFormat === PixelFormat.RGB_DXT1 ||
@@ -499,6 +516,32 @@ PixelFormat.toInternalFormat = function (pixelFormat, pixelDatatype, context) {
     }
   }
 
+  if (pixelDatatype === PixelDatatype.INT) {
+    switch (pixelFormat) {
+      case PixelFormat.RGBA_INTEGER:
+        return WebGLConstants.RGBA32I;
+      case PixelFormat.RGB_INTEGER:
+        return WebGLConstants.RGB32I;
+      case PixelFormat.RG_INTEGER:
+        return WebGLConstants.RG32I;
+      case PixelFormat.RED_INTEGER:
+        return WebGLConstants.R32I;
+    }
+  }
+
+  if (pixelDatatype === PixelDatatype.UNSIGNED_INT) {
+    switch (pixelFormat) {
+      case PixelFormat.RGBA_INTEGER:
+        return WebGLConstants.RGBA32UI;
+      case PixelFormat.RGB_INTEGER:
+        return WebGLConstants.RGB32UI;
+      case PixelFormat.RG_INTEGER:
+        return WebGLConstants.RG32UI;
+      case PixelFormat.RED_INTEGER:
+        return WebGLConstants.R32UI;
+    }
+  }
+
   return pixelFormat;
 };
 

diff --git a/packages/engine/Source/Renderer/Context.js b/packages/engine/Source/Renderer/Context.js
@@ -51,7 +51,7 @@ function Context(canvas, options) {
   } = defaultValue(options, {});
 
   // Override select WebGL defaults
-  webglOptions.alpha = defaultValue(webglOptions.alpha, false); // WebGL default is true
+  webglOptions.alpha = defaultValue(webglOptions.alpha, true); // WebGL default is true
   webglOptions.stencil = defaultValue(webglOptions.stencil, true); // WebGL default is false
   webglOptions.powerPreference = defaultValue(
     webglOptions.powerPreference,
@@ -1308,6 +1308,7 @@ function beginDraw(
   bindFramebuffer(context, framebuffer);
   applyRenderState(context, renderState, passState, false);
   shaderProgram._bind();
+
   context._maxFrameTextureUnitIndex = Math.max(
     context._maxFrameTextureUnitIndex,
     shaderProgram.maximumTextureUnitIndex,
@@ -1382,6 +1383,7 @@ function continueDraw(context, drawCommand, shaderProgram, uniformMap) {
     } else {
       count = va.numberOfVertices;
     }
+
     if (instanceCount === 0) {
       context._gl.drawArrays(primitiveType, offset, count);
     } else {

diff --git a/packages/engine/Source/Renderer/Pass.js b/packages/engine/Source/Renderer/Pass.js
@@ -21,7 +21,8 @@ const Pass = {
   OPAQUE: 7,
   TRANSLUCENT: 8,
   VOXELS: 9,
-  OVERLAY: 10,
-  NUMBER_OF_PASSES: 11,
+  GAUSSIAN_SPLATS: 10,
+  OVERLAY: 11,
+  NUMBER_OF_PASSES: 12,
 };
 export default Object.freeze(Pass);
diff --git a/packages/engine/Source/Renderer/Texture.js b/packages/engine/Source/Renderer/Texture.js
@@ -340,9 +340,17 @@ function loadBufferSource(texture, source) {
     pixelDatatype,
     width,
   );
+
+  let glErr;
   gl.pixelStorei(gl.UNPACK_ALIGNMENT, unpackAlignment);
   gl.pixelStorei(gl.UNPACK_PREMULTIPLY_ALPHA_WEBGL, false);
   gl.pixelStorei(gl.UNPACK_FLIP_Y_WEBGL, false);
+  glErr = gl.getError();
+  if (glErr !== 0) {
+    console.log(
+      `pixelStorei err ${glErr}, format ${pixelFormat} internalFormat ${internalFormat}`,
+    );
+  }
 
   let { arrayBufferView } = source;
   if (flipY) {
@@ -365,6 +373,12 @@ function loadBufferSource(texture, source) {
     PixelDatatype.toWebGLConstant(pixelDatatype, context),
     arrayBufferView,
   );
+  glErr = gl.getError();
+  if (glErr !== 0) {
+    console.log(
+      `texImage2D err ${glErr}, format ${pixelFormat} internalFormat ${internalFormat}`,
+    );
+  }
 
   if (defined(source.mipLevels)) {
     let mipWidth = width;

diff --git a/packages/engine/Source/Renderer/VertexArray.js b/packages/engine/Source/Renderer/VertexArray.js
@@ -11,6 +11,7 @@ import RuntimeError from "../Core/RuntimeError.js";
 import Buffer from "./Buffer.js";
 import BufferUsage from "./BufferUsage.js";
 import ContextLimits from "./ContextLimits.js";
+import AttributeType from "../Scene/AttributeType.js";
 
 function addAttribute(attributes, attribute, index, context) {
   const hasVertexBuffer = defined(attribute.vertexBuffer);
@@ -648,6 +649,7 @@ VertexArray.fromGeometry = function (options) {
           componentDatatype = ComponentDatatype.FLOAT;
         }
 
+        let attrProps = {};
         vertexBuffer = undefined;
         if (defined(attribute.values)) {
           vertexBuffer = Buffer.createVertexBuffer({
@@ -658,16 +660,48 @@ VertexArray.fromGeometry = function (options) {
             ),
             usage: bufferUsage,
           });
+
+          attrProps = {
+            index: attributeLocations[name],
+            vertexBuffer: vertexBuffer,
+            value: attribute.value,
+            componentDatatype: componentDatatype,
+            componentsPerAttribute: attribute.componentsPerAttribute,
+            normalize: attribute.normalize,
+          };
+        }
+
+        //if we already have a typedArray lets use it
+        if (defined(attribute.typedArray)) {
+          vertexBuffer = Buffer.createVertexBuffer({
+            context: context,
+            typedArray: attribute.typedArray,
+            usage: bufferUsage,
+          });
+
+          attrProps = {
+            index: attributeLocations[name],
+            vertexBuffer: vertexBuffer,
+            value: undefined,
+            componentDatatype: componentDatatype,
+            componentsPerAttribute: AttributeType.getNumberOfComponents(
+              attribute.type,
+            ),
+            normalize: attribute.normalized,
+            instanceDivisor: attribute.instanceDivisor,
+          };
         }
 
-        vaAttributes.push({
-          index: attributeLocations[name],
-          vertexBuffer: vertexBuffer,
-          value: attribute.value,
-          componentDatatype: componentDatatype,
-          componentsPerAttribute: attribute.componentsPerAttribute,
-          normalize: attribute.normalize,
-        });
+        vaAttributes.push(attrProps);
+
+        // vaAttributes.push({
+        //   index: attributeLocations[name],
+        //   vertexBuffer: vertexBuffer,
+        //   value: attribute.value,
+        //   componentDatatype: componentDatatype,
+        //   componentsPerAttribute: attribute.componentsPerAttribute,
+        //   normalize: attribute.normalize,
+        // });
       }
     }
   }

diff --git a/packages/engine/Source/Renderer/createUniform.js b/packages/engine/Source/Renderer/createUniform.js
@@ -26,6 +26,8 @@ function createUniform(gl, activeUniform, uniformName, location) {
     case gl.SAMPLER_2D:
     case gl.SAMPLER_CUBE:
       return new UniformSampler(gl, activeUniform, uniformName, location);
+    case gl.UNSIGNED_INT_SAMPLER_2D:
+      return new UniformSampler(gl, activeUniform, uniformName, location);
     case gl.INT:
     case gl.BOOL:
       return new UniformInt(gl, activeUniform, uniformName, location);