Most of the update for Bevy 0.12

Stuck on a weird Animation error...

Cargo.toml

@@ -4,11 +4,21 @@ version = "0.1.0"
 edition = "2021"
 build = "build.rs"
 
-[dependencies]
-bevy_fmod = { version = "0.3", features = ["live-update"] }
-bevy = { version = "0.11", features = ["jpeg", "hdr"] }
-serde = "1"
-toml = { version = "0.8", features = ["parse"] }
+[dependencies.bevy]
+features = ["jpeg", "hdr", "file_watcher"]
+version = "0.12"
+
+[dependencies.bevy_fmod]
+features = ["live-update"]
+git = "https://github.com/Salzian/bevy_fmod.git"
+branch = "update-0.12"
+
+[dependencies.serde]
+version = "1"
+
+[dependencies.toml]
+version = "0.8"
+features = ["parse"]
 
 [profile.dev]
 opt-level = 3

src/audio.rs

@@ -3,14 +3,16 @@
 ///
 use crate::prelude::*;
 use bevy::{
-    asset::{AssetLoader, LoadContext, LoadedAsset},
+    asset::{io::Reader, AssetLoader, AsyncReadExt, LoadContext},
     prelude::*,
     reflect::{TypePath, TypeUuid},
+    utils::thiserror,
     utils::BoxedFuture,
 };
 use bevy_fmod::prelude::AudioSource;
 use bevy_fmod::prelude::*;
 use serde::Deserialize;
+use thiserror::Error;
 
 pub(crate) struct AudioPlugin;
 
@@ -28,8 +30,8 @@ impl Plugin for AudioPlugin {
                 "./assets/audio/Martian Chess Audio/Build/Desktop/SFX.bank",
             ],
         });
