Sample color model

Cargo.toml

@@ -4,6 +4,8 @@ members = [
     "crates/wgsparkl-testbed3d",
     "crates/wgsparkl2d",
     "crates/wgsparkl3d",
+    "examples3d",
+    "examples2d",
 ]
 resolver = "2"
 
@@ -23,15 +25,31 @@ rust.unexpected_cfgs = { level = "warn", check-cfg = [
 ] }
 
 [patch.crates-io]
-parry2d = { path = "../parry/crates/parry2d" }
-parry3d = { path = "../parry/crates/parry3d" }
-encase = { path = "../encase" }
-wgcore = { path = "../wgmath/crates/wgcore" }
-wgebra = { path = "../wgmath/crates/wgebra" }
-wgparry2d = { path = "../wgmath/crates/wgparry/crates/wgparry2d" }
-wgparry3d = { path = "../wgmath/crates/wgparry/crates/wgparry3d" }
-wgrapier2d = { path = "../wgmath/crates/wgrapier/crates/wgrapier2d" }
-wgrapier3d = { path = "../wgmath/crates/wgrapier/crates/wgrapier3d" }
+# parry2d = { path = "../parry/crates/parry2d" }
+# parry3d = { path = "../parry/crates/parry3d" }
+# encase = { path = "../encase" }
+# wgcore = { path = "../wgmath/crates/wgcore" }
+# wgebra = { path = "../wgmath/crates/wgebra" }
+# wgparry2d = { path = "../wgmath/crates/wgparry/crates/wgparry2d" }
+# wgparry3d = { path = "../wgmath/crates/wgparry/crates/wgparry3d" }
+# wgrapier2d = { path = "../wgmath/crates/wgrapier/crates/wgrapier2d" }
+# wgrapier3d = { path = "../wgmath/crates/wgrapier/crates/wgrapier3d" }
+
+parry2d = { git = "https://github.com/dimforge/parry.git", rev = "407fb449504dde7ba0a3d80a8de7e37ac991a77a" }
+parry3d = { git = "https://github.com/dimforge/parry.git", rev = "407fb449504dde7ba0a3d80a8de7e37ac991a77a" }
+encase = { git = "https://github.com/sebcrozet/encase.git", rev = "6755c1414c225cbeac9fde1ff9394b70d3b05404" }
+# wgcore = { git = "https://github.com/dimforge/wgmath.git", rev = "32b54c802be6040c5f003e7d3def4a33e4730d92" }
+wgcore = { git = "https://github.com/dimforge/wgmath.git", branch = "wgml-chat" }
+wgcore-derive = { git = "https://github.com/dimforge/wgmath.git", branch = "wgml-chat" }
+wgebra = { git = "https://github.com/dimforge/wgmath.git", branch = "wgml-chat" }
+# wgparry2d = { git = "https://github.com/dimforge/wgmath.git", rev = "32b54c802be6040c5f003e7d3def4a33e4730d92" }
+wgparry3d = { git = "https://github.com/dimforge/wgmath.git", branch = "wgml-chat" }
+# wgrapier2d = { git = "https://github.com/dimforge/wgmath.git", rev = "32b54c802be6040c5f003e7d3def4a33e4730d92" }
+wgrapier3d = { git = "https://github.com/dimforge/wgmath.git", branch = "wgml-chat" }
+rapier3d = { git = "https://github.com/vrixyz/rapier.git", branch = "uber_physics_context" }
 
 [profile.release]
 opt-level = 'z'
+
+[profile.dev]
+opt-level = 1

build_wasm.sh

@@ -1,11 +1,11 @@
 #!/bin/sh
 
