Merge branch 'luca/drawing_editor' into luca/floor_wall_materials

Signed-off-by: Luca Della Vedova <[email protected]>
open-rmf · Jul 10, 2023 · 4eba1f9 · 4eba1f9
2 parents 487e014 + dc0406e
commit 4eba1f9
Show file tree

Hide file tree

Showing 46 changed files with 1,352 additions and 479 deletions.
diff --git a/.github/workflows/style.yaml b/.github/workflows/style.yaml
@@ -20,8 +20,6 @@ jobs:
 
     - name: rustfmt
       run: |
-        rustup toolchain install nightly
-        rustup default nightly
         rustup component add rustfmt
 
     - name: style

diff --git a/rmf_site_editor/Cargo.toml b/rmf_site_editor/Cargo.toml
@@ -21,7 +21,6 @@ bevy_polyline = "0.4"
 bevy_stl = "0.7.0"
 bevy_obj = { git = "https://github.com/luca-della-vedova/bevy_obj", branch = "luca/scene_0.9", features = ["scene"]}
 bevy_rapier3d = "0.20.0"
-crossbeam-channel = "0.5.0"
 optimization_engine = "0.7.7"
 smallvec = "*"
 serde = { version = "1.0", features = ["derive"] }
@@ -32,17 +31,20 @@ wasm-bindgen = "=0.2.84"
 web-sys = { version = "0.3.56", features = ["console"] }
 futures-lite = "1.12.0"
 bevy = "0.9"
+bevy_utils = "0.9"
 dirs = "4.0"
 thread_local = "*"
 lyon = "1"
 thiserror = "*"
 rmf_site_format = { path = "../rmf_site_format", features = ["bevy"] }
 itertools = "*"
 bitfield = "*"
+crossbeam-channel = "0.5"
+tracing = "0.1.37"
+tracing-subscriber = "0.3.1"
 rfd = "0.11"
 urdf-rs = "0.7"
-# sdformat_rs = { path = "../../sdf_rust_experimental/sdformat_rs"}
-sdformat_rs = { git = "https://github.com/open-rmf/sdf_rust_experimental", rev = "f86344f"}
+sdformat_rs = { git = "https://github.com/open-rmf/sdf_rust_experimental", rev = "a5daef0"}
 
 # only enable the 'dynamic' feature if we're not building for web or windows
 [target.'cfg(all(not(target_arch = "wasm32"), not(target_os = "windows")))'.dependencies]

diff --git a/rmf_site_editor/src/interaction/cursor.rs b/rmf_site_editor/src/interaction/cursor.rs
@@ -354,7 +354,7 @@ pub fn update_cursor_transform(
             let mut transform = match transforms.get_mut(cursor.frame) {
                 Ok(transform) => transform,
                 Err(_) => {
-                    println!("No cursor transform found");
+                    error!("No cursor transform found");
                     return;
                 }
             };

diff --git a/rmf_site_editor/src/interaction/light.rs b/rmf_site_editor/src/interaction/light.rs
@@ -171,7 +171,7 @@ pub fn update_physical_light_visual_cues(
         if let Some(m) = material_assets.get_mut(material) {
             m.base_color = kind.color().into();
         } else {
-            println!("DEV ERROR: Unable to get material asset for light");
+            error!("Unable to get material asset for light");
         }
 
         if kind.is_directional() {