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 +8 -8
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit e31a420bab - Show all commits

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

@ -6,7 +6,7 @@ pub mod scenes;
/// The state of the game. /// The state of the game.
CoCo_Sol marked this conversation as resolved Outdated
tipragot commented 2024-02-10 17:09:02 +00:00
Outdated
Review
Copy link

Rename

Rename
#[derive(Debug, Clone, Copy, Default, Eq, PartialEq, Hash, States)] #[derive(Debug, Clone, Copy, Default, Eq, PartialEq, Hash, States)]
pub enum GameState { pub enum CurrentScene {
/// When we are in the main menu. /// When we are in the main menu.
#[default] #[default]
Menu, Menu,

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

@ -2,12 +2,12 @@
use bevy::prelude::*; use bevy::prelude::*;
use border_wars::scenes::ScenesPlugin; use border_wars::scenes::ScenesPlugin;
use border_wars::GameState; use border_wars::CurrentScene;
fn main() { fn main() {
App::new() App::new()
.add_plugins(DefaultPlugins) .add_plugins(DefaultPlugins)
.add_state::<GameState>() .add_state::<CurrentScene>()
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.
.add_plugins(ScenesPlugin) .add_plugins(ScenesPlugin)
.run(); .run();
} }

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

@ -3,7 +3,7 @@
use bevy::prelude::*; use bevy::prelude::*;
use bevy_egui::{egui, EguiContexts}; use bevy_egui::{egui, EguiContexts};
use crate::GameState; use crate::CurrentScene;
/// The plugin for the menu. /// The plugin for the menu.
pub struct MenuPlugin; pub struct MenuPlugin;
@ -12,7 +12,7 @@ impl Plugin for MenuPlugin {
fn build(&self, app: &mut App) { fn build(&self, app: &mut App) {
app.add_systems( app.add_systems(
Update, Update,
menu_ui.run_if(state_exists_and_equals(GameState::Menu)), 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.
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
); );
} }
} }
@ -20,7 +20,7 @@ impl Plugin for MenuPlugin {
fn menu_ui( fn menu_ui(
CoCo_Sol marked this conversation as resolved Outdated
tipragot commented 2024-02-10 17:20:01 +00:00
Outdated
Review
Copy link

next_scene

next_scene
mut ctx: EguiContexts, mut ctx: EguiContexts,
mut connection_string: Local<String>, mut connection_string: Local<String>,
mut next_state: ResMut<NextState<GameState>>, mut next_state: ResMut<NextState<CurrentScene>>,
) { ) {
egui::CentralPanel::default().show(ctx.ctx_mut(), |ui| { egui::CentralPanel::default().show(ctx.ctx_mut(), |ui| {
ui.heading("Border Wars"); ui.heading("Border Wars");
@ -33,7 +33,7 @@ fn menu_ui(
ui.text_edit_singleline(&mut *connection_string); ui.text_edit_singleline(&mut *connection_string);
if ui.button("Join").clicked() { if ui.button("Join").clicked() {
next_state.set(GameState::Game); next_state.set(CurrentScene::Game);
// TODO: connect to the game // TODO: connect to the game
} }
}); });
@ -41,7 +41,7 @@ fn menu_ui(
ui.separator(); ui.separator();
if ui.button("Create new game").clicked() { if ui.button("Create new game").clicked() {
next_state.set(GameState::Lobby); next_state.set(CurrentScene::Lobby);
// TODO: create a new game // TODO: create a new game
} }
}); });