progress with ecs native window refactor

Author: mbrea-c

crates/bevy_animation_graph_editor/src/ui/actions/mod.rs

@@ -22,7 +22,6 @@ use bevy::{
     },
     log::error,
 };
-use egui_dock::DockState;
 use event_tracks::{EventTrackAction, handle_event_track_action};
 use fsm::{FsmAction, handle_fsm_action};
 use graph::{GraphAction, handle_graph_action};
@@ -123,7 +122,7 @@ fn handle_view_action(
         }
         ViewAction::New(name) => {
             commands.queue(|world: &mut World| {
-                let view_state = EditorViewUiState::init(world, name, DockState::new(vec![]));
+                let view_state = EditorViewUiState::empty(world, name);
                 let mut ui_state = world.resource_mut::<UiState>();
                 ui_state.new_native_view(view_state);
             });

crates/bevy_animation_graph_editor/src/ui/actions/saving.rs

@@ -4,6 +4,7 @@ use crate::{
         UiState,
         core::EguiWindow,
         editor_windows::saving::{SaveWindow, SaveWindowAssetMeta},
+        global_state::{ClearGlobalState, active_fsm::ActiveFsm, active_graph::ActiveGraph},
     },
 };
 use bevy::{asset::UntypedAssetId, platform::collections::HashMap, prelude::*};
