Skip to content

Commit

Permalink
move tools to tool folder
Browse files Browse the repository at this point in the history
  • Loading branch information
Uriopass committed Jan 24, 2024
1 parent 02ba18a commit 1e7b039
Show file tree
Hide file tree
Showing 13 changed files with 18 additions and 18 deletions.
2 changes: 1 addition & 1 deletion engine/src/passes/blur.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
11 changes: 2 additions & 9 deletions native_app/src/gui/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
9 changes: 9 additions & 0 deletions native_app/src/gui/tools/mod.rs
Original file line number Diff line number Diff line change
@@ -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;
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion native_app/src/newgui/topgui.rs
Original file line number Diff line number Diff line change
@@ -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,
Expand Down

0 comments on commit 1e7b039

Please sign in to comment.