diff --git a/crates/bevy_asset/src/folder.rs b/crates/bevy_asset/src/folder.rs index a0ae548b72..6fa5e4263b 100644 --- a/crates/bevy_asset/src/folder.rs +++ b/crates/bevy_asset/src/folder.rs @@ -15,5 +15,5 @@ pub struct LoadedFolder { /// The handles of all assets stored in the folder. #[dependency] pub handles: Vec, - pub filter: Option bool + Send + Sync + 'static>> + pub filter: Option bool + Send + Sync + 'static>>, } diff --git a/crates/bevy_asset/src/lib.rs b/crates/bevy_asset/src/lib.rs index fce2e2769a..1859ea8f80 100644 --- a/crates/bevy_asset/src/lib.rs +++ b/crates/bevy_asset/src/lib.rs @@ -1618,7 +1618,7 @@ mod tests { .init_asset::() .register_asset_loader(CoolTextLoader); let asset_server = app.world().resource::().clone(); - let handle: Handle = asset_server.load_folder("text",None); + let handle: Handle = asset_server.load_folder("text", None); gate_opener.open(a_path); gate_opener.open(b_path); gate_opener.open(c_path); diff --git a/examples/2d/texture_atlas.rs b/examples/2d/texture_atlas.rs index 45b6ef380d..8e9b2b819e 100644 --- a/examples/2d/texture_atlas.rs +++ b/examples/2d/texture_atlas.rs @@ -31,7 +31,9 @@ struct RpgSpriteFolder(Handle); fn load_textures(mut commands: Commands, asset_server: Res) { // Load multiple, individual sprites from a folder - commands.insert_resource(RpgSpriteFolder(asset_server.load_folder("textures/rpg",None))); + commands.insert_resource(RpgSpriteFolder( + asset_server.load_folder("textures/rpg", None), + )); } fn check_textures( diff --git a/examples/README.md b/examples/README.md index bccadd438e..3d0cfd97c6 100644 --- a/examples/README.md +++ b/examples/README.md @@ -254,6 +254,7 @@ Example | Description [Custom Asset IO](../examples/asset/custom_asset_reader.rs) | Implements a custom AssetReader [Embedded Asset](../examples/asset/embedded_asset.rs) | Embed an asset in the application binary and load it [Extra asset source](../examples/asset/extra_source.rs) | Load an asset from a non-standard asset source +[Folder Filter](../examples/asset/folder_filter.rs) | Load Folder With Filter [Hot Reloading of Assets](../examples/asset/hot_asset_reloading.rs) | Demonstrates automatic reloading of assets when modified on disk [Multi-asset synchronization](../examples/asset/multi_asset_sync.rs) | Demonstrates how to wait for multiple assets to be loaded. [Repeated texture configuration](../examples/asset/repeated_texture.rs) | How to configure the texture to repeat instead of the default clamp to edges diff --git a/examples/asset/asset_loading.rs b/examples/asset/asset_loading.rs index cecbb28845..5e53be3724 100644 --- a/examples/asset/asset_loading.rs +++ b/examples/asset/asset_loading.rs @@ -52,7 +52,7 @@ fn setup( // to load. // If you want to keep the assets in the folder alive, make sure you store the returned handle // somewhere. - let _loaded_folder: Handle = asset_server.load_folder("models/torus",None); + let _loaded_folder: Handle = asset_server.load_folder("models/torus", None); // If you want a handle to a specific asset in a loaded folder, the easiest way to get one is to call load. // It will _not_ be loaded a second time. diff --git a/examples/asset/folder_filter.rs b/examples/asset/folder_filter.rs index e199a06957..4e7eed052c 100644 --- a/examples/asset/folder_filter.rs +++ b/examples/asset/folder_filter.rs @@ -1,5 +1,6 @@ //! In this example we generate four texture atlases (sprite sheets) from a folder containing -//! individual sprites. +//! individual sprites.But the folder containing waste files called "waste.txt" +//! So we use filter to ingrone the waste files //! //! The texture atlases are generated with different padding and sampling to demonstrate the //! effect of these settings, and how bleeding issues can be resolved by padding the sprites. @@ -35,11 +36,11 @@ fn load_textures(mut commands: Commands, asset_server: Res) { // Load multiple, individual sprites from a folder commands.insert_resource(RpgSpriteFolder(asset_server.load_folder( "textures/rpg_with_waste", - Some(Arc::new(|path,is_dir| { - let a = is_dir || path.extension().unwrap_or_default() == "png"; - info!("is_dir:{},path:{:?} {}",is_dir,path,a); - a - })), + Some(Arc::new(|path, is_dir| { + let need = is_dir || path.extension().unwrap_or_default() == "png"; + info!("is_dir:{} path:{:?} need:{}", is_dir, path, need); + need + })), ))); }