-        app.add_asset::<AudioSettings>()
-            .init_asset_loader::<AudioSettingsLoader>();
+        app.register_asset_loader(AudioSettingsLoader)
+            .init_asset::<AudioSettings>();
 
         app.add_systems(OnEnter(GameState::Menu), play_background);
         app.add_systems(
@@ -85,7 +87,7 @@ fn audio_trigger(
         .expect("Load audio tweakfile");
     debug!("Audio tweaks: {:?}", tweak);
     let state = display_state.get();
-    events.iter().for_each(|event| {
+    events.read().for_each(|event| {
         let aud = match event {
             AudioEvent::MainMusic | AudioEvent::StopMainMusic => tweak.music.main.clone(),
             AudioEvent::MenuSelect => tweak.menu.select.clone(),
@@ -136,9 +138,9 @@ fn audio_trigger(
     });
 }
 
-#[derive(Debug, Deserialize, TypeUuid, TypePath)]
+#[derive(Debug, Deserialize, TypeUuid, TypePath, Asset)]
 #[uuid = "5c7a67ee-56a9-4fe9-9e91-1a709fbc3cf0"]
-pub(crate) struct AudioSettings {
+pub struct AudioSettings {
     #[serde(default)]
     display2d: PlaySettings,
     #[serde(default)]
@@ -173,20 +175,36 @@ struct PlaySettings {
     invalid: String,
 }
 
+#[derive(Debug, Error)]
+pub enum AudioSettingsLoadError {
+    #[error("Could not read audio setting: {0}")]
+    LoadError(#[from] std::io::Error),
+    #[error("Could not load audio setting: {0}")]
+    ReadError(#[from] std::str::Utf8Error),
+    #[error("Could not parse audio settings: {0}")]
+    ParseError(#[from] toml::de::Error),
+}
+
 #[derive(Default)]
 pub struct AudioSettingsLoader;
 
 impl AssetLoader for AudioSettingsLoader {
+    type Asset = AudioSettings;
+    type Settings = ();
+    type Error = AudioSettingsLoadError;
+
     fn load<'a>(
         &'a self,
-        bytes: &'a [u8],
-        load_context: &'a mut LoadContext,
-    ) -> BoxedFuture<'a, Result<(), bevy::asset::Error>> {
+        reader: &'a mut Reader,
+        _settings: &'a Self::Settings,
+        _load_context: &'a mut LoadContext,
+    ) -> BoxedFuture<'a, Result<Self::Asset, Self::Error>> {
         Box::pin(async move {
-            let s = std::str::from_utf8(bytes)?;
-            let custom_asset = toml::from_str::<AudioSettings>(s)?;
-            load_context.set_default_asset(LoadedAsset::new(custom_asset));
-            Ok(())
+            let mut bytes = Vec::new();
+            reader.read_to_end(&mut bytes).await?;
+            let s = std::str::from_utf8(bytes.as_slice())?;
+            let custom_asset: AudioSettings = toml::from_str(s)?;
+            Ok(custom_asset)
         })
     }
 

src/credits.rs

@@ -1,10 +1,12 @@
 use std::str::Utf8Error;
 
 use bevy::{
-    asset::{AssetLoader, LoadContext, LoadedAsset},
+    asset::{io::Reader, AssetLoader, AsyncReadExt, LoadContext},
     reflect::{TypePath, TypeUuid},
+    utils::thiserror,
     utils::BoxedFuture,
 };
+use thiserror::Error;
 
 use crate::prelude::*;
 
@@ -12,8 +14,8 @@ pub(crate) struct CreditsPlugin;
 
 impl Plugin for CreditsPlugin {
     fn build(&self, app: &mut App) {
-        app.add_asset::<CreditsText>()
-            .init_asset_loader::<CreditsTextLoader>()
+        app.register_asset_loader(CreditsTextLoader)
+            .init_asset::<CreditsText>()
             .add_systems(Startup, init_credits_ui)
             .add_systems(
                 Update,
@@ -27,25 +29,39 @@ impl Plugin for CreditsPlugin {
     }
 }
 
-#[derive(Debug, TypeUuid, TypePath)]
+#[derive(Debug, TypeUuid, TypePath, Asset)]
 #[uuid = "43df4a09-b5f0-4619-9223-8cf67dc9e844"]
 pub struct CreditsText {
     sections: Vec<TextSection>,
 }
 
+#[derive(Debug, Error)]
+enum CreditsTextLoadError {
+    #[error("Could not read audio setting: {0}")]
+    LoadError(#[from] std::io::Error),
+    #[error("Could not load audio setting: {0}")]
+    ReadError(#[from] std::str::Utf8Error),
+}
+
 #[derive(Default)]
 struct CreditsTextLoader;
 
 impl AssetLoader for CreditsTextLoader {
+    type Asset = CreditsText;
+    type Settings = ();
+    type Error = CreditsTextLoadError;
+
     fn load<'a>(
         &'a self,
-        bytes: &'a [u8],
-        load_context: &'a mut LoadContext,
-    ) -> BoxedFuture<'a, Result<(), bevy::asset::Error>> {
+        reader: &'a mut Reader,
+        _settings: &'a Self::Settings,
+        _load_context: &'a mut LoadContext,
+    ) -> BoxedFuture<'a, Result<Self::Asset, Self::Error>> {
         Box::pin(async move {
-            let custom_asset = parse_credits(bytes)?;
-            load_context.set_default_asset(LoadedAsset::new(custom_asset));
-            Ok(())
+            let mut bytes = Vec::new();
+            reader.read_to_end(&mut bytes).await?;
+            let custom_asset = parse_credits(bytes.as_slice())?;
+            Ok(custom_asset)
         })
     }
 
@@ -111,11 +127,13 @@ fn update_credits(
     credits_texts: Res<Assets<CreditsText>>,
     mut query: Query<(&mut Text, &Handle<CreditsText>)>,
 ) {
-    reader.iter().for_each(|event| match event {
-        AssetEvent::Created { handle } | AssetEvent::Modified { handle } => {
+    reader.read().for_each(|event| match event {
+        AssetEvent::Added { id }
+        | AssetEvent::Modified { id }
+        | AssetEvent::LoadedWithDependencies { id } => {
             query
                 .iter_mut()
-                .filter(|(_, this_handle)| handle.clone() == (*this_handle).clone())
+                .filter(|(_, this_handle)| Handle::Weak(id.clone()) == (*this_handle).clone())
                 .for_each(|(mut text, this_handle)| {
                     if let Some(credits_text) = credits_texts.get(this_handle) {
                         text.sections = credits_text.sections.clone();

src/debug.rs

@@ -1,9 +1,5 @@
 use bevy::{
-    asset::diagnostic::AssetCountDiagnosticsPlugin,
-    diagnostic::{
-        DiagnosticsStore, EntityCountDiagnosticsPlugin, FrameTimeDiagnosticsPlugin,
-        SystemInformationDiagnosticsPlugin,
-    },
+    diagnostic::DiagnosticsStore,
     input::{keyboard::KeyboardInput, ButtonState},
     utils::{hashbrown::hash_map::Iter, HashMap},
 };
@@ -14,16 +10,7 @@ pub(crate) struct DebugPlugin;
 
 impl Plugin for DebugPlugin {
     fn build(&self, app: &mut App) {
-        app.add_plugins((
-            FrameTimeDiagnosticsPlugin,
-            EntityCountDiagnosticsPlugin::default(),
-            AssetCountDiagnosticsPlugin::<Gltf>::default(),
-            AssetCountDiagnosticsPlugin::<Image>::default(),
-            AssetCountDiagnosticsPlugin::<Scene>::default(),
-            AssetCountDiagnosticsPlugin::<Font>::default(),
-            SystemInformationDiagnosticsPlugin::default(),
-        ))
-        .init_resource::<DebugInfo>()
+        app.init_resource::<DebugInfo>()
             .add_systems(Startup, init_debug_ui)
             .add_systems(
                 Update,
@@ -67,7 +54,7 @@ fn toggle_debug_mode(
     mut commands: Commands,
 ) {
     events
-        .iter()
+        .read()
         .filter(
             |KeyboardInput {
                  state, key_code, ..
@@ -132,11 +119,9 @@ fn display_diagnostics(
     });
 }
 
-fn camera_info(
-    mut debug_infos: ResMut<DebugInfo>,
-    cameras: Query<(&Camera, &Name)>,
-) {
-    let camera_names = cameras.iter()
+fn camera_info(mut debug_infos: ResMut<DebugInfo>, cameras: Query<(&Camera, &Name)>) {
+    let camera_names = cameras
+        .iter()
         .filter(|(c, _)| c.is_active)
         .map(|(_, n)| n.as_str())
         .collect::<Vec<&str>>()

src/display2d.rs

@@ -131,7 +131,7 @@ fn update_background(
     mut events: EventReader<WindowResized>,
 ) {
     events
-        .iter()
+        .read()
         .for_each(|&WindowResized { width, height, .. }| {
             sprites.iter_mut().for_each(|mut sprite| {
                 sprite.custom_size = Some(Vec2 {

src/display3d.rs

@@ -3,6 +3,7 @@ use crate::{
     prelude::*,
 };
 use bevy::{
+    animation::RepeatAnimation,
     core_pipeline::{tonemapping::DebandDither, Skybox},
     input::mouse::{MouseButtonInput, MouseMotion, MouseScrollUnit, MouseWheel},
     render::{
@@ -318,7 +319,7 @@ fn move_camera(
     mut events: EventReader<MouseMotion>,
     mut camera: Query<&mut Transform, (With<Display3d>, With<Camera>)>,
 ) {
-    events.iter().for_each(|MouseMotion { delta }| {
+    events.read().for_each(|MouseMotion { delta }| {
         if buttons.pressed(MouseButton::Left) {
             camera.iter_mut().for_each(|mut t| {
                 t.rotate_around(Vec3::ZERO, Quat::from_rotation_y(delta.x / 256.0));
@@ -333,7 +334,7 @@ fn mouse_zoom(
     mut events: EventReader<MouseWheel>,
     mut camera: Query<&mut Transform, (With<Display3d>, With<Camera>)>,
 ) {
-    events.iter().for_each(|MouseWheel { unit, y, .. }| {
+    events.read().for_each(|MouseWheel { unit, y, .. }| {
         camera.iter_mut().for_each(|mut t| {
             match unit {
                 MouseScrollUnit::Line => {
@@ -480,7 +481,7 @@ fn select(
     mut selections: EventWriter<game::Selection>,
 ) {
     events
-        .iter()
+        .read()
         .filter(|ev| ev.state == ButtonState::Pressed)
         .for_each(|_| {
             windows.iter().for_each(|window| {
@@ -586,7 +587,7 @@ fn put_down(
     children: Query<&Children>,
     mut players: Query<&mut AnimationPlayer>,
 ) {
-    events.iter().for_each(|entity| {
+    events.read().for_each(|entity| {
         if let Ok(_piece) = query.get_mut(entity) {
             let gltf = gltfs.get(&assets_map.models).expect("Load GLTF content");
             children.iter_descendants(entity).for_each(|child| {
@@ -598,7 +599,7 @@ fn put_down(
                             animation.expect("PutDown Animation").clone(),
                             Duration::from_secs_f32(0.75),
                         )
-                        .stop_repeating();
+                        .set_repeat(RepeatAnimation::Never);
                 }
             })
         }

src/game.rs

@@ -423,7 +423,7 @@ pub(crate) fn update_board(
     mut commands: Commands,
     mut played: Local<bool>,
 ) {
-    events.iter().for_each(|Move { from, to, .. }| {
+    events.read().for_each(|Move { from, to, .. }| {
         pieces.iter_mut().for_each(|(entity, mut index)| {
             if *index == *from {
                 match to {
@@ -481,7 +481,7 @@ fn handle_selection(
     mut done: Local<bool>, // Tracks if moves/audio submitted already even if multiple pieces (2d/3d) are moved.
     mut latest: Local<BoardIndex>, // Tracks the last one worked on
 ) {
-    selections.iter().for_each(|Selection(index)| {
+    selections.read().for_each(|Selection(index)| {
         // Skip indexes already processed
         if *index != *latest {
             // Set the latest index to the current index

src/loading.rs

@@ -1,3 +1,5 @@
+use bevy::asset::{DependencyLoadState, RecursiveDependencyLoadState};
+
 use crate::prelude::*;
 
 pub(crate) struct LoadingPlugin;
@@ -57,20 +59,13 @@ fn loading(
     tweakfile: Res<Assets<audio::AudioSettings>>,
     mut next_state: ResMut<NextState<GameState>>,
 ) {
-    let s_ids = sprites
-        .ids()
-        .filter(|&id| matches!(id, HandleId::AssetPathId(_)))
-        .collect::<Vec<HandleId>>();
+    let s_ids = sprites.ids().collect::<Vec<AssetId<Image>>>();
 
-    let g_ids = gltfs
-        .ids()
-        .filter(|&id| matches!(id, HandleId::AssetPathId(_)))
-        .collect::<Vec<HandleId>>();
+    let g_ids = gltfs.ids().collect::<Vec<AssetId<Gltf>>>();
 
     let a_ids = tweakfile
         .ids()
-        .filter(|&id| matches!(id, HandleId::AssetPathId(_)))
-        .collect::<Vec<HandleId>>();
+        .collect::<Vec<AssetId<audio::AudioSettings>>>();
 
     debug!(
         "Sprite len: {:?} | GLTF len: {:?} | Audio Tweakfile: {:?}",
@@ -80,15 +75,36 @@ fn loading(
     );
 
     if s_ids.len() > 0 && g_ids.len() > 0 {
-        let s_ready = s_ids
-            .iter()
-            .all(|&id| server.get_load_state(id) == LoadState::Loaded);
-        let g_ready = g_ids
-            .iter()
-            .all(|&id| server.get_load_state(id) == LoadState::Loaded);
-        let a_ready = a_ids
-            .iter()
-            .all(|&id| server.get_load_state(id) == LoadState::Loaded);
+        let s_ready = s_ids.iter().all(|&id| {
+            let load_state = server.get_load_states(id);
+            load_state
+                == Some((
+                    LoadState::Loaded,
+                    DependencyLoadState::Loaded,
+                    RecursiveDependencyLoadState::Loaded,
+                ))
+                || load_state == None
+        });
+        let g_ready = g_ids.iter().all(|&id| {
+            let load_state = server.get_load_states(id);
+            load_state
+                == Some((
+                    LoadState::Loaded,
+                    DependencyLoadState::Loaded,
+                    RecursiveDependencyLoadState::Loaded,
+                ))
+                || load_state == None
+        });
+        let a_ready = a_ids.iter().all(|&id| {
+            let load_state = server.get_load_states(id);
+            load_state
+                == Some((
+                    LoadState::Loaded,
+                    DependencyLoadState::Loaded,
+                    RecursiveDependencyLoadState::Loaded,
+                ))
+                || load_state == None
+        });
         if s_ready && g_ready && a_ready {
             next_state.set(GameState::Menu)
         }

src/main.rs

@@ -15,10 +15,7 @@ mod ui;
 
 use std::time::Duration;
 
-use bevy::{
-    asset::{ChangeWatcher, HandleId},
-    input::ButtonState,
-};
+use bevy::input::ButtonState;
 
 use crate::prelude::*;
 
@@ -55,10 +52,6 @@ fn main() {
                     ..default()
                 }),
                 ..default()
-            })
-            .set(AssetPlugin {
-                watch_for_changes: ChangeWatcher::with_delay(Duration::from_millis(200)),
-                ..default()
             }),
     );
     app.add_plugins(credits::CreditsPlugin);

src/menu.rs

@@ -187,7 +187,7 @@ pub(crate) fn exit_to_menu(
     mut next_state: ResMut<NextState<GameState>>,
 ) {
     events
-        .iter()
+        .read()
         .filter(
             |KeyboardInput {
                  key_code, state, ..