generated from tipragot/rust
Change of file structure for scenes #38
|
@ -6,7 +6,7 @@ pub mod scenes;
|
|||
|
||||
/// The state of the game.
|
||||
CoCo_Sol marked this conversation as resolved
Outdated
|
||||
#[derive(Debug, Clone, Copy, Default, Eq, PartialEq, Hash, States)]
|
||||
pub enum GameState {
|
||||
pub enum CurrentScene {
|
||||
/// When we are in the main menu.
|
||||
#[default]
|
||||
Menu,
|
||||
|
|
|
@ -2,12 +2,12 @@
|
|||
|
||||
use bevy::prelude::*;
|
||||
use border_wars::scenes::ScenesPlugin;
|
||||
use border_wars::GameState;
|
||||
use border_wars::CurrentScene;
|
||||
|
||||
fn main() {
|
||||
App::new()
|
||||
.add_plugins(DefaultPlugins)
|
||||
.add_state::<GameState>()
|
||||
.add_state::<CurrentScene>()
|
||||
CoCo_Sol marked this conversation as resolved
Outdated
tipragot
commented
Add it in the ScenesPlugin instead. Add it in the ScenesPlugin instead.
|
||||
.add_plugins(ScenesPlugin)
|
||||
.run();
|
||||
}
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
use bevy::prelude::*;
|
||||
use bevy_egui::{egui, EguiContexts};
|
||||
|
||||
use crate::GameState;
|
||||
use crate::CurrentScene;
|
||||
|
||||
/// The plugin for the menu.
|
||||
pub struct MenuPlugin;
|
||||
|
@ -12,7 +12,7 @@ impl Plugin for MenuPlugin {
|
|||
fn build(&self, app: &mut App) {
|
||||
app.add_systems(
|
||||
Update,
|
||||
menu_ui.run_if(state_exists_and_equals(GameState::Menu)),
|
||||
CoCo_Sol marked this conversation as resolved
Outdated
tipragot
commented
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.
|
||||
menu_ui.run_if(state_exists_and_equals(CurrentScene::Menu)),
|
||||
CoCo_Sol marked this conversation as resolved
Outdated
tipragot
commented
Change GameState to CurrentScene or Scene Change GameState to CurrentScene or Scene
|
||||
);
|
||||
}
|
||||
}
|
||||
|
@ -20,7 +20,7 @@ impl Plugin for MenuPlugin {
|
|||
fn menu_ui(
|
||||
CoCo_Sol marked this conversation as resolved
Outdated
tipragot
commented
next_scene next_scene
|
||||
mut ctx: EguiContexts,
|
||||
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| {
|
||||
ui.heading("Border Wars");
|
||||
|
@ -33,7 +33,7 @@ fn menu_ui(
|
|||
ui.text_edit_singleline(&mut *connection_string);
|
||||
|
||||
if ui.button("Join").clicked() {
|
||||
next_state.set(GameState::Game);
|
||||
next_state.set(CurrentScene::Game);
|
||||
// TODO: connect to the game
|
||||
}
|
||||
});
|
||||
|
@ -41,7 +41,7 @@ fn menu_ui(
|
|||
ui.separator();
|
||||
|
||||
if ui.button("Create new game").clicked() {
|
||||
next_state.set(GameState::Lobby);
|
||||
next_state.set(CurrentScene::Lobby);
|
||||
// TODO: create a new game
|
||||
}
|
||||
});
|
||||
|
|
Loading…
Reference in a new issue
Rename