From d802301066d3e7600441d63530c929d7290931c8 Mon Sep 17 00:00:00 2001 From: CoCo_Sol Date: Mon, 1 Apr 2024 00:56:12 +0200 Subject: [PATCH 1/4] save --- crates/border-wars/src/lib.rs | 3 +-- crates/border-wars/src/main.rs | 2 ++ crates/border-wars/src/scenes/mod.rs | 5 ++--- crates/border-wars/src/{ => ui}/hover.rs | 0 crates/border-wars/src/ui/mod.rs | 19 +++++++++++++++++++ .../src/{ => ui}/responsive_scale.rs | 1 + 6 files changed, 25 insertions(+), 5 deletions(-) rename crates/border-wars/src/{ => ui}/hover.rs (100%) create mode 100644 crates/border-wars/src/ui/mod.rs rename crates/border-wars/src/{ => ui}/responsive_scale.rs (99%) diff --git a/crates/border-wars/src/lib.rs b/crates/border-wars/src/lib.rs index 726dfd0..16b1b2d 100644 --- a/crates/border-wars/src/lib.rs +++ b/crates/border-wars/src/lib.rs @@ -6,11 +6,10 @@ use networking::PlayerRank; use serde::{Deserialize, Serialize}; pub mod camera; -pub mod hover; pub mod map; pub mod networking; -pub mod responsive_scale; pub mod scenes; +pub mod ui; /// The current scene of the game. #[derive(Debug, Clone, Copy, Default, Eq, PartialEq, Hash, States)] diff --git a/crates/border-wars/src/main.rs b/crates/border-wars/src/main.rs index ea58352..8019933 100644 --- a/crates/border-wars/src/main.rs +++ b/crates/border-wars/src/main.rs @@ -7,6 +7,7 @@ use border_wars::map::renderer::RendererPlugin; use border_wars::map::selected_tile::SelectTilePlugin; use border_wars::networking::NetworkingPlugin; use border_wars::scenes::ScenesPlugin; +use border_wars::ui::UiPlugin; fn main() { App::new() @@ -17,5 +18,6 @@ fn main() { .add_plugins(SelectTilePlugin) .add_plugins(NetworkingPlugin) .add_plugins(MapGenerationPlugin) + .add_plugins(UiPlugin) .run(); } diff --git a/crates/border-wars/src/scenes/mod.rs b/crates/border-wars/src/scenes/mod.rs index da18601..2a788fd 100644 --- a/crates/border-wars/src/scenes/mod.rs +++ b/crates/border-wars/src/scenes/mod.rs @@ -3,7 +3,7 @@ use bevy::prelude::*; use bevy_egui::EguiPlugin; -use crate::{responsive_scale, CurrentScene}; +use crate::CurrentScene; pub mod lobby; pub mod menu; @@ -16,7 +16,6 @@ impl Plugin for ScenesPlugin { app.add_plugins(EguiPlugin) .add_state::() .add_plugins(menu::MenuPlugin) - .add_plugins(lobby::LobbyPlugin) - .add_plugins(responsive_scale::ResponsiveScalingPlugin); + .add_plugins(lobby::LobbyPlugin); } } diff --git a/crates/border-wars/src/hover.rs b/crates/border-wars/src/ui/hover.rs similarity index 100% rename from crates/border-wars/src/hover.rs rename to crates/border-wars/src/ui/hover.rs diff --git a/crates/border-wars/src/ui/mod.rs b/crates/border-wars/src/ui/mod.rs new file mode 100644 index 0000000..3c31f19 --- /dev/null +++ b/crates/border-wars/src/ui/mod.rs @@ -0,0 +1,19 @@ +//! TODO + +pub mod hover; +pub mod responsive_scale; + +use bevy::prelude::*; +use responsive_scale::ResponsiveScalingPlugin; + +use self::hover::HoverPlugin; + +/// The plugin for the UI. +pub struct UiPlugin; + +impl Plugin for UiPlugin { + fn build(&self, app: &mut App) { + app.add_plugins(HoverPlugin) + .add_plugins(ResponsiveScalingPlugin); + } +} diff --git a/crates/border-wars/src/responsive_scale.rs b/crates/border-wars/src/ui/responsive_scale.rs similarity index 99% rename from crates/border-wars/src/responsive_scale.rs rename to crates/border-wars/src/ui/responsive_scale.rs index 81c79b5..3aa01a4 100644 --- a/crates/border-wars/src/responsive_scale.rs +++ b/crates/border-wars/src/ui/responsive_scale.rs @@ -32,6 +32,7 @@ pub fn change_scaling( if window.resolution.physical_height() == 0 { return; }; + let (a, b) = ( window.resolution.width() / size.0.x, window.resolution.height() / size.0.y, -- 2.43.4 From dff1235d7391c5c3c83c4814fa5040f3becee389 Mon Sep 17 00:00:00 2001 From: CoCo_Sol Date: Mon, 1 Apr 2024 00:58:30 +0200 Subject: [PATCH 2/4] change doc --- crates/border-wars/src/ui/mod.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/border-wars/src/ui/mod.rs b/crates/border-wars/src/ui/mod.rs index 3c31f19..2e6864f 100644 --- a/crates/border-wars/src/ui/mod.rs +++ b/crates/border-wars/src/ui/mod.rs @@ -1,4 +1,4 @@ -//! TODO +//! The file that contains the UI logic. pub mod hover; pub mod responsive_scale; -- 2.43.4 From 902c39b03e6e894641abd0e0cc2b1f3613832cc4 Mon Sep 17 00:00:00 2001 From: CoCo_Sol Date: Mon, 1 Apr 2024 01:03:11 +0200 Subject: [PATCH 3/4] update --- crates/border-wars/src/ui/responsive_scale.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/crates/border-wars/src/ui/responsive_scale.rs b/crates/border-wars/src/ui/responsive_scale.rs index 3aa01a4..81c79b5 100644 --- a/crates/border-wars/src/ui/responsive_scale.rs +++ b/crates/border-wars/src/ui/responsive_scale.rs @@ -32,7 +32,6 @@ pub fn change_scaling( if window.resolution.physical_height() == 0 { return; }; - let (a, b) = ( window.resolution.width() / size.0.x, window.resolution.height() / size.0.y, -- 2.43.4 From 7882151879f3e901ec4460a91c819762080b5be0 Mon Sep 17 00:00:00 2001 From: CoCo_Sol Date: Mon, 1 Apr 2024 01:04:15 +0200 Subject: [PATCH 4/4] update --- crates/border-wars/src/ui/mod.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/border-wars/src/ui/mod.rs b/crates/border-wars/src/ui/mod.rs index 2e6864f..9b6dd27 100644 --- a/crates/border-wars/src/ui/mod.rs +++ b/crates/border-wars/src/ui/mod.rs @@ -4,9 +4,9 @@ pub mod hover; pub mod responsive_scale; use bevy::prelude::*; -use responsive_scale::ResponsiveScalingPlugin; use self::hover::HoverPlugin; +use self::responsive_scale::ResponsiveScalingPlugin; /// The plugin for the UI. pub struct UiPlugin; -- 2.43.4