fish-cannard/border-wars
fish-cannard/border-wars
5
3
Fork 0
generated from tipragot/rust
Code Issues 10 Pull requests 3 Actions Packages Projects Releases Wiki Activity

Change of file structure for scenes #38

Merged
tipragot merged 11 commits from restruct-menus into main 2024-02-10 17:26:09 +00:00
Conversation 0 Commits 11 Files changed 4 +6 -7
3 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit b025b6d9d3 - Show all commits

2
crates/border-wars/src/main.rs
View file

@ -2,12 +2,10 @@
use bevy::prelude::*;
use border_wars::scenes::ScenesPlugin;
use border_wars::CurrentScene;
fn main() {
App::new()
.add_plugins(DefaultPlugins)
.add_state::<CurrentScene>()
.add_plugins(ScenesPlugin)
.run();
CoCo_Sol marked this conversation as resolved Outdated
tipragot commented 2024-02-10 17:13:23 +00:00
Outdated
Review
Copy link

Add it in the ScenesPlugin instead.

Add it in the ScenesPlugin instead.
}

5
crates/border-wars/src/scenes/menu.rs
View file

@ -10,10 +10,7 @@ pub struct MenuPlugin;
impl Plugin for MenuPlugin {
fn build(&self, app: &mut App) {
app.add_systems(
Update,
menu_ui.run_if(state_exists_and_equals(CurrentScene::Menu)),
CoCo_Sol marked this conversation as resolved Outdated
tipragot commented 2024-02-10 17:12:28 +00:00
Outdated
Review
Copy link

If the resource is always initialized, there is no need to check for existence. Use in_state instead.

If the resource is always initialized, there is no need to check for existence. Use in_state instead.
);
app.add_systems(Update, menu_ui.run_if(in_state(CurrentScene::Menu)));
}
}
CoCo_Sol marked this conversation as resolved Outdated
tipragot commented 2024-02-10 17:03:16 +00:00
Outdated
Review
Copy link

Change GameState to CurrentScene or Scene

Change GameState to CurrentScene or Scene
/// Display the UI of the menu to host a game or join one.

6
crates/border-wars/src/scenes/mod.rs
View file

@ -3,6 +3,8 @@
use bevy::prelude::*;
use bevy_egui::EguiPlugin;
use crate::CurrentScene;
pub mod menu;
CoCo_Sol marked this conversation as resolved Outdated
tipragot commented 2024-02-10 16:56:29 +00:00
Outdated
Review
Copy link

Rename this to ScenePlugin

Rename this to ScenePlugin
/// The plugin for all scenes.
@ -10,6 +12,8 @@ pub struct ScenesPlugin;
impl Plugin for ScenesPlugin {
fn build(&self, app: &mut App) {
app.add_plugins(EguiPlugin).add_plugins(menu::MenuPlugin);
app.add_plugins(EguiPlugin)
.add_state::<CurrentScene>()
.add_plugins(menu::MenuPlugin);
}
}