fix: make web builds load assets relative to the path the game is hos…

…ted under. (#235)
fishfolk · Oct 15, 2023 · 155636c · 155636c
1 parent 2335ab6
commit 155636c
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 84 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/framework_crates/bones_bevy_renderer/Cargo.toml b/framework_crates/bones_bevy_renderer/Cargo.toml
@@ -33,4 +33,4 @@ version          = "0.11"
 directories = "5.0"
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]
-web-sys = { version = "0.3", features = ["Window", "Storage"] }
+web-sys = { version = "0.3", features = ["Window", "Storage", "Location"] }
diff --git a/framework_crates/bones_bevy_renderer/src/lib.rs b/framework_crates/bones_bevy_renderer/src/lib.rs
@@ -237,7 +237,10 @@ impl BonesBevyRenderer {
             }
             #[cfg(target_arch = "wasm32")]
             {
-                let io = bones::WebAssetIo::new("/assets/");
+                let window = web_sys::window().unwrap();
+                let path = window.location().pathname().unwrap();
+                let base = path.rsplit_once('/').map(|x| x.0).unwrap_or(&path);
+                let io = bones::WebAssetIo::new(&format!("{base}/assets"));
                 asset_server.set_io(io);
             }
 

diff --git a/framework_crates/bones_schema/Cargo.toml b/framework_crates/bones_schema/Cargo.toml
@@ -37,4 +37,3 @@ required-features = ["glam"]
 
 [dev-dependencies]
 serde_yaml = "0.9"
-trybuild   = "1.0"
diff --git a/framework_crates/bones_schema/tests/trybuild.rs b/framework_crates/bones_schema/tests/trybuild.rs
diff --git a/framework_crates/bones_schema/tests/trybuild_fail/schema_ptr.rs b/framework_crates/bones_schema/tests/trybuild_fail/schema_ptr.rs
diff --git a/framework_crates/bones_schema/tests/trybuild_fail/schema_ptr.stderr b/framework_crates/bones_schema/tests/trybuild_fail/schema_ptr.stderr
diff --git a/rust-toolchain b/rust-toolchain
@@ -1 +1 @@
-1.71
+1.73