Making so animation transition is able to handle multiple active animations!

crates/bevy_animation/src/graph.rs

@@ -81,6 +81,7 @@ use crate::{AnimationClip, AnimationTargetId};
 /// mask corresponds to a *mask group*, which is a set of animation targets
 /// (bones). An animation target can belong to any number of mask groups within
 /// the context of an animation graph.
+/// Note - Avoid using 0 as a *mask* as that is the default mask for non masked nodes.
 ///
 /// When the appropriate bit is set in a node's mask, neither the node nor its
 /// descendants will animate any animation targets belonging to that mask group.

crates/bevy_animation/src/lib.rs

@@ -24,7 +24,7 @@ use core::{
     iter, slice,
 };
 use graph::AnimationNodeType;
-use prelude::AnimationCurveEvaluator;
+use prelude::{handle_node_transition, AnimationCurveEvaluator};
 
 use crate::{
     graph::{AnimationGraphHandle, ThreadedAnimationGraphs},
@@ -60,10 +60,53 @@ pub mod prelude {
 use crate::{
     animation_curves::AnimationCurve,
     graph::{AnimationGraph, AnimationGraphAssetLoader, AnimationNodeIndex},
-    transition::{advance_transitions, expire_completed_transitions, AnimationTransitions},
+    transition::{expire_completed_transitions, AnimationTransitions},
 };
 use alloc::sync::Arc;
 
+/// Adds animation support to an app
+#[derive(Default)]
+pub struct AnimationPlugin;
+
+impl Plugin for AnimationPlugin {
+    fn build(&self, app: &mut App) {
+        app.init_asset::<AnimationClip>()
+            .init_asset::<AnimationGraph>()
+            .init_asset_loader::<AnimationGraphAssetLoader>()
+            .register_asset_reflect::<AnimationClip>()
+            .register_asset_reflect::<AnimationGraph>()
+            .register_type::<AnimationPlayer>()
+            .register_type::<AnimationTarget>()
+            .register_type::<AnimationTransitions>()
+            .register_type::<AnimationGraphHandle>()
+            .register_type::<NodeIndex>()
+            .register_type::<ThreadedAnimationGraphs>()
+            .init_resource::<ThreadedAnimationGraphs>()
+            .add_systems(
+                PostUpdate,
+                (
+                    graph::thread_animation_graphs.before(AssetEventSystems),
+                    handle_node_transition,
+                    advance_animations,
+                    // TODO: `animate_targets` can animate anything, so
+                    // ambiguity testing currently considers it ambiguous with
+                    // every other system in `PostUpdate`. We may want to move
+                    // it to its own system set after `Update` but before
+                    // `PostUpdate`. For now, we just disable ambiguity testing
+                    // for this system.
+                    animate_targets
+                        .before(bevy_render::mesh::inherit_weights)
+                        .ambiguous_with_all(),
+                    trigger_untargeted_animation_events,
+                    expire_completed_transitions,
+                )
+                    .chain()
+                    .in_set(AnimationSystems)
+                    .before(TransformSystems::Propagate),
+            );
+    }
+}
+
 /// The [UUID namespace] of animation targets (e.g. bones).
 ///
 /// [UUID namespace]: https://en.wikipedia.org/wiki/Universally_unique_identifier#Versions_3_and_5_(namespace_name-based)
@@ -1223,49 +1266,6 @@ pub fn animate_targets(
         });
 }
 
-/// Adds animation support to an app
-#[derive(Default)]
-pub struct AnimationPlugin;
-
-impl Plugin for AnimationPlugin {
-    fn build(&self, app: &mut App) {
-        app.init_asset::<AnimationClip>()
-            .init_asset::<AnimationGraph>()
-            .init_asset_loader::<AnimationGraphAssetLoader>()
-            .register_asset_reflect::<AnimationClip>()
-            .register_asset_reflect::<AnimationGraph>()
-            .register_type::<AnimationPlayer>()
-            .register_type::<AnimationTarget>()
-            .register_type::<AnimationTransitions>()
-            .register_type::<AnimationGraphHandle>()
-            .register_type::<NodeIndex>()
-            .register_type::<ThreadedAnimationGraphs>()
-            .init_resource::<ThreadedAnimationGraphs>()
-            .add_systems(
-                PostUpdate,
-                (
-                    graph::thread_animation_graphs.before(AssetEventSystems),
-                    advance_transitions,
-                    advance_animations,
-                    // TODO: `animate_targets` can animate anything, so
-                    // ambiguity testing currently considers it ambiguous with
-                    // every other system in `PostUpdate`. We may want to move
-                    // it to its own system set after `Update` but before
-                    // `PostUpdate`. For now, we just disable ambiguity testing
-                    // for this system.
-                    animate_targets
-                        .before(bevy_render::mesh::inherit_weights)
-                        .ambiguous_with_all(),
-                    trigger_untargeted_animation_events,
-                    expire_completed_transitions,
-                )
-                    .chain()
-                    .in_set(AnimationSystems)
-                    .before(TransformSystems::Propagate),
-            );
-    }
-}
-
 impl AnimationTargetId {
     /// Creates a new [`AnimationTargetId`] by hashing a list of names.
     ///