Merge remote-tracking branch 'origin/main' into xiyu/improve_tasks

Author: xiyuoh

Cargo.lock

@@ -109,6 +109,7 @@ bevy_ptr = "0.16"
 bevy_reflect = "0.16"
 bevy_remote = "0.16"
 bevy_render = "0.16"
+bevy_rich_text3d = "0.4.1"
 bevy_scene = "0.16"
 bevy_sprite = "0.16"
 bevy_state = "0.16"

Cargo.toml

@@ -136,7 +136,8 @@
           "name": "<Unnamed>",
           "kind": {
             "SingleSliding": {
-              "towards": "Left"
+              "towards": "Left",
+              "position": 1.0
             }
           }
         }
@@ -590,7 +591,9 @@
         "47": {
           "kind": {
             "DoubleSliding": {
-              "left_right_ratio": 1.0
+              "left_right_ratio": 1.0,
+              "left_position": 1.0,
+              "right_position": 1.0
             }
           },
           "reference_anchors": [

assets/demo_maps/test.site.json

@@ -55,6 +55,7 @@ anyhow = {workspace = true}
 uuid = { workspace = true, features = ["v4"] }
 bytemuck = {workspace = true}
 bevy_infinite_grid = {workspace = true}
+bevy_rich_text3d = {workspace = true}
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
 clap = { workspace = true, features = ["color", "derive", "help", "usage", "suggestions"] }
 bevy_egui = {workspace = true}

crates/rmf_site_editor/Cargo.toml

@@ -0,0 +1,57 @@
+/*
+ * Copyright (C) 2025 Open Source Robotics Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+*/
+
+use crate::{interaction::*, site::*};
+use bevy_rich_text3d::*;
+
+pub fn update_door_interactive_cues(
+    changed_doors: Query<
+        (&Hovered, &Selected, &DoorSegments),
+        Or<(Changed<Hovered>, Changed<Selected>)>,
+    >,
+    mut styles: Query<&mut Text3dStyling>,
+    mut materials: Query<&mut MeshMaterial3d<StandardMaterial>>,
+    assets: Res<SiteAssets>,
+) {
+    for (hovered, selected, segments) in &changed_doors {
+        let text_color = if hovered.cue() && selected.cue() {
+            HOVER_SELECT_COLOR
+        } else if hovered.cue() {
+            HOVER_COLOR
+        } else if selected.cue() {
+            SELECT_COLOR
+        } else {
+            Color::BLACK
+        };
+
+        for text in segments.name_displays() {
+            if let Ok(mut style) = styles.get_mut(text) {
+                style.color = text_color.into();
+            }
+        }
+
+        let cue_material = if hovered.cue() {
+            assets.door_cue_highlighted_material.clone()
+        } else {
+            assets.door_cue_material.clone()
+        };
+
+        if let Ok(mut material) = materials.get_mut(segments.cue) {
+            **material = cue_material;
+        }
+    }
+}

crates/rmf_site_editor/src/interaction/door.rs

@@ -16,6 +16,7 @@
 */
 
 use crate::{interaction::*, layers::ZLayer, site::*};
+use bevy::pbr::ExtendedMaterial;
 use bevy::prelude::*;
 use rmf_site_format::{Edge, LaneMarker};
 
@@ -39,6 +40,10 @@ pub fn update_lane_visual_cues(
         ),
     >,
     mut materials: Query<&mut MeshMaterial3d<StandardMaterial>>,
+    mut lane_materials: Query<
+        &MeshMaterial3d<ExtendedMaterial<StandardMaterial, LaneArrowMaterial>>,
+    >,
+    mut extended_materials: ResMut<Assets<ExtendedMaterial<StandardMaterial, LaneArrowMaterial>>>,
     mut visibility: Query<&mut Visibility>,
     site_assets: Res<SiteAssets>,
     cursor: Res<Cursor>,
@@ -76,5 +81,15 @@ pub fn update_lane_visual_cues(
         }
 
         tf.translation.z = h;
+
+        if let Some(mat) = lane_materials.get_mut(pieces.mid).ok() {
+            if let Some(lane_mat) = extended_materials.get_mut(&mat.0) {
+                lane_mat.extension.is_active = if hovered.cue() || selected.cue() {
+                    true as u32
+                } else {
+                    false as u32
+                };
+            }
+        }
     }
 }