@@ -96,9 +97,9 @@ pub fn handle_save_graph(
     In(save_graph): In<SaveGraph>,
     asset_server: Res<AssetServer>,
     graph_assets: Res<Assets<AnimationGraph>>,
-    mut ui_state: ResMut<UiState>,
     cli: Res<Cli>,
     registry: Res<AppTypeRegistry>,
+    mut commands: Commands,
 ) {
     let type_registry = registry.0.read();
     let graph = graph_assets.get(save_graph.asset_id).unwrap();
@@ -121,16 +122,16 @@ pub fn handle_save_graph(
     // editor selection.
     // Also delete the temporary asset
     if asset_server.get_path(save_graph.asset_id).is_none() {
-        ui_state.global_state.graph_editor = None;
+        commands.trigger(ClearGlobalState::<ActiveGraph>::default());
     }
 }
 
 pub fn handle_save_fsm(
     In(save_fsm): In<SaveFsm>,
     asset_server: Res<AssetServer>,
     graph_assets: Res<Assets<StateMachine>>,
-    mut ui_state: ResMut<UiState>,
     cli: Res<Cli>,
+    mut commands: Commands,
 ) {
     let fsm = graph_assets.get(save_fsm.asset_id).unwrap();
     let graph_serial = StateMachineSerial::from(fsm);
@@ -152,15 +153,13 @@ pub fn handle_save_fsm(
     // editor selection.
     // Also delete the temporary asset
     if asset_server.get_path(save_fsm.asset_id).is_none() {
-        ui_state.global_state.fsm_editor = None;
+        commands.trigger(ClearGlobalState::<ActiveFsm>::default());
     }
 }
 
 pub fn handle_save_animation_clip(
     In(save_fsm): In<SaveClip>,
-    asset_server: Res<AssetServer>,
     clip_assets: Res<Assets<GraphClip>>,
-    mut ui_state: ResMut<UiState>,
     cli: Res<Cli>,
 ) {
     let clip = clip_assets.get(save_fsm.asset_id).unwrap();
@@ -181,13 +180,6 @@ pub fn handle_save_animation_clip(
             ron::ser::PrettyConfig::default(),
         )
         .unwrap();
-
-    // If we just saved a newly created graph, unload the in-memory asset from the
-    // editor selection.
-    // Also delete the temporary asset
-    if asset_server.get_path(save_fsm.asset_id).is_none() {
-        ui_state.global_state.fsm_editor = None;
-    }
 }
 
 pub fn handle_save_colliders(

crates/bevy_animation_graph_editor/src/ui/global_state/active_fsm.rs

@@ -5,15 +5,16 @@ use bevy::{
 use bevy_animation_graph::core::state_machine::high_level::StateMachine;
 
 use crate::ui::global_state::{
-    RegisterGlobalState, SetOrInsertEvent, observe_clear_global_state, observe_set_or_insert_event,
+    RegisterStateComponent, SetOrInsertEvent, observe_clear_global_state,
+    observe_set_or_insert_event,
 };
 
 #[derive(Debug, Component, Default, Clone)]
 pub struct ActiveFsm {
     pub handle: Handle<StateMachine>,
 }
 
-impl RegisterGlobalState for ActiveFsm {
+impl RegisterStateComponent for ActiveFsm {
     fn register(world: &mut World, _global_state_entity: Entity) {
         world.add_observer(observe_set_or_insert_event::<ActiveFsm, SetActiveFsm>);
         world.add_observer(observe_clear_global_state::<Self>);

crates/bevy_animation_graph_editor/src/ui/global_state/active_fsm_state.rs

@@ -4,15 +4,17 @@ use bevy::{
 };
 use bevy_animation_graph::core::state_machine::high_level::{StateId, StateMachine};
 
-use crate::ui::global_state::{RegisterGlobalState, SetOrInsertEvent, observe_set_or_insert_event};
+use crate::ui::global_state::{
+    RegisterStateComponent, SetOrInsertEvent, observe_set_or_insert_event,
+};
 
 #[derive(Debug, Component, Default, Clone)]
 pub struct ActiveFsmState {
     pub handle: Handle<StateMachine>,
     pub state: StateId,
 }
 
-impl RegisterGlobalState for ActiveFsmState {
+impl RegisterStateComponent for ActiveFsmState {
     fn register(world: &mut World, _global_state_entity: Entity) {
         world.add_observer(observe_set_or_insert_event::<ActiveFsmState, SetActiveFsmState>);
     }

crates/bevy_animation_graph_editor/src/ui/global_state/active_fsm_transition.rs

@@ -4,15 +4,17 @@ use bevy::{
 };
 use bevy_animation_graph::core::state_machine::high_level::{StateMachine, TransitionId};
 
-use crate::ui::global_state::{RegisterGlobalState, SetOrInsertEvent, observe_set_or_insert_event};
+use crate::ui::global_state::{
+    RegisterStateComponent, SetOrInsertEvent, observe_set_or_insert_event,
+};
 
 #[derive(Debug, Component, Default, Clone)]
 pub struct ActiveFsmTransition {
     pub handle: Handle<StateMachine>,
     pub transition: TransitionId,
 }
 
-impl RegisterGlobalState for ActiveFsmTransition {
+impl RegisterStateComponent for ActiveFsmTransition {
     fn register(world: &mut World, _global_state_entity: Entity) {
         world.add_observer(
             observe_set_or_insert_event::<ActiveFsmTransition, SetActiveFsmTransition>,

crates/bevy_animation_graph_editor/src/ui/global_state/active_graph.rs

@@ -4,14 +4,16 @@ use bevy::{
 };
 use bevy_animation_graph::prelude::AnimationGraph;
 
-use crate::ui::global_state::{RegisterGlobalState, SetOrInsertEvent, observe_set_or_insert_event};
+use crate::ui::global_state::{
+    RegisterStateComponent, SetOrInsertEvent, observe_set_or_insert_event,
+};
 
 #[derive(Debug, Component, Default, Clone)]
 pub struct ActiveGraph {
     pub handle: Handle<AnimationGraph>,
 }
 
-impl RegisterGlobalState for ActiveGraph {
+impl RegisterStateComponent for ActiveGraph {
     fn register(world: &mut World, _global_state_entity: Entity) {
         world.add_observer(observe_set_or_insert_event::<ActiveGraph, SetActiveGraph>);
     }

crates/bevy_animation_graph_editor/src/ui/global_state/active_graph_context.rs

@@ -8,14 +8,14 @@ use bevy::{
 };
 use bevy_animation_graph::prelude::GraphContextId;
 
-use crate::ui::global_state::{GlobalState, RegisterGlobalState};
+use crate::ui::global_state::{GlobalState, RegisterStateComponent};
 
 #[derive(Debug, Component, Clone, Default)]
 pub struct ActiveContexts {
     pub by_asset: HashMap<UntypedAssetId, (Entity, GraphContextId)>,
 }
 
-impl RegisterGlobalState for ActiveContexts {
+impl RegisterStateComponent for ActiveContexts {
     fn register(world: &mut World, global_state_entity: Entity) {
         world
             .entity_mut(global_state_entity)

crates/bevy_animation_graph_editor/src/ui/global_state/active_graph_node.rs

@@ -7,7 +7,9 @@ use bevy_animation_graph::{
     prelude::AnimationGraph,
 };
 
-use crate::ui::global_state::{RegisterGlobalState, SetOrInsertEvent, observe_set_or_insert_event};
+use crate::ui::global_state::{
+    RegisterStateComponent, SetOrInsertEvent, observe_set_or_insert_event,
+};
 
 #[derive(Debug, Component, Default, Clone)]
 pub struct ActiveGraphNode {
@@ -16,7 +18,7 @@ pub struct ActiveGraphNode {
     pub selected_pin: Option<PinId>,
 }
 
-impl RegisterGlobalState for ActiveGraphNode {
+impl RegisterStateComponent for ActiveGraphNode {
     fn register(world: &mut World, _global_state_entity: Entity) {
         world.add_observer(observe_set_or_insert_event::<ActiveGraphNode, SetActiveGraphNode>);
     }

crates/bevy_animation_graph_editor/src/ui/global_state/active_scene.rs

@@ -5,15 +5,16 @@ use bevy::{
 use bevy_animation_graph::prelude::AnimatedScene;
 
 use crate::ui::global_state::{
-    RegisterGlobalState, SetOrInsertEvent, observe_clear_global_state, observe_set_or_insert_event,
+    RegisterStateComponent, SetOrInsertEvent, observe_clear_global_state,
+    observe_set_or_insert_event,
 };
 
 #[derive(Debug, Component, Default, Clone)]
 pub struct ActiveScene {
     pub handle: Handle<AnimatedScene>,
 }
 
-impl RegisterGlobalState for ActiveScene {
+impl RegisterStateComponent for ActiveScene {
     fn register(world: &mut World, _global_state_entity: Entity) {
         world.add_observer(observe_set_or_insert_event::<ActiveScene, SetActiveScene>);
         world.add_observer(observe_clear_global_state::<Self>);

crates/bevy_animation_graph_editor/src/ui/global_state/inspector_selection.rs

@@ -1,6 +1,8 @@
 use bevy::ecs::{component::Component, entity::Entity, event::Event, world::World};
 
-use crate::ui::global_state::{RegisterGlobalState, SetOrInsertEvent, observe_set_or_insert_event};
+use crate::ui::global_state::{
+    RegisterStateComponent, SetOrInsertEvent, observe_set_or_insert_event,
+};
 
 #[derive(Debug, Component, Default, Clone, Hash)]
 pub enum InspectorSelection {
@@ -17,7 +19,7 @@ pub enum InspectorSelection {
     Nothing,
 }
 
-impl RegisterGlobalState for InspectorSelection {
+impl RegisterStateComponent for InspectorSelection {
     fn register(world: &mut World, global_state_entity: Entity) {
         world
             .entity_mut(global_state_entity)