Skip to content

Combine spark-worker-rs and spark-rs into one #335

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dmarcos merged 3 commits into from
May 21, 2026
Merged

Combine spark-worker-rs and spark-rs into one #335

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5bb1bbe
Remove OldSpark/Splat classes
mrxz Apr 24, 2026
c8c912e
Remove outdated examples that required OldSparkRenderer
mrxz Apr 24, 2026
f978bb5
Combine spark-worker-rs and spark-rs
mrxz May 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion examples/lod/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
</script>
<script type="module">
import * as THREE from "three";
import { SparkRenderer, OldSparkRenderer, SplatMesh, PackedSplats, SplatLoader, SparkControls, isMobile, SplatEdit, SplatEditSdf, SplatEditSdfType } from "@sparkjsdev/spark";
import { SparkRenderer, SplatMesh, PackedSplats, SplatLoader, SparkControls, isMobile, SplatEdit, SplatEditSdf, SplatEditSdfType } from "@sparkjsdev/spark";
import GUI from "lil-gui";
import { getAssetFileURL } from "../js/get-asset-url.js";

Expand Down
3 changes: 1 addition & 2 deletions examples/lofi/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
<script type="module">
import * as THREE from "three";
import GUI from "lil-gui";
import { SparkRenderer, OldSparkRenderer, PackedSplats, SplatMesh, SparkControls, SparkXr, JOINT_IDS, JOINT_TIPS, dyno, generators, isMobile, utils } from "@sparkjsdev/spark";
import { SparkRenderer, PackedSplats, SplatMesh, SparkControls, SparkXr, JOINT_IDS, JOINT_TIPS, dyno, generators, isMobile, utils } from "@sparkjsdev/spark";
import { WORLDS, getWorldUrl, WORLD_RUSTLE, WORLD_EFFECT } from "./worlds.js";
import { AUDIOS, getAudioUrl } from "./audio.js";
import { shuffleArray } from "./util.js";
Expand Down Expand Up @@ -168,7 +168,6 @@
scene.add(localFrame);

const spark = new SparkRenderer({
// const spark = new OldSparkRenderer({
renderer,
// Lower the splat rendering width to sqrt(4) std devs for more performance
maxStdDev: Math.sqrt(4),
Expand Down
174 changes: 0 additions & 174 deletions examples/splat-texture/index.html
View file
Open in desktop

This file was deleted.

80 changes: 0 additions & 80 deletions examples/stochastic/index.html
View file
Open in desktop

This file was deleted.

15 changes: 9 additions & 6 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"build:wasm": "node rust/build_wasm.js",
"build:watch": "onchange 'src/**/*.{ts,glsl}' -- npm run build:dev",
"build-lod": "cargo run --manifest-path rust/build-lod/Cargo.toml --release --",
"clean": "rm -rf dist/ && rm -rf node_modules/ && rm -rf rust/target/ && rm -rf rust/spark-worker-rs/pkg/ && rm -rf rust/spark-rs/pkg/ && npm run assets:clean",
"clean": "rm -rf dist/ && rm -rf node_modules/ && rm -rf rust/target/ && rm -rf rust/spark-rs/pkg/ && npm run assets:clean",
"dev": "npm run build:dev && (vite --host & npm run build:watch)",
"docs": "node scripts/clean-site-files.js && node scripts/copy-site-files.js && mkdocs serve",
"format": "biome format .",
Expand All @@ -50,15 +50,15 @@
"lefthook": "1.11.12",
"lil-gui": "^0.20.0",
"onchange": "7.1.0",
"spark-rs": "file:rust/spark-rs/pkg",
"stats.js": "^0.17.0",
"three": "^0.180.0",
"ts-node": "10.9.2",
"typescript": "^5.7.3",
"vite": "^6.0.11",
"vite-plugin-arraybuffer": "^0.1.4",
"vite-plugin-dts": "^4.5.4",
"vite-plugin-glsl": "^1.3.1",
"spark-worker-rs": "file:rust/spark-worker-rs/pkg",
"spark-rs": "file:rust/spark-rs/pkg"
"vite-plugin-glsl": "^1.3.1"
},
"dependencies": {
"fflate": "^0.8.2"
Expand Down
1 change: 0 additions & 1 deletion rust/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
target/
spark-worker-rs/pkg/
spark-rs/pkg/
12 changes: 0 additions & 12 deletions rust/Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion rust/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
[workspace]
members = [
"build-lod",
"spark-worker-rs",
"spark-rs",
"spark-lib",
]
Expand Down
Loading
Loading