Optimize outline update for new meshes

Signed-off-by: Luca Della Vedova <lucadv@intrinsic.ai>
open-rmf · Jun 23, 2023 · 5461c93 · 5461c93
1 parent 2d567db
commit 5461c93
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 1 deletion.
diff --git a/rmf_site_editor/src/interaction/mod.rs b/rmf_site_editor/src/interaction/mod.rs
@@ -161,6 +161,7 @@ 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_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
@@ -134,7 +134,7 @@ pub fn update_outline_visualization(
     mut commands: Commands,
     outlinable: Query<
         (Entity, &Hovered, &Selected, &OutlineVisualization),
-        Or<(Changed<Hovered>, Changed<Selected>, Changed<Children>)>,
+        Or<(Changed<Hovered>, Changed<Selected>)>,
     >,
     descendants: Query<(Option<&Children>, Option<&ComputedVisualCue>)>,
 ) {
@@ -185,3 +185,25 @@ 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;
+            }
+        }
+    }
+}