From 419e231984ae2ce5577d1b2e06de4aa02d16e501 Mon Sep 17 00:00:00 2001 From: Galdormin Date: Sun, 1 Feb 2026 12:58:24 +0100 Subject: [PATCH 1/2] update App:register_asset_root for non wasm32 with FileAssetReader::get_base_path --- crates/bevy_plugin/src/plugin.rs | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/crates/bevy_plugin/src/plugin.rs b/crates/bevy_plugin/src/plugin.rs index 13ed7dff..14c1bff0 100644 --- a/crates/bevy_plugin/src/plugin.rs +++ b/crates/bevy_plugin/src/plugin.rs @@ -1,5 +1,7 @@ use crate::prelude::*; use crate::project::{LoadYarnProjectEvent, WatchingForChanges}; +#[cfg(not(target_arch = "wasm32"))] +use bevy::asset::io::file::FileAssetReader; use bevy::prelude::*; use std::path::PathBuf; pub use yarn_file_source::YarnFileSource; @@ -244,12 +246,21 @@ impl YarnApp for App { self.insert_resource(WatchingForChanges(watching_for_changes)) } + #[cfg(target_arch = "wasm32")] fn register_asset_root(&mut self) -> &mut Self { let asset_plugin = get_asset_plugin(self); let path_str = asset_plugin.file_path.clone(); let path = PathBuf::from(path_str); self.insert_resource(AssetRoot(path)) } + + #[cfg(not(target_arch = "wasm32"))] + fn register_asset_root(&mut self) -> &mut Self { + let asset_plugin = get_asset_plugin(self); + let mut path = FileAssetReader::get_base_path(); + path.push(asset_plugin.file_path.clone()); + self.insert_resource(AssetRoot(path)) + } } fn get_asset_plugin(app: &App) -> &AssetPlugin { From 99730311cca7c53ef8a5f0f6d824c88331616317 Mon Sep 17 00:00:00 2001 From: Galdormin Date: Sun, 1 Feb 2026 20:59:07 +0100 Subject: [PATCH 2/2] update to single function with conditional lines --- crates/bevy_plugin/src/plugin.rs | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/crates/bevy_plugin/src/plugin.rs b/crates/bevy_plugin/src/plugin.rs index 14c1bff0..06e42e19 100644 --- a/crates/bevy_plugin/src/plugin.rs +++ b/crates/bevy_plugin/src/plugin.rs @@ -246,19 +246,15 @@ impl YarnApp for App { self.insert_resource(WatchingForChanges(watching_for_changes)) } - #[cfg(target_arch = "wasm32")] fn register_asset_root(&mut self) -> &mut Self { let asset_plugin = get_asset_plugin(self); let path_str = asset_plugin.file_path.clone(); + + #[cfg(not(target_arch = "wasm32"))] + let path = FileAssetReader::get_base_path().join(path_str); + #[cfg(target_arch = "wasm32")] let path = PathBuf::from(path_str); - self.insert_resource(AssetRoot(path)) - } - #[cfg(not(target_arch = "wasm32"))] - fn register_asset_root(&mut self) -> &mut Self { - let asset_plugin = get_asset_plugin(self); - let mut path = FileAssetReader::get_base_path(); - path.push(asset_plugin.file_path.clone()); self.insert_resource(AssetRoot(path)) } }