attempting to wire and rewrite

frontend/apps/editor3d/package.json

@@ -41,7 +41,6 @@
     "@remix-run/react": "^2.8.1",
     "@remix-run/router": "^1.15.3",
     "@remix-run/serve": "^2.8.1",
-		"@sparkjsdev/spark": "file:/Users/bt/dev/3rd/spark",
     "@tauri-apps/plugin-http": "^2.4.3",
     "@tweenjs/tween.js": "^18.6.4",
     "@types/lodash": "^4.17.6",

frontend/apps/editor3d/tsconfig.json

@@ -28,6 +28,9 @@
     "noEmit": true
   },
   "references": [
+    {
+      "path": "../../vendor/spark"
+    },
     {
       "path": "../../libs/components/pagination"
     },

frontend/apps/editor3d/vite.config.ts

@@ -21,5 +21,24 @@ export default defineConfig({
     tsconfigPaths(),
   ],
   server: {
+    proxy: {
+      // Example: rewrite /@fs/path/to/wasm/* -> /wasm/*
+      //'^/@fs/.vite/deps/spark_internal_rs_bg.wasm': {
+      '^/@fs/.*vite/deps/.*.wasm$': {
+        target: 'http://localhost:5173',  // or another backend
+        //rewrite: (path) =>
+        //  path.replace(/^\/@fs\/path\/to\/wasm\//, '/Users/bt/dev/storyteller/storyteller-rust/frontend/vendor/spark/rust/spark-internal-rs/pkg/spark_internal_rs_bg.wasm'),
+        rewrite: (path) => {
+          const p = '/@fs/Users/bt/dev/storyteller/storyteller-rust/frontend/vendor/spark/rust/spark-internal-rs/pkg/spark_internal_rs_bg.wasm';
+          console.log('path', p);
+          // http://localhost:5173/@fs/Users/bt/dev/storyteller/storyteller-rust/frontend/apps/editor3d/node_modules/.vite/deps/spark_internal_rs_bg.wasm
+
+          const replaced = path.replace('storyteller-rust/frontend/apps/editor3d/node_modules/.vite/deps/', 'storyteller-rust/frontend/vendor/spark/rust/spark-internal-rs/pkg/');
+          console.log('replaced', replaced);
+          return replaced;
+        },
+        changeOrigin: true,
+      },
+    },
   }
 });

frontend/package.json

@@ -17,7 +17,6 @@
     "@preact/signals-react": "^3.0.1",
     "@radix-ui/react-dialog": "^1.1.14",
     "@remix-run/serve": "^2.15.0",
-    "@sparkjsdev/spark": "file:/Users/bt/dev/3rd/spark",
     "dayjs": "^1.11.10",
     "detect-gpu": "^5.0.38",
     "embla-carousel-react": "^8.6.0",

frontend/tsconfig.base.json

@@ -28,6 +28,9 @@
         // Uncomment if 2D ever gets used
         // "apps/editor2d/app/src/*",
         "apps/editor3d/app/src/*"
+      ],
+      "@sparkjsdev/spark": [
+        "vendor/spark/src/index.ts"
       ]
     }
   }

frontend/vendor/spark/src/PackedSplats.ts

@@ -19,7 +19,7 @@ import {
   outputPackedSplat,
 } from "./dyno";
 import { TPackedSplats, definePackedSplats } from "./dyno/splats";
-import computeUvec4Template from "./shaders/computeUvec4.glsl";
+import computeUvec4Template from "./shaders/computeUvec4.glsl?raw";
 import { getTextureSize, setPackedSplat, unpackSplat } from "./utils";
 
 export type SplatEncoding = {

frontend/vendor/spark/src/Readback.ts

@@ -4,7 +4,7 @@ import { FullScreenQuad } from "three/addons/postprocessing/Pass.js";
 import { SPLAT_TEX_HEIGHT, SPLAT_TEX_WIDTH } from "./defines";
 import { type Dyno, OutputRgba8, dynoBlock } from "./dyno";
 import { DynoProgram, DynoProgramTemplate } from "./dyno/program";
-import computeVec4Template from "./shaders/computeVec4.glsl";
+import computeVec4Template from "./shaders/computeVec4.glsl?raw";
 import { getTextureSize } from "./utils";
 
 // Readback can be used to run a Dyno program that maps an index to a 32-bit

frontend/vendor/spark/src/shaders.ts

@@ -1,8 +1,8 @@
 import * as THREE from "three";
 
-import splatDefines from "./shaders/splatDefines.glsl";
-import splatFragment from "./shaders/splatFragment.glsl";
-import splatVertex from "./shaders/splatVertex.glsl";
+import splatDefines from "./shaders/splatDefines.glsl?raw";
+import splatFragment from "./shaders/splatFragment.glsl?raw";
+import splatVertex from "./shaders/splatVertex.glsl?raw";
 
 let shaders: Record<string, string> | null = null;
 

frontend/vendor/spark/vite.config.ts

@@ -72,7 +72,7 @@ export default defineConfig(({ mode }) => {
       minify: isMinify,
       lib: {
         entry: path.resolve(__dirname, "src/index.ts"),
-        name: "spark",
+        name: "@sparkjsdev/spark",
         formats: ["es", "cjs"],
         fileName: (format) => {
           const base = format === "es" ? "spark.module" : `spark.${format}`;