diff --git a/framework_crates/bones_bevy_renderer/src/lib.rs b/framework_crates/bones_bevy_renderer/src/lib.rs index bdd2c418c..91eb8efa3 100644 --- a/framework_crates/bones_bevy_renderer/src/lib.rs +++ b/framework_crates/bones_bevy_renderer/src/lib.rs @@ -34,7 +34,7 @@ use bevy::{ tasks::IoTaskPool, utils::Instant, }; -use std::path::PathBuf; +use std::path::{Path, PathBuf}; /// Renderer for [`bones_framework`] [`Game`][bones::Game]s using Bevy. pub struct BonesBevyRenderer { @@ -164,7 +164,7 @@ impl BonesBevyRenderer { if let Some(mut asset_server) = self.game.shared_resource_mut::() { asset_server.set_game_version(self.game_version); - asset_server.set_io(asset_io(self.asset_dir, self.packs_dir)); + asset_server.set_io(asset_io(&self.asset_dir, &self.packs_dir)); if self.preload { // Spawn the task to load game assets @@ -272,13 +272,15 @@ fn assets_not_loaded(game: Res) -> bool { } /// A [`bones::AssetIo`] configured for web and local file access -pub fn asset_io(asset_dir: PathBuf, packs_dir: PathBuf) -> impl bones::AssetIo + 'static { +pub fn asset_io(asset_dir: &Path, packs_dir: &Path) -> impl bones::AssetIo + 'static { #[cfg(not(target_arch = "wasm32"))] { - bones::FileAssetIo::new(&asset_dir, &packs_dir) + bones::FileAssetIo::new(asset_dir, packs_dir) } #[cfg(target_arch = "wasm32")] { + let _ = asset_dir; + let _ = packs_dir; let window = web_sys::window().unwrap(); let path = window.location().pathname().unwrap(); let base = path.rsplit_once('/').map(|x| x.0).unwrap_or(&path); diff --git a/framework_crates/bones_bevy_renderer/src/storage.rs b/framework_crates/bones_bevy_renderer/src/storage.rs index b9c08cbeb..a2ef216d9 100644 --- a/framework_crates/bones_bevy_renderer/src/storage.rs +++ b/framework_crates/bones_bevy_renderer/src/storage.rs @@ -1,7 +1,6 @@ use bevy::log::error; use bones_framework::prelude::*; use serde::{de::Visitor, Deserialize, Serialize}; -use std::path::PathBuf; #[cfg(target_arch = "wasm32")] pub use wasm::StorageBackend; @@ -55,7 +54,7 @@ mod native { use super::*; pub struct StorageBackend { - storage_path: PathBuf, + storage_path: std::path::PathBuf, } impl StorageBackend {