Change outline update to use set_changed()

Signed-off-by: Luca Della Vedova <[email protected]>
open-rmf · Aug 31, 2023 · e2b35dd · e2b35dd
1 parent 5b6e2fa
commit e2b35dd
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 26 deletions.
diff --git a/rmf_site_editor/src/interaction/mod.rs b/rmf_site_editor/src/interaction/mod.rs
@@ -197,7 +197,6 @@ impl Plugin for InteractionPlugin {
                     .with_system(update_point_visual_cues.after(maintain_selected_entities))
                     .with_system(update_path_visual_cues.after(maintain_selected_entities))
                     .with_system(update_outline_visualization.after(maintain_selected_entities))
-                    .with_system(update_outline_for_new_meshes.after(maintain_selected_entities))
                     .with_system(update_highlight_visualization.after(maintain_selected_entities))
                     .with_system(
                         update_cursor_hover_visualization.after(maintain_selected_entities),

diff --git a/rmf_site_editor/src/interaction/outline.rs b/rmf_site_editor/src/interaction/outline.rs
@@ -209,25 +209,3 @@ pub fn update_outline_visualization(
         }
     }
 }
-
-pub fn update_outline_for_new_meshes(
-    mut commands: Commands,
-    new_meshes: Query<Entity, Added<Handle<Mesh>>>,
-    outlines: Query<(&OutlineVolume, &SetOutlineDepth)>,
-    parents: Query<&Parent>,
-) {
-    for e in &new_meshes {
-        for p in AncestorIter::new(&parents, e) {
-            if let Ok((outline, depth)) = outlines.get(p) {
-                commands
-                    .entity(e)
-                    .insert(OutlineBundle {
-                        outline: outline.clone(),
-                        ..default()
-                    })
-                    .insert(depth.clone());
-                break;
-            }
-        }
-    }
-}
diff --git a/rmf_site_editor/src/site/door.rs b/rmf_site_editor/src/site/door.rs
@@ -15,7 +15,11 @@
  *
 */
 
-use crate::{interaction::Selectable, shapes::*, site::*};
+use crate::{
+    interaction::{Hovered, Selectable},
+    shapes::*,
+    site::*,
+};
 use bevy::{
     prelude::*,
     render::mesh::{Indices, PrimitiveTopology},
@@ -393,7 +397,13 @@ fn update_door_visuals(
 pub fn update_changed_door(
     mut commands: Commands,
     mut doors: Query<
-        (Entity, &Edge<Entity>, &DoorType, &mut DoorSegments),
+        (
+            Entity,
+            &Edge<Entity>,
+            &DoorType,
+            &mut DoorSegments,
+            &mut Hovered,
+        ),
         Or<(Changed<Edge<Entity>>, Changed<DoorType>)>,
     >,
     anchors: AnchorParams,
@@ -402,7 +412,8 @@ pub fn update_changed_door(
     mut mesh_assets: ResMut<Assets<Mesh>>,
     assets: Res<SiteAssets>,
 ) {
-    for (entity, edge, kind, mut segments) in &mut doors {
+    for (entity, edge, kind, mut segments, mut hovered) in &mut doors {
+        let old_door_count = segments.body.entities().len();
         if let Some(new_body) = update_door_visuals(
             &mut commands,
             entity,
@@ -416,6 +427,11 @@ pub fn update_changed_door(
             &assets,
         ) {
             segments.body = new_body;
+            if segments.body.entities().len() > old_door_count {
+                // A new door was spawned, trigger hovered change detection to update the outline
+                // for the new mesh
+                hovered.set_changed();
+            }
         }
     }
 }