Fix hierarchy selection issues

studio/src/interaction/selection.rs

@@ -49,43 +49,52 @@ impl Plugin for SelectionPlugin {
                 .run_if(resource_changed_or_removed::<Selection>()),
         );
 
-        app.add_systems(Update, sync_editor_selected);
+        app.add_systems(PostUpdate, propagate_space_editor_to_studio);
     }
 }
 
 #[derive(Component, Clone, Copy)]
 pub struct Selectable;
 
-#[derive(Component, Clone, Copy)]
-pub struct Selected;
-
 #[derive(Resource, Deref, DerefMut, Debug)]
 pub struct Selection(Entity);
 
-fn sync_editor_selected(
+fn propagate_space_editor_to_studio(
     mut cmd: Commands,
-    q_new_selected: Query<Entity, (Added<Selected>, Without<space_editor::prelude::Selected>)>,
-    q_editor_selected: Query<Entity, With<space_editor::prelude::Selected>>,
-    q_selected: Query<Entity, With<Selected>>,
-    q_added_editor_selected: Query<
-        Entity,
-        (Without<Selected>, Added<space_editor::prelude::Selected>),
-    >,
+    r_selection: Option<Res<Selection>>,
+    q_new_selected: Query<Entity, Added<space_editor::prelude::Selected>>,
+    mut er_deselected: RemovedComponents<space_editor::prelude::Selected>,
+    q_parents: Query<&Parent>,
+    q_selectable: Query<&Selectable>,
 ) {
-    for ent in q_new_selected.iter() {
-        for ed_ent in q_editor_selected.iter() {
-            cmd.entity(ed_ent)
-                .remove::<space_editor::prelude::Selected>();
+    let studio_selection_deselected_in_space_editor = r_selection
+        .as_ref()
+        .map(|selection| {
+            er_deselected
+                .read()
+                .any(|deselected| deselected == ***selection)
+        })
+        .unwrap_or(false);
+
+    if q_new_selected.is_empty() && studio_selection_deselected_in_space_editor {
+        cmd.remove_resource::<Selection>();
+    } else {
+        let mut new_selected_iter = q_new_selected.iter();
+        let Some(selected) = new_selected_iter.next().and_then(|se_selected| {
+            nearest_selectable_parent(se_selected, &q_parents, &q_selectable)
+        }) else {
+            return;
+        };
+
+        if r_selection.is_none() || **r_selection.unwrap() != selected {
+            cmd.insert_resource(Selection(selected));
         }
-        cmd.entity(ent).insert(space_editor::prelude::Selected);
-    }
 
-    for ent in q_added_editor_selected.iter() {
-        cmd.entity(ent).insert(Selected);
-        cmd.insert_resource(Selection(ent));
-
-        for ent in q_selected.iter() {
-            cmd.entity(ent).remove::<Selected>();
+        if new_selected_iter.next().is_some() {
+            warn!(
+                "Multiple new entities were selected in Space Editor, but \
+                Storyteller Studio doesn't currently support multiple selections"
+            );
         }
     }
 }
@@ -117,31 +126,11 @@ fn update_selection(
     mut ev_input: EventReader<InputAction>,
     q_parents: Query<&Parent>,
     q_selectable: Query<&Selectable>,
-    q_selected: Query<Entity, With<Selected>>,
 ) {
     if let Some(event) = ev_select.read().last() {
-        // Clear any existing `Selected` components
-        for ent in q_selected.iter() {
-            cmd.entity(ent).remove::<Selected>();
-        }
-
         // Find the nearest Selectable parent of the target entity
-        let mut ent = event.target;
-        let ent_selected = loop {
-            if q_selectable.get(ent).is_ok() {
-                break Some(ent);
-            }
-
-            if let Ok(parent) = q_parents.get(ent) {
-                ent = parent.get();
-            } else {
-                break None;
-            }
-        };
-
-        if let Some(ent) = ent_selected {
+        if let Some(ent) = nearest_selectable_parent(event.target, &q_parents, &q_selectable) {
             cmd.insert_resource(Selection(ent));
-            cmd.entity(ent).insert(Selected);
         } else {
             cmd.remove_resource::<Selection>();
         }
@@ -152,9 +141,23 @@ fn update_selection(
         )
     }) {
         cmd.remove_resource::<Selection>();
+    }
+}
 
-        for ent in q_selected.iter() {
-            cmd.entity(ent).remove::<Selected>();
+fn nearest_selectable_parent(
+    mut target: Entity,
+    q_parents: &Query<&Parent>,
+    q_selectable: &Query<&Selectable>,
+) -> Option<Entity> {
+    loop {
+        if q_selectable.get(target).is_ok() {
+            break Some(target);
+        }
+
+        if let Ok(parent) = q_parents.get(target) {
+            target = parent.get();
+        } else {
+            break None;
         }
     }
 }
@@ -192,7 +195,8 @@ fn finalize_delete(mut cmd: Commands, q: Query<Entity, With<MarkedForDeletion>>)
 
 fn draw_selection_outline(
     mut cmd: Commands,
-    q_selected: Query<&Children, With<Selected>>,
+    r_selection: Option<Res<Selection>>,
+    q_children: Query<&Children>,
     q_meshes: Query<
         Entity,
         (
@@ -209,8 +213,11 @@ fn draw_selection_outline(
         cmd.entity(ent).remove::<OutlineBundle>();
     }
 
-    for children in q_selected.iter() {
-        for &child in children.iter() {
+    if let Some(selected_children) = r_selection
+        .as_ref()
+        .and_then(|selection| q_children.get(***selection).ok())
+    {
+        for &child in selected_children.iter() {
             if q_meshes.contains(child) {
                 cmd.entity(child).insert(OutlineBundle {
                     outline: OutlineVolume {
@@ -233,7 +240,7 @@ mod wasm {
     };
     use wasm_bindgen::prelude::*;
 
-    use super::{Selected, Selection};
+    use super::Selection;
     use crate::wasm::{self, FromStr, StaticBuffer, WasmMessageBuffer};
 
     #[wasm_bindgen(typescript_custom_section)]
@@ -273,7 +280,6 @@ declare global {
     pub(super) fn update_selection_from_frontend(mut cmd: Commands) {
         if let Some(entity) = SELECTION_REQUEST.take_message() {
             cmd.insert_resource(Selection(entity));
-            cmd.entity(entity).insert(Selected);
         }
     }
 }