forestia/bevy
2
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Export anyhow::error for custom asset loaders (#5359)

Browse Source 
If users try to implement a custom asset loader, they must manually import anyhow::error as it's used by the asset loader trait but not exported.

2b93ab5812/examples/asset/custom_asset.rs (L25)

Fixes #3138

Co-authored-by: sark <sarkahn@hotmail.com>
This commit is contained in:
sark 2022-07-20 14:14:30 +00:00
parent 9f906fdc8b
commit 84bf6f611a
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
crates/bevy_asset/src/lib.rs
View File

@ -32,6 +32,7 @@ pub mod prelude {
pub use crate::{AddAsset, AssetEvent, AssetServer, Assets, Handle, HandleUntyped}; pub use crate::{AddAsset, AssetEvent, AssetServer, Assets, Handle, HandleUntyped};
} }
pub use anyhow::Error;
pub use asset_server::*; pub use asset_server::*;
pub use assets::*; pub use assets::*;
pub use bevy_utils::BoxedFuture; pub use bevy_utils::BoxedFuture;

3
crates/bevy_asset/src/loader.rs
View File

@ -2,6 +2,7 @@ use crate::{
path::AssetPath, AssetIo, AssetIoError, AssetMeta, AssetServer, Assets, Handle, HandleId, path::AssetPath, AssetIo, AssetIoError, AssetMeta, AssetServer, Assets, Handle, HandleId,
RefChangeChannel, RefChangeChannel,
}; };
use anyhow::Error;
use anyhow::Result; use anyhow::Result;
use bevy_ecs::system::{Res, ResMut}; use bevy_ecs::system::{Res, ResMut};
use bevy_reflect::{TypeUuid, TypeUuidDynamic}; use bevy_reflect::{TypeUuid, TypeUuidDynamic};
@ -20,7 +21,7 @@ pub trait AssetLoader: Send + Sync + 'static {
&'a self, &'a self,
bytes: &'a [u8], bytes: &'a [u8],
load_context: &'a mut LoadContext, load_context: &'a mut LoadContext,
) -> BoxedFuture<'a, Result<(), anyhow::Error>>; ) -> BoxedFuture<'a, Result<(), Error>>;
/// Returns a list of extensions supported by this asset loader, without the preceding dot. /// Returns a list of extensions supported by this asset loader, without the preceding dot.
fn extensions(&self) -> &[&str]; fn extensions(&self) -> &[&str];

2
examples/asset/custom_asset.rs
View File

@ -22,7 +22,7 @@ impl AssetLoader for CustomAssetLoader {
&'a self, &'a self,
bytes: &'a [u8], bytes: &'a [u8],
load_context: &'a mut LoadContext, load_context: &'a mut LoadContext,
) -> BoxedFuture<'a, Result<(), anyhow::Error>> { ) -> BoxedFuture<'a, Result<(), bevy::asset::Error>> {
Box::pin(async move { Box::pin(async move {
let custom_asset = ron::de::from_bytes::<CustomAsset>(bytes)?; let custom_asset = ron::de::from_bytes::<CustomAsset>(bytes)?;
load_context.set_default_asset(LoadedAsset::new(custom_asset)); load_context.set_default_asset(LoadedAsset::new(custom_asset));