apply stateful data refactor to editor crate

Author: mbrea-c

crates/bevy_animation_graph_editor/src/graph_show.rs

@@ -5,11 +5,14 @@ use crate::egui_nodes::{
     pin::{PinSpec, PinType},
 };
 use bevy::{asset::AssetId, ecs::resource::Resource, platform::collections::HashMap};
-use bevy_animation_graph::core::{
-    animation_graph::{AnimationGraph, PinId, SourcePin, TargetPin},
-    animation_node::AnimationNode,
-    context::{GraphContext, SpecContext},
-    edge_data::DataSpec,
+use bevy_animation_graph::{
+    core::{
+        animation_graph::{AnimationGraph, PinId, SourcePin, TargetPin},
+        animation_node::AnimationNode,
+        context::SpecContext,
+        edge_data::DataSpec,
+    },
+    prelude::{graph_context::GraphContext, node_states::StateKey},
 };
 use bevy_inspector_egui::egui::Color32;
 
@@ -453,18 +456,18 @@ impl GraphReprSpec {
             return (None, None, false);
         };
 
-        let source_pin = SourcePin::NodeTime(node.name.clone());
         let time = graph_context
-            .caches
-            .get_primary(|c| c.get_time(&source_pin));
+            .node_states
+            .get_time(node.name.clone(), StateKey::Default);
         let duration = graph_context
-            .caches
-            .get_primary(|c| c.get_duration(&source_pin));
+            .node_caches
+            .get_duration(node.name.clone(), StateKey::Default)
+            .ok();
         let active = graph_context
-            .caches
-            .get_primary(|c| Some(c.is_updated(&node.name)));
+            .node_caches
+            .is_updated(node.name.clone(), StateKey::Default);
 
-        (time, duration.flatten(), active.unwrap_or(false))
+        (Some(time), duration.flatten(), active)
     }
 
     fn add_nodes(

crates/bevy_animation_graph_editor/src/ui/native_windows/debugger.rs

@@ -5,8 +5,10 @@ use bevy::{
     prelude::{Handle, Image, In, Query, Transform, World},
 };
 use bevy_animation_graph::{
-    core::{animation_graph::SourcePin, pose::Pose},
-    prelude::{AnimatedScene, AnimatedSceneHandle, AnimationGraphPlayer, DataValue},
+    core::pose::Pose,
+    prelude::{
+        AnimatedScene, AnimatedSceneHandle, AnimationGraphPlayer, DataValue, node_states::StateKey,
+    },
 };
 use egui_dock::egui;
 
@@ -94,11 +96,10 @@ impl NativeEditorWindowExtension for DebuggerWindow {
         // Now get the selected value and display it!
 
         let Some(val) = new_pin_id.and_then(|pin_id| {
-            graph_context.caches.get_primary(|c| {
-                let node_id = active_node.node.clone();
-                let pin_id = pin_id.clone();
-                c.get_data(&SourcePin::NodeData(node_id, pin_id)).cloned()
-            })
+            graph_context
+                .node_caches
+                .get_output_data(active_node.node.clone(), StateKey::Default, pin_id.clone())
+                .ok()
         }) else {
             return;
         };

crates/bevy_animation_graph_editor/src/ui/native_windows/fsm_editor.rs

@@ -4,7 +4,8 @@ use bevy::{
     utils::default,
 };
 use bevy_animation_graph::{
-    core::state_machine::high_level::StateMachine, prelude::AnimationGraph,
+    core::state_machine::{high_level::StateMachine, low_level::FSMState},
+    prelude::{AnimationGraph, node_states::StateKey},
 };
 use egui_dock::egui;
 
@@ -98,8 +99,10 @@ impl NativeEditorWindowExtension for FsmEditorWindow {
                             let graph_id = ctx.get_graph_id();
                             let graph = graph_assets.get(graph_id)?;
                             let node_id = graph.contains_state_machine(&active_fsm.handle)?;
-                            ctx.caches
-                                .get_primary(|c| c.get_fsm_state(&node_id).cloned())
+                            ctx.node_states
+                                .get::<FSMState>(node_id, StateKey::Default)
+                                .ok()
+                                .cloned()
                         });
 
                         let fsm_repr_spec =

crates/bevy_animation_graph_editor/src/ui/native_windows/inspector.rs

@@ -5,7 +5,7 @@ use bevy::{
 };
 use bevy_animation_graph::{
     core::state_machine::high_level::{State, StateMachine, Transition},
-    prelude::{AnimationGraph, AnimationNode, GraphContext, GraphContextId},
+    prelude::{AnimationGraph, AnimationNode, GraphContextId, graph_context::GraphContext},
 };
 use bevy_inspector_egui::reflect_inspector::InspectorUi;
 use egui_dock::egui;