move tools to tool folder

engine/src/passes/blur.rs

@@ -6,7 +6,7 @@ use wgpu::{
 
 use crate::{CompiledModule, Encoders, GfxContext, PipelineBuilder, Texture, TextureBuilder, TL};
 
-const DOWNSCALE_PASSES: u32 = 3;
+const DOWNSCALE_PASSES: u32 = 2;
 
 /// The blur pass to be used by the UI uses the "Dual Kawase Blur" algorithm as explained
 /// in the SIGGRAPH 2015 paper "Bandwidth-efficient Rendering" by Marius Bjørge

native_app/src/gui/mod.rs

@@ -14,23 +14,16 @@ use simulation::map::BuildingID;
 use simulation::world_command::WorldCommand;
 use simulation::{AnyEntity, Simulation};
 
-pub mod addtrain;
-pub mod bulldozer;
 pub mod chat;
 pub mod follow;
 pub mod inspect;
 pub mod inspected_aura;
-pub mod lotbrush;
-pub mod roadbuild;
-pub mod roadeditor;
-pub mod selectable;
-pub mod specialbuilding;
-pub mod terraforming;
+mod tools;
 pub mod topgui;
 pub mod windows;
-pub mod zoneedit;
 
 pub use follow::FollowEntity;
+pub use tools::*;
 pub use topgui::*;
 
 pub fn run_ui_systems(sim: &Simulation, uiworld: &mut UiWorld) {

native_app/src/gui/addtrain.rs → native_app/src/gui/tools/addtrain.rs

@@ -1,5 +1,4 @@
-use super::Tool;
-use crate::gui::PotentialCommands;
+use crate::gui::{PotentialCommands, Tool};
 use crate::inputmap::{InputAction, InputMap};
 use crate::rendering::immediate::ImmediateDraw;
 use crate::uiworld::UiWorld;

native_app/src/gui/bulldozer.rs → native_app/src/gui/tools/bulldozer.rs

@@ -1,5 +1,5 @@
-use super::Tool;
 use crate::gui::specialbuilding::SpecialBuildingResource;
+use crate::gui::Tool;
 use crate::inputmap::{InputAction, InputMap};
 use crate::rendering::immediate::ImmediateDraw;
 use crate::uiworld::UiWorld;

native_app/src/gui/lotbrush.rs → native_app/src/gui/tools/lotbrush.rs

@@ -1,4 +1,4 @@
-use super::Tool;
+use crate::gui::Tool;
 use crate::inputmap::{InputAction, InputMap};
 use crate::rendering::immediate::ImmediateDraw;
 use crate::uiworld::UiWorld;

native_app/src/gui/tools/mod.rs

@@ -0,0 +1,9 @@
+pub mod addtrain;
+pub mod bulldozer;
+pub mod lotbrush;
+pub mod roadbuild;
+pub mod roadeditor;
+pub mod selectable;
+pub mod specialbuilding;
+pub mod terraforming;
+pub mod zoneedit;

native_app/src/gui/specialbuilding.rs → native_app/src/gui/tools/specialbuilding.rs

@@ -1,5 +1,4 @@
-use super::Tool;
-use crate::gui::{ErrorTooltip, InspectedBuilding, PotentialCommands};
+use crate::gui::{ErrorTooltip, InspectedBuilding, PotentialCommands, Tool};
 use crate::inputmap::{InputAction, InputMap};
 use crate::rendering::immediate::{ImmediateDraw, ImmediateSound};
 use crate::uiworld::UiWorld;

native_app/src/gui/terraforming.rs → native_app/src/gui/tools/terraforming.rs

@@ -1,4 +1,4 @@
-use super::Tool;
+use crate::gui::Tool;
 use crate::inputmap::{InputAction, InputMap};
 use crate::rendering::immediate::ImmediateDraw;
 use crate::uiworld::UiWorld;

native_app/src/newgui/topgui.rs

@@ -1,5 +1,5 @@
 use ordered_float::OrderedFloat;
-use yakui::widgets::{CutOut, List, Pad};
+use yakui::widgets::{List, Pad};
 use yakui::{
     constrained, reflow, row, spacer, Alignment, Color, Constraints, CrossAxisAlignment, Dim2,
     MainAxisAlignment, MainAxisSize, Vec2,