Fix style

Signed-off-by: Michael X. Grey <[email protected]>
open-rmf · Aug 13, 2023 · 5454eb0 · 5454eb0
1 parent ab4ced0
commit 5454eb0
Show file tree

Hide file tree

Showing 45 changed files with 764 additions and 541 deletions.
diff --git a/rmf_site_editor/src/interaction/camera_controls.rs b/rmf_site_editor/src/interaction/camera_controls.rs
@@ -365,7 +365,12 @@ fn camera_controls(
     mut change_mode: EventReader<ChangeProjectionMode>,
 ) {
     if let Some(mode) = change_mode.iter().last() {
-        controls.use_mode(mode.0, &mut bevy_cameras, &mut visibility, headlight_toggle.0);
+        controls.use_mode(
+            mode.0,
+            &mut bevy_cameras,
+            &mut visibility,
+            headlight_toggle.0,
+        );
     }
 
     if headlight_toggle.is_changed() {

diff --git a/rmf_site_editor/src/interaction/highlight.rs b/rmf_site_editor/src/interaction/highlight.rs
@@ -15,10 +15,7 @@
  *
 */
 
-use crate::{
-    interaction::*,
-    site::DrawingMarker,
-};
+use crate::{interaction::*, site::DrawingMarker};
 use bevy::prelude::*;
 
 #[derive(Component)]
@@ -46,15 +43,19 @@ pub fn add_highlight_visualization(
     new_drawings: Query<Entity, Added<DrawingMarker>>,
 ) {
     for e in &new_drawings {
-        commands
-            .entity(e)
-            .insert(Highlight::for_drawing());
+        commands.entity(e).insert(Highlight::for_drawing());
     }
 }
 
 pub fn update_highlight_visualization(
     highlightable: Query<
-        (&Hovered, &Selected, &Handle<StandardMaterial>, &Highlight, Option<&SuppressHighlight>),
+        (
+            &Hovered,
+            &Selected,
+            &Handle<StandardMaterial>,
+            &Highlight,
+            Option<&SuppressHighlight>,
+        ),
         Or<(
             Changed<Hovered>,
             Changed<Selected>,

diff --git a/rmf_site_editor/src/interaction/outline.rs b/rmf_site_editor/src/interaction/outline.rs
@@ -15,10 +15,7 @@
  *
 */
 
-use crate::{
-    site::DrawingMarker,
-    interaction::*,
-};
+use crate::{interaction::*, site::DrawingMarker};
 use bevy::render::view::RenderLayers;
 use bevy_mod_outline::{OutlineBundle, OutlineRenderLayers, OutlineVolume, SetOutlineDepth};
 use rmf_site_format::{
@@ -143,8 +140,18 @@ pub fn add_outline_visualization(
 pub fn update_outline_visualization(
     mut commands: Commands,
     outlinable: Query<
-        (Entity, &Hovered, &Selected, &OutlineVisualization, Option<&SuppressOutline>),
-        Or<(Changed<Hovered>, Changed<Selected>, Changed<SuppressOutline>)>,
+        (
+            Entity,
+            &Hovered,
+            &Selected,
+            &OutlineVisualization,
+            Option<&SuppressOutline>,
+        ),
+        Or<(
+            Changed<Hovered>,
+            Changed<Selected>,
+            Changed<SuppressOutline>,
+        )>,
     >,
     descendants: Query<(Option<&Children>, Option<&ComputedVisualCue>)>,
 ) {

diff --git a/rmf_site_editor/src/interaction/popup.rs b/rmf_site_editor/src/interaction/popup.rs
@@ -15,10 +15,7 @@
  *
 */
 
-use crate::{
-    interaction::*,
-    site::*,
-};
+use crate::{interaction::*, site::*};
 
 #[derive(Component, Clone, Copy)]
 pub struct Popup {
@@ -29,10 +26,7 @@ pub struct Popup {
 
 pub fn add_popups(
     mut commands: Commands,
-    new_poppers: Query<Entity, Or<(
-        Added<LocationTags>,
-        Added<FiducialMarker>,
-    )>>,
+    new_poppers: Query<Entity, Or<(Added<LocationTags>, Added<FiducialMarker>)>>,
 ) {
     for e in &new_poppers {
         commands.entity(e).insert(Popup {

diff --git a/rmf_site_editor/src/interaction/select_anchor.rs b/rmf_site_editor/src/interaction/select_anchor.rs
@@ -18,17 +18,17 @@
 use crate::{
     interaction::*,
     site::{
-        drawing_editor::CurrentEditDrawing,
-        Anchor, AnchorBundle, Category, Dependents, DrawingMarker, Original, PathBehavior, Pending,
+        drawing_editor::CurrentEditDrawing, Anchor, AnchorBundle, Category, Dependents,
+        DrawingMarker, Original, PathBehavior, Pending,
     },
     CurrentWorkspace,
 };
 use bevy::{ecs::system::SystemParam, prelude::*};
 use rmf_site_format::{
     Constraint, ConstraintDependents, Door, Edge, Fiducial, Floor, Lane, LiftProperties, Location,
-    Measurement, MeshConstraint, MeshElement, Model, ModelMarker, NameInWorkcell, Path,
-    PixelsPerMeter, Point, Pose, Side, NameOfSite, Wall, WorkcellCollisionMarker,
-    WorkcellModel, WorkcellVisualMarker,
+    Measurement, MeshConstraint, MeshElement, Model, ModelMarker, NameInWorkcell, NameOfSite, Path,
+    PixelsPerMeter, Point, Pose, Side, Wall, WorkcellCollisionMarker, WorkcellModel,
+    WorkcellVisualMarker,
 };
 use std::collections::HashSet;
 use std::sync::Arc;
@@ -2038,8 +2038,14 @@ pub fn handle_select_anchor_mode(
                     new_anchor
                 }
                 Scope::Drawing => {
-                    let drawing_entity = current_drawing.target().expect("No drawing while spawning drawing anchor").drawing;
-                    let (parent, ppm) = params.drawings.get(drawing_entity).expect("Entity being edited is not a drawing");
+                    let drawing_entity = current_drawing
+                        .target()
+                        .expect("No drawing while spawning drawing anchor")
+                        .drawing;
+                    let (parent, ppm) = params
+                        .drawings
+                        .get(drawing_entity)
+                        .expect("Entity being edited is not a drawing");
                     // We also need to have a transform such that the anchor will spawn in the
                     // right spot
                     let pose = compute_parent_inverse_pose(&tf, &transforms, parent);
@@ -2103,9 +2109,7 @@ pub fn handle_select_anchor_mode(
             .filter(|s| anchors.contains(*s))
         {
             request = match request.next(AnchorSelection::existing(new_selection), &mut params) {
-                Some(next_mode) => {
-                    next_mode
-                }
+                Some(next_mode) => next_mode,
                 None => {
                     params.cleanup();
                     *mode = InteractionMode::Inspect;

diff --git a/rmf_site_editor/src/keyboard.rs b/rmf_site_editor/src/keyboard.rs
@@ -18,7 +18,7 @@
 use crate::{
     interaction::{
         camera_controls::{CameraControls, HeadlightToggle},
-        ChangeMode, InteractionMode, Selection, ChangeProjectionMode,
+        ChangeMode, ChangeProjectionMode, InteractionMode, Selection,
     },
     site::{AlignSiteDrawings, CurrentLevel, Delete},
     CreateNewWorkspace, CurrentWorkspace, LoadWorkspace, SaveWorkspace,

diff --git a/rmf_site_editor/src/occupancy.rs b/rmf_site_editor/src/occupancy.rs
@@ -18,7 +18,7 @@
 use crate::{
     interaction::ComputedVisualCue,
     shapes::*,
-    site::{Category, LevelElevation, SiteAssets, NameOfSite, LANE_LAYER_START},
+    site::{Category, LevelElevation, NameOfSite, SiteAssets, LANE_LAYER_START},
 };
 use bevy::{
     math::{swizzles::*, Affine3A, Mat3A, Vec2, Vec3A},

diff --git a/rmf_site_editor/src/site/assets.rs b/rmf_site_editor/src/site/assets.rs
@@ -193,20 +193,18 @@ impl FromWorld for SiteAssets {
         );
         let location_mesh = meshes.add(
             Mesh::from(
-                make_icon_halo(1.1 * LANE_WIDTH / 2.0, 0.01, 6)
-                    .transform_by(Affine3A::from_translation(
-                        (0.00125 + LOCATION_LAYER_HEIGHT) * Vec3::Z)
-                    ),
+                make_icon_halo(1.1 * LANE_WIDTH / 2.0, 0.01, 6).transform_by(
+                    Affine3A::from_translation((0.00125 + LOCATION_LAYER_HEIGHT) * Vec3::Z),
+                ),
             )
             .with_generated_outline_normals()
             .unwrap(),
         );
         let fiducial_mesh = meshes.add(
             Mesh::from(
-                make_icon_halo(1.1 * LANE_WIDTH / 2.0, 0.01, 4)
-                    .transform_by(Affine3A::from_translation(
-                        (0.00125 + LOCATION_LAYER_HEIGHT) * Vec3::Z)
-                    ),
+                make_icon_halo(1.1 * LANE_WIDTH / 2.0, 0.01, 4).transform_by(
+                    Affine3A::from_translation((0.00125 + LOCATION_LAYER_HEIGHT) * Vec3::Z),
+                ),
             )
             .with_generated_outline_normals()
             .unwrap(),

diff --git a/rmf_site_editor/src/site/deletion.rs b/rmf_site_editor/src/site/deletion.rs
@@ -19,8 +19,8 @@ use crate::{
     interaction::{Select, Selection},
     log::Log,
     site::{
-        Category, CurrentLevel, Dependents, LevelProperties, NameInSite,
-        LevelElevation, SiteUpdateStage,
+        Category, CurrentLevel, Dependents, LevelElevation, LevelProperties, NameInSite,
+        SiteUpdateStage,
     },
 };
 use bevy::{ecs::system::SystemParam, prelude::*};