Update assets_manager to 0.12

a1phyr · Jul 3, 2024 · c29bfa1 · c29bfa1
1 parent 9b4a04f
commit c29bfa1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -20,7 +20,7 @@ ahash = ["assets_manager/ahash"]
 hot-reloading = ["assets_manager/hot-reloading"]
 
 [dependencies]
-assets_manager = { version = "0.11", default-features = false, features = ["utils", "parking_lot", "zip", "image"] }
+assets_manager = { version = "0.12", default-features = false, features = ["utils", "parking_lot", "zip"] }
 ggez = { version = "0.9.0", default-features = false, features = ["audio"] }
 
 directories = "5.0"

diff --git a/src/assets.rs b/src/assets.rs
@@ -1,6 +1,4 @@
-use assets_manager::{
-    asset::Storable, loader, AnyCache, Asset, BoxedError, OnceInitCell, ReloadWatcher,
-};
+use assets_manager::{loader, AnyCache, Asset, BoxedError, OnceInitCell, ReloadWatcher};
 use parking_lot::Mutex;
 use std::{borrow::Cow, io};
 
@@ -22,8 +20,6 @@ fn not_found_error() -> ggez::GameError {
 #[derive(Debug, Clone, Copy)]
 struct GgezValue<T>(T);
 
-impl<T: Send + Sync + 'static> Storable for GgezValue<T> {}
-
 fn default_load_fast<T: GgezAsset + Clone>(
     cache: AnyCache,
     context: &mut ggez::Context,
@@ -190,8 +186,8 @@ impl Asset for ImageAsset {
 }
 
 impl loader::Loader<ImageAsset> for GgezLoader {
-    fn load(content: Cow<[u8]>, ext: &str) -> Result<ImageAsset, BoxedError> {
-        let img: image::DynamicImage = loader::ImageLoader::load(content, ext)?;
+    fn load(content: Cow<[u8]>, _: &str) -> Result<ImageAsset, BoxedError> {
+        let img: image::DynamicImage = image::load_from_memory(&content)?;
         let img = img.to_rgba8();
 
         Ok(ImageAsset(img))