allow resizing lotbrush with wheel

Uriopass · Jan 25, 2024 · 24f5a87 · 24f5a87
1 parent f4a4d70
commit 24f5a87
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 23 deletions.
diff --git a/native_app/src/gui/tools/lotbrush.rs b/native_app/src/gui/tools/lotbrush.rs
@@ -16,7 +16,7 @@ pub struct LotBrushResource {
 /// Allows to build houses on lots
 pub fn lotbrush(sim: &Simulation, uiworld: &mut UiWorld) {
     profiling::scope!("gui::lotbrush");
-    let res = uiworld.read::<LotBrushResource>();
+    let mut res = uiworld.write::<LotBrushResource>();
     let tool = *uiworld.read::<Tool>();
     let inp = uiworld.read::<InputMap>();
     let mut draw = uiworld.write::<ImmediateDraw>();
@@ -27,6 +27,14 @@ pub fn lotbrush(sim: &Simulation, uiworld: &mut UiWorld) {
         return;
     }
 
+    if inp.just_act.contains(&InputAction::SizeUp) {
+        res.radius *= 1.1;
+    }
+    if inp.just_act.contains(&InputAction::SizeDown) {
+        res.radius /= 1.1;
+    }
+    res.radius = res.radius.clamp(1.0, 300.0);
+
     let kind = res.kind;
 
     let mut col = match kind {

diff --git a/native_app/src/gui/topgui.rs b/native_app/src/gui/topgui.rs
@@ -21,7 +21,6 @@ use simulation::Simulation;
 use crate::gui::bulldozer::BulldozerState;
 use crate::gui::chat::chat;
 use crate::gui::inspect::inspector;
-use crate::gui::lotbrush::LotBrushResource;
 use crate::gui::roadeditor::RoadEditorResource;
 use crate::gui::specialbuilding::{SpecialBuildKind, SpecialBuildingResource};
 use crate::gui::terraforming::TerraformingResource;
@@ -473,27 +472,6 @@ impl Gui {
                 });
         }
 
-        if matches!(*uiworld.read::<Tab>(), Tab::Housebrush) {
-            let lbw = 120.0;
-            Window::new("House Brush")
-                .fixed_size([lbw, 50.0])
-                .fixed_pos([w - toolbox_w - lbw - 10.0, h * 0.5 - 30.0])
-                .hscroll(false)
-                .title_bar(true)
-                .collapsible(false)
-                .resizable(false)
-                .show(ui, |ui| {
-                    let mut cur_brush = uiworld.write::<LotBrushResource>();
-
-                    ui.horizontal(|ui| {
-                        egui::DragValue::new(&mut cur_brush.radius)
-                            .clamp_range(10.0..=300.0f32)
-                            .ui(ui);
-                        ui.label("radius");
-                    })
-                });
-        }
-
         if matches!(*uiworld.read::<Tab>(), Tab::Bulldozer) {
             let lbw = 120.0;
             Window::new("Bulldozer")