-cargo build --example elasticity2 --release --target wasm32-unknown-unknown --features dim2
-cargo build --example elasticity3 --release --target wasm32-unknown-unknown --features dim3
-wasm-bindgen --no-typescript --target web --out-dir dist2d --out-name elasticity2 ./target/wasm32-unknown-unknown/release/examples/elasticity2.wasm
-wasm-bindgen --no-typescript --target web --out-dir dist3d --out-name elasticity3 ./target/wasm32-unknown-unknown/release/examples/elasticity3.wasm
-wasm-opt -Oz -o ./dist2d/opt.wasm ./dist2d/elasticity2_bg.wasm && mv ./dist2d/opt.wasm ./dist2d/elasticity2_bg.wasm
-wasm-opt -Oz -o ./dist3d/opt.wasm ./dist3d/elasticity3_bg.wasm && mv ./dist3d/opt.wasm ./dist3d/elasticity3_bg.wasm
+# cargo build -p wgsparkl-examples-2d --release --target wasm32-unknown-unknown
+cargo build -p wgsparkl-examples-3d --release --target wasm32-unknown-unknown
+# wasm-bindgen --no-typescript --target web --out-dir dist2d --out-name wgsparkl-examples-2d ./target/wasm32-unknown-unknown/release/wgsparkl-examples-2d.wasm
+wasm-bindgen --no-typescript --target web --out-dir dist3d --out-name wgsparkl-examples-3d ./target/wasm32-unknown-unknown/release/wgsparkl-examples-3d.wasm
+# wasm-opt -Oz -o ./dist2d/opt.wasm ./dist2d/wgsparkl-examples-2d_bg.wasm && mv ./dist2d/opt.wasm ./dist2d/wgsparkl-examples-2d_bg.wasm
+wasm-opt -Oz -o ./dist3d/opt.wasm ./dist3d/wgsparkl-examples-3d_bg.wasm && mv ./dist3d/opt.wasm ./dist3d/wgsparkl-examples-3d_bg.wasm
 
-brotli ./dist2d/elasticity2_bg.wasm && mv ./dist2d/elasticity2_bg.wasm.br ./dist2d/elasticity2_bg.wasm
-brotli ./dist3d/elasticity3_bg.wasm && mv ./dist3d/elasticity3_bg.wasm.br ./dist3d/elasticity3_bg.wasm
+# brotli ./dist2d/wgsparkl-examples-2d_bg.wasm && mv ./dist2d/wgsparkl-examples-2d_bg.wasm.br ./dist2d/wgsparkl-examples-2d_bg.wasm
+brotli ./dist3d/wgsparkl-examples-3d_bg.wasm && mv ./dist3d/wgsparkl-examples-3d_bg.wasm.br ./dist3d/wgsparkl-examples-3d_bg.wasm

crates/wgsparkl-testbed2d/Cargo.toml

@@ -13,8 +13,8 @@ path = "../../src_testbed/lib.rs"
 required-features = ["dim2"]
 
 [features]
+default = ["dim2"]
 dim2 = []
-default_features = ["dim2"]
 
 [dependencies]
 nalgebra = { workspace = true, features = ["rand"] }
@@ -31,10 +31,17 @@ futures-test = "0.3"
 serial_test = "3"
 approx = "0.5"
 async-std = { version = "1", features = ["attributes"] }
-bevy = { version = "0.15.0", features = ["shader_format_glsl", "shader_format_spirv", "webgpu"] }
+bevy = { version = "0.15.0", features = [
+    "shader_format_glsl",
+    "shader_format_spirv",
+    "webgpu",
+] }
 #bevy_wasm_window_resize = "0.4"
 bevy_editor_cam = "0.5"
-bevy_egui = { version = "0.31", default-features = false, features = ["default_fonts", "render"] }
+bevy_egui = { version = "0.31", default-features = false, features = [
+    "default_fonts",
+    "render",
+] }
 bevy_sprite = "0.15"
 wgsparkl2d = { path = "../wgsparkl2d" }
-futures = "0.3"
+futures = "0.3"

crates/wgsparkl-testbed3d/Cargo.toml

@@ -13,8 +13,8 @@ path = "../../src_testbed/lib.rs"
 required-features = ["dim3"]
 
 [features]
+default = ["dim3"]
 dim3 = []
-default_features = ["dim3"]
 
 [dependencies]
 nalgebra = { workspace = true, features = ["rand"] }
@@ -31,10 +31,17 @@ futures-test = "0.3"
 serial_test = "3"
 approx = "0.5"
 async-std = { version = "1", features = ["attributes"] }
-bevy = { version = "0.15.0", features = ["shader_format_glsl", "shader_format_spirv", "webgpu"] }
+bevy = { version = "0.15.0", features = [
+    "shader_format_glsl",
+    "shader_format_spirv",
+    "webgpu",
+] }
 bevy_editor_cam = "0.5"
 #bevy_mod_picking = { version = "0.20", default-features = false }
 #bevy_wasm_window_resize = "0.4"
-bevy_egui = { version = "0.31", default-features = false, features = ["default_fonts", "render"] }
+bevy_egui = { version = "0.31", default-features = false, features = [
+    "default_fonts",
+    "render",
+] }
 wgsparkl3d = { path = "../wgsparkl3d" }
 futures = "0.3"

crates/wgsparkl2d/Cargo.toml

@@ -34,12 +34,3 @@ rapier2d = "0.23"
 # For wasm?
 getrandom = { version = "0.3.1", features = ["wasm_js"] }
 uuid = { version = "1", features = ["js"] }
