From b69672356aec8daf2d393b5177d98fd93db02597 Mon Sep 17 00:00:00 2001 From: CoCoSol007 Date: Sat, 10 Feb 2024 17:06:26 +0100 Subject: [PATCH] Change structure of files --- crates/border-wars/src/lib.rs | 2 +- crates/border-wars/src/main.rs | 4 ++-- crates/border-wars/src/{ => menus}/menu.rs | 4 ++-- crates/border-wars/src/menus/mod.rs | 16 ++++++++++++++++ 4 files changed, 21 insertions(+), 5 deletions(-) rename crates/border-wars/src/{ => menus}/menu.rs (92%) create mode 100644 crates/border-wars/src/menus/mod.rs diff --git a/crates/border-wars/src/lib.rs b/crates/border-wars/src/lib.rs index 3ba1db7..db3bbc5 100644 --- a/crates/border-wars/src/lib.rs +++ b/crates/border-wars/src/lib.rs @@ -2,7 +2,7 @@ use bevy::prelude::*; -pub mod menu; +pub mod menus; /// The state 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 ec04b20..7ed9435 100644 --- a/crates/border-wars/src/main.rs +++ b/crates/border-wars/src/main.rs @@ -1,13 +1,13 @@ //! The main entry point of the game. use bevy::prelude::*; -use border_wars::menu::MenuPlugin; +use border_wars::menus::MenusPlugin; use border_wars::GameState; fn main() { App::new() .add_plugins(DefaultPlugins) .add_state::() - .add_plugins(MenuPlugin) + .add_plugins(MenusPlugin) .run(); } diff --git a/crates/border-wars/src/menu.rs b/crates/border-wars/src/menus/menu.rs similarity index 92% rename from crates/border-wars/src/menu.rs rename to crates/border-wars/src/menus/menu.rs index d6e4d13..8818c0f 100644 --- a/crates/border-wars/src/menu.rs +++ b/crates/border-wars/src/menus/menu.rs @@ -1,7 +1,7 @@ //! The main menu of the game. use bevy::prelude::*; -use bevy_egui::{egui, EguiContexts, EguiPlugin}; +use bevy_egui::{egui, EguiContexts}; use crate::GameState; @@ -10,7 +10,7 @@ pub struct MenuPlugin; impl Plugin for MenuPlugin { fn build(&self, app: &mut App) { - app.add_plugins(EguiPlugin).add_systems( + app.add_systems( Update, menu_ui.run_if(state_exists_and_equals(GameState::Menu)), ); diff --git a/crates/border-wars/src/menus/mod.rs b/crates/border-wars/src/menus/mod.rs new file mode 100644 index 0000000..7d40b39 --- /dev/null +++ b/crates/border-wars/src/menus/mod.rs @@ -0,0 +1,16 @@ +//! All the menu's programme. + +use bevy::prelude::*; +use bevy_egui::EguiPlugin; + +pub mod menu; + +/// The plugin for all menus. +pub struct MenusPlugin; + +impl Plugin for MenusPlugin { + fn build(&self, app: &mut App) { + app.add_plugins(EguiPlugin) + .add_plugins(menu::MenuPlugin); + } +}