Make config-loaded asset progress more granular

benfrankel · Aug 3, 2024 · cae0c13 · cae0c13
1 parent e87fe9a
commit cae0c13
Show file tree

Hide file tree

Showing 4 changed files with 56 additions and 38 deletions.
diff --git a/src/game/actor.rs b/src/game/actor.rs
@@ -14,6 +14,7 @@ use bevy::math::vec2;
 use bevy::math::vec3;
 use bevy::prelude::*;
 use bevy::utils::HashMap;
+use iyes_progress::prelude::*;
 use serde::Deserialize;
 use serde::Serialize;
 
@@ -71,11 +72,16 @@ impl Config for ActorConfig {
         }
     }
 
-    fn is_ready(&self, asset_server: &AssetServer) -> bool {
-        self.players
-            .values()
-            .chain(self.enemies.values())
-            .all(|x| asset_server.is_loaded_with_dependencies(&x.texture))
+    fn count_progress(&self, asset_server: &AssetServer) -> Progress {
+        let mut progress = true.into();
+
+        for actor in self.players.values().chain(self.enemies.values()) {
+            progress += asset_server
+                .is_loaded_with_dependencies(&actor.texture)
+                .into();
+        }
+
+        progress
     }
 }
 

diff --git a/src/game/card.rs b/src/game/card.rs
@@ -4,6 +4,7 @@ use bevy::prelude::*;
 use bevy::sprite::Anchor;
 use bevy::utils::HashMap;
 use bevy_kira_audio::prelude::*;
+use iyes_progress::prelude::*;
 use serde::Deserialize;
 use serde::Serialize;
 
@@ -72,19 +73,28 @@ impl Config for CardConfig {
         }
     }
 
-    fn is_ready(&self, asset_server: &AssetServer) -> bool {
-        self.card_background_map
-            .values()
-            .all(|x| asset_server.is_loaded_with_dependencies(&x.texture))
-            && self
-                .card_icon_map
-                .values()
-                .all(|x| asset_server.is_loaded_with_dependencies(&x.texture))
-            && self.card_map.values().all(|x| {
-                !x.play_sfx
-                    .as_ref()
-                    .is_some_and(|x| !asset_server.is_loaded_with_dependencies(x))
-            })
+    fn count_progress(&self, asset_server: &AssetServer) -> Progress {
+        let mut progress = true.into();
+
+        for card_bg in self.card_background_map.values() {
+            progress += asset_server
+                .is_loaded_with_dependencies(&card_bg.texture)
+                .into();
+        }
+        for card_icon in self.card_icon_map.values() {
+            progress += asset_server
+                .is_loaded_with_dependencies(&card_icon.texture)
+                .into();
+        }
+        for card in self.card_map.values() {
+            progress += (!card
+                .play_sfx
+                .as_ref()
+                .is_some_and(|x| !asset_server.is_loaded_with_dependencies(x)))
+            .into();
+        }
+
+        progress
     }
 }
 

diff --git a/src/game/combat/projectile.rs b/src/game/combat/projectile.rs
@@ -7,6 +7,7 @@ use bevy::prelude::*;
 use bevy::utils::HashMap;
 use bevy_kira_audio::prelude::*;
 use bevy_tweening::*;
+use iyes_progress::prelude::*;
 use serde::Deserialize;
 use serde::Serialize;
 
@@ -54,15 +55,21 @@ impl Config for ProjectileConfig {
         }
     }
 
-    fn is_ready(&self, asset_server: &AssetServer) -> bool {
-        self.projectiles
-            .values()
-            .all(|x| asset_server.is_loaded_with_dependencies(&x.texture))
-            && self.projectiles.values().all(|x| {
-                !x.spawn_sfx
-                    .as_ref()
-                    .is_some_and(|x| !asset_server.is_loaded_with_dependencies(x))
-            })
+    fn count_progress(&self, asset_server: &AssetServer) -> Progress {
+        let mut progress = true.into();
+
+        for projectile in self.projectiles.values() {
+            progress += asset_server
+                .is_loaded_with_dependencies(&projectile.texture)
+                .into();
+            progress += (!projectile
+                .spawn_sfx
+                .as_ref()
+                .is_some_and(|x| !asset_server.is_loaded_with_dependencies(x)))
+            .into();
+        }
+
+        progress
     }
 }
 

diff --git a/src/util/config.rs b/src/util/config.rs
@@ -19,21 +19,16 @@ pub trait Config: Asset + Serialize + for<'de> Deserialize<'de> {
         let _ = world;
     }
 
-    fn is_ready(&self, asset_server: &AssetServer) -> bool {
+    fn count_progress(&self, asset_server: &AssetServer) -> Progress {
         let _ = asset_server;
-        true
+        true.into()
     }
 
-    fn progress(
-        asset_server: Res<AssetServer>,
-        config_handle: Res<ConfigHandle<Self>>,
-        config: Res<Assets<Self>>,
-    ) -> Progress {
+    fn progress(config: ConfigRef<Self>, asset_server: Res<AssetServer>) -> Progress {
         config
-            .get(&config_handle.0)
-            .map(|x| x.is_ready(&asset_server))
-            .unwrap_or_default()
-            .into()
+            .get()
+            .map(|x| x.count_progress(&asset_server))
+            .unwrap_or(false.into())
     }
 }