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

renaming
Some checks failed
Rust Checks / checks (push) Failing after 2m16s
Details
Rust Checks / checks (pull_request) Failing after 2m10s
Details

Browse source
This commit is contained in:
raphael 2024-04-06 14:44:16 +02:00
parent f130b923cc
commit 43f9eac55f
1 changed files with 66 additions and 66 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -7,7 +7,7 @@ use bevy_egui::{egui, EguiContexts};
use crate::networking::connection::RequestJoin; use crate::networking::connection::RequestJoin;
use crate::networking::PlayerRank; use crate::networking::PlayerRank;
use crate::ui::hover::HoveredTexture; use crate::ui::hover::HoveredTexture;
use crate::{CurrentScene, Player, Scene}; use crate::{CurrentScene, Player};
/// The plugin for the menu. /// The plugin for the menu.
pub struct MenuPlugin; pub struct MenuPlugin;
@ -15,70 +15,70 @@ pub struct MenuPlugin;
impl Plugin for MenuPlugin { impl Plugin for MenuPlugin {
fn build(&self, app: &mut App) { fn build(&self, app: &mut App) {
// app.add_systems(Update, menu_ui.run_if(in_state(CurrentScene::Menu))); // app.add_systems(Update, menu_ui.run_if(in_state(CurrentScene::Menu)));
app.add_systems(OnEnter(CurrentScene::Menu), menu_ui2); app.add_systems(OnEnter(CurrentScene::Menu), menu_ui);
} }
} }
/// Display the UI of the menu to host a game or join one. /// Display the UI of the menu to host a game or join one.
fn menu_ui( // fn old_menu(
mut ctx: EguiContexts, // mut ctx: EguiContexts,
mut connection_string: Local<String>, // mut connection_string: Local<String>,
mut next_scene: ResMut<NextState<CurrentScene>>, // mut next_scene: ResMut<NextState<CurrentScene>>,
mut request_join: EventWriter<SendTo<RequestJoin>>, // mut request_join: EventWriter<SendTo<RequestJoin>>,
mut name: Local<String>, // mut name: Local<String>,
connection: Res<Connection>, // connection: Res<Connection>,
mut commands: Commands, // mut commands: Commands,
) { // ) {
let Some(uuid) = connection.identifier() else { // let Some(uuid) = connection.identifier() else {
return; // return;
}; // };
egui::CentralPanel::default().show(ctx.ctx_mut(), |ui| { // egui::CentralPanel::default().show(ctx.ctx_mut(), |ui| {
ui.heading("Border Wars"); // ui.heading("Border Wars");
ui.separator(); // ui.separator();
ui.label("Name"); // ui.label("Name");
ui.text_edit_singleline(&mut *name); // ui.text_edit_singleline(&mut *name);
ui.separator(); // ui.separator();
ui.label("Connect to an existing game:"); // ui.label("Connect to an existing game:");
ui.horizontal(|ui| { // ui.horizontal(|ui| {
ui.label("Game ID: "); // ui.label("Game ID: ");
ui.text_edit_singleline(&mut *connection_string); // ui.text_edit_singleline(&mut *connection_string);
let Ok(game_id) = Uuid::parse_str(&connection_string) else { // let Ok(game_id) = Uuid::parse_str(&connection_string) else {
return; // return;
}; // };
if ui.button("Join").clicked() { // if ui.button("Join").clicked() {
next_scene.set(CurrentScene::Lobby); // next_scene.set(CurrentScene::Lobby);
request_join.send(SendTo( // request_join.send(SendTo(
game_id, // game_id,
RequestJoin(Player { // RequestJoin(Player {
name: name.clone(), // name: name.clone(),
rank: PlayerRank::Player, // rank: PlayerRank::Player,
uuid, // uuid,
color: rand::random::<(u8, u8, u8)>(), // color: rand::random::<(u8, u8, u8)>(),
}), // }),
)); // ));
} // }
}); // });
ui.separator(); // ui.separator();
if ui.button("Create new game").clicked() { // if ui.button("Create new game").clicked() {
next_scene.set(CurrentScene::Lobby); // next_scene.set(CurrentScene::Lobby);
commands.spawn(Player { // commands.spawn(Player {
name: name.clone(), // name: name.clone(),
rank: PlayerRank::Admin, // rank: PlayerRank::Admin,
uuid, // uuid,
color: rand::random::<(u8, u8, u8)>(), // color: rand::random::<(u8, u8, u8)>(),
}); // });
} // }
}); // });
} // }
/// A Component to identify menus entities. /// A Component to identify menus entities.
/// In order to be able to remove them later. /// In order to be able to remove them later.
@ -87,7 +87,7 @@ struct MenuEntity;
type TargetScene = crate::Scene; type TargetScene = crate::Scene;
fn menu_ui2(mut commands: Commands, asset_server: Res<AssetServer>) { fn menu_ui(mut commands: Commands, asset_server: Res<AssetServer>) {
commands commands
.spawn(ImageBundle { .spawn(ImageBundle {
style: Style { style: Style {
@ -102,7 +102,7 @@ fn menu_ui2(mut commands: Commands, asset_server: Res<AssetServer>) {
..default() ..default()
}) })
.insert(MenuEntity) .insert(MenuEntity)
.with_children(|child: &mut ChildBuilder| renderer(child, &asset_server)); .with_children(|child: &mut ChildBuilder| creation_menu_ui(child, &asset_server));
create_side_button( create_side_button(
UiRect { UiRect {
@ -157,8 +157,8 @@ fn create_side_button(
.insert((target_scene, textures, MenuEntity)); .insert((target_scene, textures, MenuEntity));
} }
fn renderer(commands: &mut ChildBuilder, asset_server: &Res<AssetServer>) { fn creation_menu_ui(commands: &mut ChildBuilder, asset_server: &Res<AssetServer>) {
render( create_object(
commands, commands,
(UiImage { (UiImage {
texture: asset_server.load("menu/border_wars.png"), texture: asset_server.load("menu/border_wars.png"),
@ -170,7 +170,7 @@ fn renderer(commands: &mut ChildBuilder, asset_server: &Res<AssetServer>) {
Val::Px(333.), Val::Px(333.),
); );
render( create_object(
commands, commands,
(UiImage { (UiImage {
texture: asset_server.load("menu/host_icon.png"), texture: asset_server.load("menu/host_icon.png"),
@ -182,7 +182,7 @@ fn renderer(commands: &mut ChildBuilder, asset_server: &Res<AssetServer>) {
Val::Px(356.), Val::Px(356.),
); );
render( create_object(
commands, commands,
(UiImage { (UiImage {
texture: asset_server.load("menu/host.png"), texture: asset_server.load("menu/host.png"),
@ -194,7 +194,7 @@ fn renderer(commands: &mut ChildBuilder, asset_server: &Res<AssetServer>) {
Val::Px(429.), Val::Px(429.),
); );
render( create_object(
commands, commands,
(UiImage { (UiImage {
texture: asset_server.load("menu/trait.png"), texture: asset_server.load("menu/trait.png"),
@ -206,7 +206,7 @@ fn renderer(commands: &mut ChildBuilder, asset_server: &Res<AssetServer>) {
Val::Px(426.), Val::Px(426.),
); );
render( create_object(
commands, commands,
(UiImage { (UiImage {
texture: asset_server.load("menu/button.png"), texture: asset_server.load("menu/button.png"),
@ -218,7 +218,7 @@ fn renderer(commands: &mut ChildBuilder, asset_server: &Res<AssetServer>) {
Val::Px(513.), Val::Px(513.),
); );
render( create_object(
commands, commands,
(UiImage { (UiImage {
texture: asset_server.load("menu/join_icon.png"), texture: asset_server.load("menu/join_icon.png"),
@ -230,7 +230,7 @@ fn renderer(commands: &mut ChildBuilder, asset_server: &Res<AssetServer>) {
Val::Px(353.), Val::Px(353.),
); );
render( create_object(
commands, commands,
(UiImage { (UiImage {
texture: asset_server.load("menu/join.png"), texture: asset_server.load("menu/join.png"),
@ -242,7 +242,7 @@ fn renderer(commands: &mut ChildBuilder, asset_server: &Res<AssetServer>) {
Val::Px(428.), Val::Px(428.),
); );
render( create_object(
commands, commands,
(UiImage { (UiImage {
texture: asset_server.load("menu/trait.png"), texture: asset_server.load("menu/trait.png"),
@ -254,7 +254,7 @@ fn renderer(commands: &mut ChildBuilder, asset_server: &Res<AssetServer>) {
Val::Px(426.), Val::Px(426.),
); );
render( create_object(
commands, commands,
(UiImage { (UiImage {
texture: asset_server.load("menu/button.png"), texture: asset_server.load("menu/button.png"),
@ -266,7 +266,7 @@ fn renderer(commands: &mut ChildBuilder, asset_server: &Res<AssetServer>) {
Val::Px(513.), Val::Px(513.),
); );
render( create_object(
commands, commands,
(UiImage { (UiImage {
texture: asset_server.load("menu/airplane.png"), texture: asset_server.load("menu/airplane.png"),
@ -279,7 +279,7 @@ fn renderer(commands: &mut ChildBuilder, asset_server: &Res<AssetServer>) {
); );
} }
fn render<T: Bundle>( fn create_object<T: Bundle>(
background: &mut ChildBuilder, background: &mut ChildBuilder,
textures: T, textures: T,
height: Val, height: Val,