Migrate to bevy 0.18 (#116)

Author: mbrea-c

Cargo.lock

@@ -3,19 +3,27 @@ members = ["crates/*", "examples/*"]
 resolver = "2"
 
 [workspace.package]
-version = "0.9.0"
+version = "0.10.0"
 license = "MIT OR Apache-2.0"
 readme = "README.md"
 edition = "2024"
 repository = "https://github.com/mbrea-c/bevy_animation_graph"
 
 [workspace.dependencies]
-bevy_animation_graph_proc_macros = { version = "0.9.0", path = "./crates/bevy_animation_graph_proc_macros" }
-bevy_animation_graph = { version = "0.9.0", path = "./crates/bevy_animation_graph" }
-bevy_animation_graph_core = { version = "0.9.0", path = "./crates/bevy_animation_graph_core" }
-bevy_animation_graph_builtin_nodes = { version = "0.9.0", path = "./crates/bevy_animation_graph_builtin_nodes" }
+bevy_animation_graph_proc_macros = { version = "0.10.0", path = "./crates/bevy_animation_graph_proc_macros" }
+bevy_animation_graph = { version = "0.10.0", path = "./crates/bevy_animation_graph" }
+bevy_animation_graph_core = { version = "0.10.0", path = "./crates/bevy_animation_graph_core" }
+bevy_animation_graph_builtin_nodes = { version = "0.10.0", path = "./crates/bevy_animation_graph_builtin_nodes" }
+
+bevy = { version = "0.18" }
+avian3d = { version = "0.5" }
+
+egui_dock = "0.18"
+egui-notify = { version = "0.21" }
+egui = { version = "0.33" }
+egui_extras = { version = "0.33", features = ["all_loaders"] }
+bevy_egui = { version = "0.39" }
+bevy-inspector-egui = { version = "0.36" }
 
-bevy = { version = "0.17" }
-avian3d = { version = "0.4" }
 ron = "0.10.1"
 serde = { version = "1.0" }

Cargo.toml

@@ -182,7 +182,8 @@ pinging me in the Bevy discord.
 
 | `bevy` | `bevy_animation_graph` | 
 | ------ | ---------------------- | 
-| 0.17 | master | 
+| 0.18 | master | 
+| 0.18 | 0.10 | 
 | 0.17 | 0.9 | 
 | 0.17 | 0.8 | 
 | 0.16 | 0.7 | 

README.md

@@ -1,6 +1,7 @@
 use bevy::{
     asset::{AssetLoader, AssetPath, Handle, LoadContext, io::Reader},
     platform::collections::HashMap,
+    reflect::TypePath,
     scene::Scene,
 };
 use serde::{Deserialize, Serialize};
@@ -30,7 +31,7 @@ pub struct RetargetingSerial {
     bone_path_overrides: HashMap<String, String>,
 }
 
-#[derive(Default)]
+#[derive(Default, TypePath)]
 pub struct AnimatedSceneLoader;
 
 impl AssetLoader for AnimatedSceneLoader {

crates/bevy_animation_graph_core/src/animated_scene/loader.rs

@@ -1,7 +1,6 @@
 pub mod loader;
 
 use bevy::{
-    animation::AnimationTarget,
     asset::{Asset, Assets, Handle, ReflectAsset},
     camera::visibility::Visibility,
     ecs::{
@@ -171,23 +170,23 @@ fn process_scene_into_animscn(
     {
         let player_entity_id = entity_mut.id();
 
-        let mut query = scene.world.query::<&mut AnimationTarget>();
+        let mut query = scene.world.query::<(
+            &mut bevy::animation::AnimationTargetId,
+            &bevy::animation::AnimatedBy,
+        )>();
 
-        for mut target in query.iter_mut(&mut scene.world) {
-            if player_entity_id != target.player {
+        for (mut target_id, animated_by) in query.iter_mut(&mut scene.world) {
+            if player_entity_id != animated_by.0 {
                 continue;
             }
 
-            let bone_id = BoneId::from(target.id);
+            let bone_id = BoneId::from(*target_id);
             let Some(mapped_bone_id) =
                 apply_bone_path_overrides(bone_id, skeleton, &retargeting.bone_path_overrides)
             else {
                 continue;
             };
-            *target = AnimationTarget {
-                id: bevy::animation::AnimationTargetId(mapped_bone_id.id()),
-                player: target.player,
-            }
+            *target_id = bevy::animation::AnimationTargetId(mapped_bone_id.id());
         }
     }
 

crates/bevy_animation_graph_core/src/animated_scene/mod.rs

@@ -2,7 +2,7 @@ use bevy::{
     asset::{AssetLoader, AssetPath, LoadContext, io::Reader},
     gltf::Gltf,
     platform::collections::HashMap,
-    reflect::Reflect,
+    reflect::{Reflect, TypePath},
 };
 use serde::{Deserialize, Serialize};
 
@@ -25,7 +25,7 @@ pub struct GraphClipSerial {
     pub event_tracks: HashMap<String, EventTrack>,
 }
 
-#[derive(Default)]
+#[derive(Default, TypePath)]
 pub struct GraphClipLoader;
 
 impl AssetLoader for GraphClipLoader {

crates/bevy_animation_graph_core/src/animation_clip/loader.rs

@@ -4,15 +4,15 @@ use bevy::{
         reflect::AppTypeRegistry,
         world::{FromWorld, World},
     },
-    reflect::TypeRegistryArc,
+    reflect::{TypePath, TypeRegistryArc},
 };
 
 use crate::{
     animation_graph::{AnimationGraph, serial::AnimationGraphDeserializer},
     errors::AssetLoaderError,
 };
 
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, TypePath)]
 pub struct AnimationGraphLoader {
     type_registry: TypeRegistryArc,
 }

crates/bevy_animation_graph_core/src/animation_graph/loader.rs

@@ -1,7 +1,7 @@
 use bevy::{
     asset::{AssetLoader, AssetPath, LoadContext, io::Reader},
     platform::collections::HashMap,
-    reflect::Reflect,
+    reflect::{Reflect, TypePath},
 };
 use serde::{Deserialize, Serialize};
 
@@ -15,7 +15,7 @@ use crate::{
     symmetry::serial::SymmetryConfigSerial,
 };
 
-#[derive(Default)]
+#[derive(Default, TypePath)]
 pub struct RagdollBoneMapLoader;
 
 impl AssetLoader for RagdollBoneMapLoader {

crates/bevy_animation_graph_core/src/ragdoll/bone_mapping_loader.rs

@@ -1,8 +1,11 @@
-use bevy::asset::{AssetLoader, LoadContext, io::Reader};
+use bevy::{
+    asset::{AssetLoader, LoadContext, io::Reader},
+    reflect::TypePath,
+};
 
 use crate::{errors::AssetLoaderError, ragdoll::definition::Ragdoll};
 
-#[derive(Default)]
+#[derive(Default, TypePath)]
 pub struct RagdollLoader;
 
 impl AssetLoader for RagdollLoader {

crates/bevy_animation_graph_core/src/ragdoll/definition_loader.rs

@@ -4,6 +4,7 @@ use bevy::{
     ecs::{hierarchy::Children, name::Name},
     gltf::Gltf,
     prelude::{Entity, With, World},
+    reflect::TypePath,
     scene::Scene,
     transform::components::Transform,
 };
@@ -14,7 +15,7 @@ use super::{
 };
 use crate::{animation_clip::EntityPath, errors::AssetLoaderError};
 
-#[derive(Default)]
+#[derive(Default, TypePath)]
 pub struct SkeletonLoader;
 
 impl AssetLoader for SkeletonLoader {