formatting

Author: ecrax

src/components/microphone.rs

@@ -1,7 +1,6 @@
 use bevy::prelude::*;
-use bevy_pixel_buffer::bevy_egui::egui::emath::Pos2;
 use egui::epaint::CircleShape;
-use egui::{Color32, Rect};
+use egui::{Color32, Pos2, Rect};
 use serde::{Deserialize, Serialize};
 
 use super::gizmo::GizmoComponent;

src/components/states.rs

@@ -1,6 +1,4 @@
 use bevy::ecs::component::Component;
-use bevy_pixel_buffer::bevy_egui::egui::emath::Pos2;
-use bevy_pixel_buffer::bevy_egui::egui::{Color32, Rect};
 
 #[derive(Component)]
 pub struct Drag;

src/input/input.rs

@@ -196,7 +196,7 @@ pub fn button_input(
                                 if (resize_point.x).abs_diff(x) <= 10
                                     && (resize_point.y).abs_diff(y) <= 10
                                 {
-                                    commands.entity(entity).insert((resize_type));
+                                    commands.entity(entity).insert(resize_type);
                                     break;
                                 }
                             }
@@ -206,7 +206,7 @@ pub fn button_input(
                             if (resize_point.x).abs_diff(x) <= 10
                                 && (resize_point.y).abs_diff(y) <= 10
                             {
-                                commands.entity(entity).insert((WResize::Radius));
+                                commands.entity(entity).insert(WResize::Radius);
                                 break;
                             }
                         }

src/math/transformations.rs

@@ -1,5 +1,4 @@
-use bevy_pixel_buffer::bevy_egui::egui::emath::Rect;
-use egui::{pos2, Pos2};
+use egui::{Pos2, Rect};
 
 use super::constants::*;
 use crate::ui::state::UiState;
@@ -87,7 +86,7 @@ pub fn screen_to_nearest_grid(x: f32, y: f32, image_rect: Rect) -> Option<(u32,
 }
 
 pub fn grid_to_image(pos: Pos2, image_rect: &Rect) -> Pos2 {
-    pos2(
+    Pos2::new(
         f32_map_range(
             0.,
             SIMULATION_WIDTH as f32,

src/ui/dialog.rs

@@ -12,7 +12,6 @@ use crate::grid::grid::Grid;
 /// Marker component for the file dialog and the corresponding event.
 pub struct SaveFileContents;
 
-
 /// The data that is loaded from a file. Used for deserialization.
 #[derive(Deserialize)]
 pub struct SaveData {

src/ui/draw.rs

@@ -1,8 +1,7 @@
 use bevy::diagnostic::{DiagnosticsStore, FrameTimeDiagnosticsPlugin};
 use bevy::prelude::*;
 use bevy_file_dialog::prelude::*;
-use bevy_pixel_buffer::bevy_egui::egui::epaint::CircleShape;
-use bevy_pixel_buffer::bevy_egui::egui::{pos2, Color32, Frame, Margin, Vec2};
+use bevy_pixel_buffer::bevy_egui::egui::{Color32, Frame, Margin, Vec2};
 use bevy_pixel_buffer::bevy_egui::EguiContexts;
 use bevy_pixel_buffer::prelude::*;
 use egui_plot::{GridMark, Legend, Line, Plot, PlotPoints};
@@ -12,12 +11,12 @@ use crate::components::gizmo::GizmoComponent;
 use crate::components::microphone::*;
 use crate::components::source::*;
 use crate::components::states::{MenuSelected, Selected};
-use crate::components::wall::{CircWall, RectWall, WResize, Wall};
+use crate::components::wall::{CircWall, RectWall, Wall};
 use crate::events::UpdateWalls;
 use crate::grid::grid::Grid;
 use crate::math::constants::*;
 use crate::math::fft::calc_mic_spectrum;
-use crate::math::transformations::{coords_to_index, f32_map_range};
+use crate::math::transformations::coords_to_index;
 use crate::render::draw::GradientResource;
 use crate::ui::state::*;
 

src/ui/state.rs

@@ -1,7 +1,7 @@
 use std::fmt;
 
 use bevy::prelude::*;
-use bevy_pixel_buffer::bevy_egui::egui::Vec2;
+use egui::Vec2;
 
 #[derive(Debug, PartialEq, Clone, Copy)]
 pub enum WallType {
@@ -72,7 +72,7 @@ pub struct UiState {
     pub render_abc_area: bool,
     pub at_type: AttenuationType,
     pub power_order: u32,
-    pub image_rect: egui::emath::Rect,
+    pub image_rect: egui::Rect,
     pub show_plots: bool,
     pub current_fft_microphone: Option<usize>,
     pub spectrum_size: Vec2,
@@ -94,7 +94,7 @@ impl Default for UiState {
             render_abc_area: false,
             at_type: AttenuationType::Power,
             power_order: 5,
-            image_rect: egui::emath::Rect::NOTHING,
+            image_rect: egui::Rect::NOTHING,
             show_plots: false,
             current_fft_microphone: None,
             spectrum_size: Vec2 { x: 250., y: 500. }, // random init values