Merge new commits from main into v2.0.0:

- 296eaee: Copy originToWorld values instead of holding a reference in SplatAccumulator (#191)
- 1ecabe0: Interactive ripples effect (#194)
- 589b6bc: Fix build_rust_wasm.sh script (correct shebang, don't require rustup) (#197)
- 018a3ed: (already merged) Support logarithmic depth buffer (#199)
- 8f90fe0: Fix reference counting for SplatAccumulator during updates (#200)
- 18a33cb: portal effect (#203)
- ad3a9bd: Fix ref counting and originToWorld in SparkViewpoint.prepare (#207)
- 0d9f7bf: fix twister & rain effects (#211)
- c9c488c: add greyscale painting and add i/o (#217)
- 937262b: Interactive deform effect with bounce (#223)
- 196721e: Add Demo Splat Dissolve Effects (#218)
- 752cfaa: fix: resolve webpack/Next.js WASM data URL compatibility issue (#95) (#231)
- 558a9a9: refactor: use magic-string for proper source maps in WASM fix (#234)
- 237b181: Rename single character variable
- fa71609: Add three as peerdependency (fix #238)
- d6d5e7e: Ensure splatDefines ShaderChunk is ready when using Readback before SparkRenderer (#240)
- 10a7541: add undo brush to splat painter example (#241)
- a573987: Dispose of spherical harmonics arrays and packedArray in PackedSplats (#239)
- dec8c4e: Add reference to Spark 2.0 preview in README
- 1a8239b: Add Spark 2.0 example links to README

Author: asundqui

examples.html

@@ -246,6 +246,7 @@
           'splat-painter': './splat-painter/index.html',
           'splat-reveal-effects': './splat-reveal-effects/index.html',
           'splat-shader-effects': './splat-shader-effects/index.html',
+          'splat-dissolve-effects': './splat-dissolve-effects/index.html',
           'splat-transitions': './splat-transitions/index.html',
           'stochastic': './stochastic/index.html',
           'sogs': './sogs/index.html',

examples/interactive-deform/index.html

@@ -46,4 +46,3 @@
 </body>
 
 </html>
-

examples/splat-dissolve-effects/index.html

@@ -24,7 +24,7 @@
 	<script type="module">
 		import * as THREE from "three";
 		import { OrbitControls } from "three/addons/controls/OrbitControls.js";
-		import { SplatMesh, dyno } from "@sparkjsdev/spark";
+		import { SparkRenderer, SplatMesh, dyno } from "@sparkjsdev/spark";
 		import { getAssetFileURL } from "/examples/js/get-asset-url.js";
 
 		const flyPos = new THREE.Vector3(0, 0, -0.5);
@@ -44,6 +44,12 @@
 			renderer.setSize(window.innerWidth, window.innerHeight);
 		}
 
+<<<<<<< HEAD
+=======
+        const spark = new SparkRenderer({ renderer });
+        scene.add(spark);
+
+>>>>>>> 1d58ed6 (Merge new commits from main into v2.0.0:)
 		/*
 			Asset: fly.spz
 			Author: Danny Bittel (https://danybittel.ch/)

examples/splat-painter/index.html

@@ -60,7 +60,11 @@
       SparkRenderer,
       SplatMesh,
       RgbaArray,
+      readRgbaArray,
       SparkControls,
+      SpzWriter,
+      unpackSplat,
+      PackedSplats,
     } from "@sparkjsdev/spark";
     import * as THREE from "three";
     import { getAssetFileURL } from "../js/get-asset-url.js";
@@ -105,7 +109,7 @@
         const luminanceThreshold = dyno.dynoFloat(0.1);
         return dyno.dynoBlock({ gsplat: dyno.Gsplat }, { gsplat: dyno.Gsplat }, ({ gsplat }) => {
             if (!gsplat) {
-            throw new Error("No gsplat input");
+                throw new Error("No gsplat input");
             }
             let { center, rgb, opacity, index } = dyno.splitGsplat(gsplat).outputs;
             const projectionAmplitude = dyno.dot(brushDirection, dyno.sub(center, brushOrigin));
@@ -114,7 +118,11 @@
             const isInside = dyno.and(dyno.lessThan(distance, brushRadius), 
                                       dyno.and(dyno.greaterThan(projectionAmplitude, dyno.dynoFloat(0.0)),
                                       dyno.lessThan(projectionAmplitude, brushDepth)));
+<<<<<<< HEAD
 
+=======
+
+>>>>>>> 1d58ed6 (Merge new commits from main into v2.0.0:)
             // Paint/erase mode: change RGB or alpha values for splats inside brush
             const luminanceOld = dyno.div(dyno.dot(rgb, flatColor), dyno.dynoFloat(3.0));
             const luminanceNew = dyno.div(dyno.dot(brushColor, flatColor), dyno.dynoFloat(3.0));
@@ -156,11 +164,13 @@
           splatMesh.worldModifier = brushDyno(
             brushEnabled,
             eraseEnabled,
+            undoEnabled,
             brushRadius, 
             brushDepth,
             brushOrigin, 
             brushDirection, 
             brushColor,
+            originalRgba,
           );
           splatMesh.splatRgba = new RgbaArray().fromPackedSplats({
             packedSplats: splatMesh.packedSplats,
@@ -212,10 +222,8 @@
       }
       // Extract filename for export
       currentFileName = url.split("/").pop().split("?")[0].split(".")[0] || "painted-splat";
-      
       // Create an empty RgbaArray that will be populated after the mesh loads
       currentSplatMeshOriginalRGBA = new RgbaArray();
-      
       currentSplatMesh = await paintableSplatMesh(
         url,
         PARAMETERS.brushEnabled,
@@ -230,10 +238,16 @@
       );
       currentSplatMesh.quaternion.set(1, 0, 0, 0);
       scene.add(currentSplatMesh);
+
+      // Wait for the mesh to fully load before accessing packed data
+      await currentSplatMesh.initialized;
 
+<<<<<<< HEAD
       // Wait for the mesh to fully load before accessing packed data
       await currentSplatMesh.initialized;
 
+=======
+>>>>>>> 1d58ed6 (Merge new commits from main into v2.0.0:)
       // Extract original RGBA directly from the packed splats
       currentSplatMeshOriginalRGBA = new RgbaArray();
       currentSplatMeshOriginalRGBA.fromPackedSplats({
@@ -522,6 +536,181 @@
       },
     };
 
+    const ioFolder = gui.addFolder("I/O");
+    ioFolder.add(ioOptions, "loadFile").name("Load Splats (SPZ/PLY)");
+    ioFolder.add(ioOptions, "saveToSpz").name("Save Splats (SPZ)");
+    ioFolder.open();
+
+
+    // I/O functionality (load and export)
+    const ioOptions = {
+      filename: currentFileName,
+      maxSh: 0,  // Painted splats don't preserve SH data
+      fractionalBits: 12,
+      loadFile: () => {
+        // Create file input element
+        const input = document.createElement('input');
+        input.type = 'file';
+        input.accept = '.spz,.ply';
+        input.onchange = async (e) => {
+          const file = e.target.files[0];
+          if (!file) return;
+          
+          // Create a blob URL from the file
+          const url = URL.createObjectURL(file);
+          
+          try {
+            await loadSplatFromFile(url);
+            console.log("Loaded file:", file.name);
+            // Update filename for export
+            ioOptions.filename = file.name.split(".")[0] || "painted-splat";
+          } catch (error) {
+            console.error("Error loading file:", error);
+            alert("Failed to load file. Make sure it's a valid SPZ or PLY file.");
+          } finally {
+            // Clean up the object URL
+            URL.revokeObjectURL(url);
+          }
+        };
+        input.click();
+      },
+      saveToSpz: async () => {
+        if (!currentSplatMesh) {
+          console.error("Export failed - currentSplatMesh:", !!currentSplatMesh);
+          alert("No splat mesh loaded for export.");
+          return;
+        }
+        
+        try {
+          console.log("Starting SPZ export with painted changes...");
+          
+          if (!currentSplatMesh.splatRgba) {
+            currentSplatMesh.splatRgba = spark.getRgba({
+              generator: currentSplatMesh,
+              rgba: currentSplatMesh.splatRgba
+            });
+            currentSplatMesh.updateGenerator();
+          }
+          
+          // const rgbaBytes = await spark.readRgba({ 
+          //   generator: currentSplatMesh,
+          //   rgba: currentSplatMesh.splatRgba 
+          // });
+          const rgba = new RgbaArray();
+          rgba.render({
+            renderer,
+            count: currentSplatMesh.packedSplats.numSplats,
+            reader: dyno.dynoBlock({ index: "int" }, { rgba8: "vec4" }, ({ index }) => {
+              const { gsplat } = currentSplatMesh.generator.apply({ index });
+              const { rgba } = dyno.splitGsplat(gsplat).outputs;
+              return { rgba8: rgba };
+            }),
+          })
+          const rgbaBytes = await rgba.read();
+          
+          const ogSplats = currentSplatMesh.packedSplats;
+          const totalSplats = ogSplats.numSplats;
+          console.log("Total splats:", totalSplats);
+          
+          let nonZeroCount = 0;
+          for (let i = 0; i < totalSplats; i++) {
+            const opacity = rgbaBytes[i * 4 + 3] / 255;
+            if (opacity > 0) {
+              nonZeroCount++;
+            }
+          }
+          
+          // Create new PackedSplats with baked changes
+          const newPackedSplats = new PackedSplats({
+            maxSplats: nonZeroCount,
+            splatEncoding: ogSplats.splatEncoding,
+          });
+          
+          // Build splat array from baked RGBA
+          let processedCount = 0;
+          for (let i = 0; i < totalSplats; i++) {
+            const rgbaOffset = i * 4;
+            const opacity = rgbaBytes[rgbaOffset + 3] / 255;
+            
+            // Skip erased splats (zero opacity)
+            if (opacity === 0) {
+              continue;
+            }
+            
+            // Unpack geometry from original packed array
+            const unpacked = unpackSplat(
+              ogSplats.packedArray,
+              i,
+              ogSplats.splatEncoding
+            );
+            
+            // Replace color/opacity with baked painted values
+            unpacked.color.r = rgbaBytes[rgbaOffset + 0] / 255;
+            unpacked.color.g = rgbaBytes[rgbaOffset + 1] / 255;
+            unpacked.color.b = rgbaBytes[rgbaOffset + 2] / 255;
+            unpacked.opacity = opacity;
+            
+            // Push to new PackedSplats
+            newPackedSplats.pushSplat(
+              unpacked.center,
+              unpacked.scales,
+              unpacked.quaternion,
+              unpacked.opacity,
+              unpacked.color
+            );
+            
+            processedCount++;
+          }
+          
+          console.log(`Processed ${processedCount} splats`);
+          
+          // Now export the PackedSplats to SPZ
+          console.log("Creating SPZ writer...");
+          const maxSh = ioOptions.maxSh;
+          const spzWriter = new SpzWriter({
+            numSplats: nonZeroCount,
+            shDegree: maxSh,
+            fractionalBits: ioOptions.fractionalBits,
+            flagAntiAlias: true,
+          });
+          
+          console.log("Writing splats to SPZ...");
+          // Iterate through the new packed array
+          for (let i = 0; i < nonZeroCount; i++) {
+            const unpacked = unpackSplat(
+              newPackedSplats.packedArray,
+              i,
+              newPackedSplats.splatEncoding
+            );
+            
+            spzWriter.setCenter(i, unpacked.center.x, unpacked.center.y, unpacked.center.z);
+            spzWriter.setScale(i, unpacked.scales.x, unpacked.scales.y, unpacked.scales.z);
+            spzWriter.setQuat(i, unpacked.quaternion.x, unpacked.quaternion.y, unpacked.quaternion.z, unpacked.quaternion.w);
+            spzWriter.setAlpha(i, unpacked.opacity);
+            spzWriter.setRgb(i, unpacked.color.r, unpacked.color.g, unpacked.color.b);
+          }
+          const spzBytes = await spzWriter.finalize();
+          if (spzWriter.clippedCount > 0) {
+            console.log(`Clipped ${spzWriter.clippedCount} splats. Consider decreasing fractional-bits from ${ioOptions.fractionalBits} to reduce clipping.`);
+          }
+          
+          console.log("Creating download...");
+          const blob = new Blob([spzBytes], { type: "application/octet-stream" });
+          const url = URL.createObjectURL(blob);
+          const a = document.createElement("a");
+          a.href = url;
+          a.download = ioOptions.filename + "-painted.spz";
+          a.click();
+          URL.revokeObjectURL(url);
+          
+          console.log("SPZ file with painted changes downloaded successfully:", ioOptions.filename + "-painted.spz");
+        } catch (error) {
+          console.error("Error exporting SPZ:", error);
+          console.error("Error stack:", error.stack);
+        }
+      },
+    };
+    
     const ioFolder = gui.addFolder("I/O");
     ioFolder.add(ioOptions, "loadFile").name("Load Splats (SPZ/PLY)");
     ioFolder.add(ioOptions, "saveToSpz").name("Save Splats (SPZ)");
@@ -530,6 +719,7 @@
 
         // Keyboard controls
     window.addEventListener('keydown', (event) => {
+<<<<<<< HEAD
     if (event.key === '1') {
       // Brush mode
       PARAMETERS.brushEnabled.value = true;
@@ -554,6 +744,32 @@
       PARAMETERS.controlsEnabled = false;
       controls.enabled = false;
       showModeOverlay('Undo Mode');
+=======
+      if (event.key === '1') {
+        // Brush mode
+        PARAMETERS.brushEnabled.value = true;
+        PARAMETERS.eraseEnabled.value = false;
+        PARAMETERS.undoEnabled.value = false;
+        PARAMETERS.controlsEnabled = false;
+        controls.enabled = false;
+        showModeOverlay('Paint Mode');
+      } else if (event.key === '2') {
+        // Eraser mode
+        PARAMETERS.brushEnabled.value = false;
+        PARAMETERS.eraseEnabled.value = true;
+        PARAMETERS.undoEnabled.value = false;
+        PARAMETERS.controlsEnabled = false;
+        controls.enabled = false;
+        showModeOverlay('Erase Mode');
+      } else if (event.key === '3') {
+        // Undo mode
+        PARAMETERS.brushEnabled.value = false;
+        PARAMETERS.eraseEnabled.value = false;
+        PARAMETERS.undoEnabled.value = true;
+        PARAMETERS.controlsEnabled = false;
+        controls.enabled = false;
+        showModeOverlay('Undo Mode');
+>>>>>>> 1d58ed6 (Merge new commits from main into v2.0.0:)
       } else if (event.key === 'Escape') {
         // View mode
         PARAMETERS.brushEnabled.value = false;

examples/splat-portal/index.html

@@ -27,5 +27,4 @@
     <div class="legend">WASD + Mouse to move camera • Go through portal to switch between worlds</div>
     <script type="module" src="./main.js"></script>
   </body>
-</html>
-
+</html>

package.json

@@ -65,7 +65,7 @@
     "fflate": "^0.8.2"
   },
   "peerDependencies": {
-    "three": "^0.178.0"
+    "three": "^0.180.0"
   },
   "keywords": ["3d", "three.js", "gsplats", "3dgs", "gaussian", "splats"]
 }

rust/build_rust_wasm.sh

@@ -3,8 +3,7 @@
 WASM_TARGET="$(rustc --print sysroot 2>/dev/null)/lib/rustlib/wasm32-unknown-unknown"
 # Check if "rustup" tool is installed, or the wasm32-unknown-unknown target aleady exists,
 # in which case it's very likely that the required toolchain exists
-if ! [ -d "$WASM_TARGET" ] && (! command -v rustup &> /dev/null); then
-    echo "Rust tool 'rustup' not found! Please install Rust to build."
+if ! [ -d "$WASM_TARGET" ] && (! command -v rustup &> /dev/null); then    echo "Rust tool 'rustup' not found! Please install Rust to build."
     echo "Visit Rust installation page: https://www.rust-lang.org/tools/install"
     echo "- Likely install one-liner: curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh"
     echo "If you're using rust without rustup, make sure that the target 'wasm32-unknown-unknown' is installed"