From 03de3620d3f1d90609ca87dcc93510907323a7d9 Mon Sep 17 00:00:00 2001 From: Schell Carl Scivally Date: Mon, 1 Sep 2025 09:34:46 +1200 Subject: [PATCH] fixes for renderling fix/wasm --- .gitignore | 1 + Cargo.lock | 7 +- Cargo.toml | 3 +- Trunk.toml | 1 + dist/index.html | 6 +- dist/renderling_test-532412d1d6ce387b.js | 2306 ----------------- dist/renderling_test-532412d1d6ce387b_bg.wasm | Bin 10642248 -> 0 bytes src/lib.rs | 516 ++-- 8 files changed, 340 insertions(+), 2500 deletions(-) create mode 100644 Trunk.toml delete mode 100644 dist/renderling_test-532412d1d6ce387b.js delete mode 100644 dist/renderling_test-532412d1d6ce387b_bg.wasm diff --git a/.gitignore b/.gitignore index ea8c4bf..4f96631 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /target +/dist diff --git a/Cargo.lock b/Cargo.lock index 202987f..386a39f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1549,10 +1549,13 @@ checksum = "f5e54036fe321fd421e10d732f155734c4e4afd610dd556d9a82833ab3ee0bed" [[package]] name = "loading-bytes" version = "0.1.1" +source = "git+https://github.com/schell/renderling.git?branch=fix%2Fwasm#086aae5b432b96655558223a671b6eb1deedeca5" dependencies = [ "async-fs", "js-sys", "send_wrapper", + "serde", + "serde_json", "snafu 0.8.8", "wasm-bindgen", "wasm-bindgen-futures", @@ -2635,6 +2638,7 @@ checksum = "19b30a45b0cd0bcca8037f3d0dc3421eaf95327a17cad11964fb8179b4fc4832" [[package]] name = "renderling" version = "0.6.0" +source = "git+https://github.com/schell/renderling.git?branch=fix%2Fwasm#086aae5b432b96655558223a671b6eb1deedeca5" dependencies = [ "async-channel 1.9.0", "bytemuck", @@ -2643,7 +2647,6 @@ dependencies = [ "crabslab", "crunch", "dagga", - "futures-lite 1.13.0", "glam 0.30.5", "gltf", "glyph_brush", @@ -2663,6 +2666,7 @@ dependencies = [ "similarity", "snafu 0.8.8", "spirv-std 0.9.0 (git+https://github.com/LegNeato/rust-gpu.git?rev=425328a)", + "wasm-bindgen", "wgpu", "winit", ] @@ -2670,6 +2674,7 @@ dependencies = [ [[package]] name = "renderling_build" version = "0.1.0" +source = "git+https://github.com/schell/renderling.git?branch=fix%2Fwasm#086aae5b432b96655558223a671b6eb1deedeca5" dependencies = [ "log", "naga", diff --git a/Cargo.toml b/Cargo.toml index 84fe52d..31f6789 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -12,8 +12,7 @@ name = "renderling_test_bin" path = "src/main.rs" [dependencies] -# renderling = { git = "https://github.com/schell/renderling", features = ["gltf", "winit"], branch = "fix/wasm" } -renderling = { path = "deps/renderling/crates/renderling", features = ["gltf", "winit"] } +renderling = { git = "https://github.com/schell/renderling.git", features = ["wasm"], branch = "fix/wasm" } wasm-bindgen = "0.2" console_error_panic_hook = "0.1" diff --git a/Trunk.toml b/Trunk.toml new file mode 100644 index 0000000..3a8e312 --- /dev/null +++ b/Trunk.toml @@ -0,0 +1 @@ +target = "index.html" diff --git a/dist/index.html b/dist/index.html index dbcda67..464b4be 100644 --- a/dist/index.html +++ b/dist/index.html @@ -5,8 +5,8 @@ Renderling + Winit (WASM) - +