Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix unit tests

Browse Source
This commit is contained in:
Christof Petig 2024-01-27 21:24:24 +01:00
parent b407a2b186
commit ed7fd13a50
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
common/assets/src/lib.rs
View File

@ -121,6 +121,7 @@ pub trait AssetExt: Sized + Send + Sync + 'static {
} }
/// Extension to AssetExt to combine Ron files from filesystem and plugins /// Extension to AssetExt to combine Ron files from filesystem and plugins
#[cfg(feature = "plugins")]
pub trait AssetCombined: AssetExt { pub trait AssetCombined: AssetExt {
fn load_and_combine( fn load_and_combine(
reloading_cache: AnyCache<'static>, reloading_cache: AnyCache<'static>,
@ -203,6 +204,7 @@ impl<'a> CacheCombined<'a> for AnyCache<'a> {
} }
} }
#[cfg(feature = "plugins")]
impl<T: Compound + Concatenate> AssetCombined for T { impl<T: Compound + Concatenate> AssetCombined for T {
fn load_and_combine( fn load_and_combine(
reloading_cache: AnyCache<'static>, reloading_cache: AnyCache<'static>,
@ -234,9 +236,11 @@ impl Asset for Image {
const EXTENSIONS: &'static [&'static str] = &["png", "jpg"]; const EXTENSIONS: &'static [&'static str] = &["png", "jpg"];
} }
#[cfg(feature = "plugins")]
pub struct DotVoxAsset(pub DotVoxData); pub struct DotVoxAsset(pub DotVoxData);
pub struct DotVoxLoader; pub struct DotVoxLoader;
#[cfg(feature = "plugins")]
impl Loader<DotVoxAsset> for DotVoxLoader { impl Loader<DotVoxAsset> for DotVoxLoader {
fn load(content: Cow<[u8]>, _: &str) -> Result<DotVoxAsset, BoxedError> { fn load(content: Cow<[u8]>, _: &str) -> Result<DotVoxAsset, BoxedError> {
let data = dot_vox::load_bytes(&content).map_err(|err| err.to_owned())?; let data = dot_vox::load_bytes(&content).map_err(|err| err.to_owned())?;
@ -244,6 +248,7 @@ impl Loader<DotVoxAsset> for DotVoxLoader {
} }
} }
#[cfg(feature = "plugins")]
impl Asset for DotVoxAsset { impl Asset for DotVoxAsset {
type Loader = DotVoxLoader; type Loader = DotVoxLoader;