-
-[dev-dependencies]
-nalgebra = { version = "0.33", features = ["rand"] }
-futures-test = "0.3"
-serial_test = "3"
-approx = "0.5"
-async-std = { version = "1", features = ["attributes"] }
-bevy = { version = "0.15.0", features = ["shader_format_glsl", "shader_format_spirv", "webgpu"] }
-wgsparkl_testbed2d = { path = "../wgsparkl-testbed2d", features = ["dim2"] }

crates/wgsparkl3d/Cargo.toml

@@ -15,6 +15,9 @@ required-features = ["dim3"]
 [features]
 default = ["dim3"]
 dim3 = []
+load_gltf = ["obj-rs", "image"]
+load_obj = ["gltf", "image"]
+load_bevy = ["bevy", "image"]
 
 [dependencies]
 nalgebra = { workspace = true }
@@ -33,11 +36,19 @@ wgrapier3d = "0.2"
 # TODO: make rapier optional?
 rapier3d = "0.23"
 
-[dev-dependencies]
-nalgebra = { version = "0.33", features = ["rand"] }
-futures-test = "0.3"
-serial_test = "3"
-approx = "0.5"
-async-std = { version = "1", features = ["attributes"] }
-bevy = { version = "0.15.0", features = ["shader_format_glsl", "shader_format_spirv", "webgpu"] }
-wgsparkl_testbed3d = { path = "../wgsparkl-testbed3d" }
+# for loaders
+# TODO: slim bevy features
+bevy = { version = "0.15.0", features = [
+    "shader_format_glsl",
+    "shader_format_spirv",
+    "webgpu",
+    "jpeg",
+], optional = true }
+gltf = { version = "1.3", features = [
+    "KHR_materials_pbrSpecularGlossiness",
+], optional = true }
+obj-rs = { version = "0.7", default-features = false, optional = true }
+image = { version = "0.25", optional = true }
+
+[package.metadata.docs.rs]
+cargo-args = ["-Zunstable-options", "-Zrustdoc-scrape-examples"]

dist2d/index.html

@@ -3,7 +3,7 @@
 
 <body style="margin: 0px;">
     <script type="module">
-        import init from './elasticity2.js'
+        import init from './wgsparkl-examples-2d.js'
 
         init().catch((error) => {
             if (!error.message.startsWith("Using exceptions for control flow, don't mind me. This isn't actually an error!")) {

dist3d/index.html

@@ -3,7 +3,7 @@
 
 <body style="margin: 0px;">
     <script type="module">
-        import init from './elasticity3.js'
+        import init from './wgsparkl-examples-3d.js'
 
         init().catch((error) => {
             if (!error.message.startsWith("Using exceptions for control flow, don't mind me. This isn't actually an error!")) {

examples2d/Cargo.toml

@@ -0,0 +1,24 @@
+[package]
+name = "wgsparkl-examples-2d"
+version = "0.1.0"
+license = "Apache-2.0 OR Custom"
+edition = "2021"
+
+[dependencies]
+nalgebra = { version = "0.33", features = ["rand"] }
+futures-test = "0.3"
+serial_test = "3"
+approx = "0.5"
+async-std = { version = "1", features = ["attributes"] }
+bevy = { version = "0.15.0", features = [
+    "shader_format_glsl",
+    "shader_format_spirv",
+    "webgpu",
+    "jpeg",
+] }
+wgsparkl_testbed2d = { path = "../crates/wgsparkl-testbed2d" }
+wgsparkl2d = { path = "../crates/wgsparkl2d" }
+rapier3d = "0.23"
+
+[lints]
+workspace = true

crates/wgsparkl2d/examples/elastic_cut2.rs → examples2d/src/elastic_cut2.rs

@@ -22,10 +22,10 @@ fn main() {
 }
 
 pub fn elastic_cut_demo(
-    mut commands: Commands,
-    device: Res<RenderDevice>,
-    mut app_state: ResMut<AppState>,
-) {
+    device: RenderDevice,
+    app_state: &mut AppState,
+    _callbacks: &mut Callbacks,
+) -> PhysicsContext {
     let mut rapier_data = RapierData::default();
     let device = device.wgpu_device();
 
@@ -48,6 +48,7 @@ pub fn elastic_cut_demo(
                     phase: 1.0,
                     max_stretch: f32::MAX,
                 }),
+                color: None,
             });
         }
     }
@@ -118,9 +119,9 @@ pub fn elastic_cut_demo(
         cell_width,
         60_000,
     );
-    commands.insert_resource(PhysicsContext {
+    PhysicsContext {
         data,
         rapier_data,
         particles,
-    });
+    }
 }