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

WIP: Adding the menu #110

Draft
raphael wants to merge 13 commits from new-menu into main
pull from: new-menu
merge into: fish-cannard:main
Conversation 0 Commits 13 Files changed 15 +33 -44
1 changed files with 33 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 20a9bcf08f - Show all commits

37
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}; use crate::{CurrentScene, Player, Scene};
/// The plugin for the menu. /// The plugin for the menu.
pub struct MenuPlugin; pub struct MenuPlugin;
@ -85,7 +85,7 @@ fn menu_ui(
#[derive(Component)] #[derive(Component)]
struct MenuEntity; struct MenuEntity;
type TargetScene = CurrentScene; type TargetScene = crate::Scene;
fn menu_ui2(mut commands: Commands, asset_server: Res<AssetServer>) { fn menu_ui2(mut commands: Commands, asset_server: Res<AssetServer>) {
commands commands
@ -126,7 +126,7 @@ fn menu_ui2(mut commands: Commands, asset_server: Res<AssetServer>) {
top: Val::Px(25.), top: Val::Px(25.),
bottom: Val::Auto, bottom: Val::Auto,
}, },
CurrentScene::Lobby, TargetScene::Lobby,
&mut commands, &mut commands,
HoveredTexture { HoveredTexture {
texture: asset_server.load("menu/info.png"), texture: asset_server.load("menu/info.png"),
@ -163,8 +163,7 @@ fn renderer(commands: &mut ChildBuilder, asset_server: &Res<AssetServer>) {
(UiImage { (UiImage {
texture: asset_server.load("menu/border_wars.png"), texture: asset_server.load("menu/border_wars.png"),
..default() ..default()
}, },),
),
Val::Px(78.), Val::Px(78.),
Val::Px(614.), Val::Px(614.),
Val::Px(25.), Val::Px(25.),
@ -176,8 +175,7 @@ fn renderer(commands: &mut ChildBuilder, asset_server: &Res<AssetServer>) {
(UiImage { (UiImage {
texture: asset_server.load("menu/host_icon.png"), texture: asset_server.load("menu/host_icon.png"),
..default() ..default()
}, },),
),
Val::Px(42.), Val::Px(42.),
Val::Px(53.), Val::Px(53.),
Val::Px(223.), Val::Px(223.),
@ -189,8 +187,7 @@ fn renderer(commands: &mut ChildBuilder, asset_server: &Res<AssetServer>) {
(UiImage { (UiImage {
texture: asset_server.load("menu/host.png"), texture: asset_server.load("menu/host.png"),
..default() ..default()
}, },),
),
Val::Px(38.), Val::Px(38.),
Val::Px(105.), Val::Px(105.),
Val::Px(229.), Val::Px(229.),
@ -202,8 +199,7 @@ fn renderer(commands: &mut ChildBuilder, asset_server: &Res<AssetServer>) {
(UiImage { (UiImage {
texture: asset_server.load("menu/trait.png"), texture: asset_server.load("menu/trait.png"),
..default() ..default()
}, },),
),
Val::Px(7.), Val::Px(7.),
Val::Px(427.), Val::Px(427.),
Val::Px(279.), Val::Px(279.),
@ -215,8 +211,7 @@ fn renderer(commands: &mut ChildBuilder, asset_server: &Res<AssetServer>) {
(UiImage { (UiImage {
texture: asset_server.load("menu/button.png"), texture: asset_server.load("menu/button.png"),
..default() ..default()
}, },),
),
Val::Px(34.), Val::Px(34.),
Val::Px(253.), Val::Px(253.),
Val::Px(299.), Val::Px(299.),
@ -228,8 +223,7 @@ fn renderer(commands: &mut ChildBuilder, asset_server: &Res<AssetServer>) {
(UiImage { (UiImage {
texture: asset_server.load("menu/join_icon.png"), texture: asset_server.load("menu/join_icon.png"),
..default() ..default()
}, },),
),
Val::Px(41.), Val::Px(41.),
Val::Px(63.), Val::Px(63.),
Val::Px(393.), Val::Px(393.),
@ -241,8 +235,7 @@ fn renderer(commands: &mut ChildBuilder, asset_server: &Res<AssetServer>) {
(UiImage { (UiImage {
texture: asset_server.load("menu/join.png"), texture: asset_server.load("menu/join.png"),
..default() ..default()
}, },),
),
Val::Px(38.), Val::Px(38.),
Val::Px(101.), Val::Px(101.),
Val::Px(392.), Val::Px(392.),
@ -254,8 +247,7 @@ fn renderer(commands: &mut ChildBuilder, asset_server: &Res<AssetServer>) {
(UiImage { (UiImage {
texture: asset_server.load("menu/trait.png"), texture: asset_server.load("menu/trait.png"),
..default() ..default()
}, },),
),
Val::Px(7.), Val::Px(7.),
Val::Px(427.), Val::Px(427.),
Val::Px(443.), Val::Px(443.),
@ -267,8 +259,7 @@ fn renderer(commands: &mut ChildBuilder, asset_server: &Res<AssetServer>) {
(UiImage { (UiImage {
texture: asset_server.load("menu/button.png"), texture: asset_server.load("menu/button.png"),
..default() ..default()
}, },),
),
Val::Px(34.), Val::Px(34.),
Val::Px(253.), Val::Px(253.),
Val::Px(463.), Val::Px(463.),
@ -280,14 +271,12 @@ fn renderer(commands: &mut ChildBuilder, asset_server: &Res<AssetServer>) {
(UiImage { (UiImage {
texture: asset_server.load("menu/airplane.png"), texture: asset_server.load("menu/airplane.png"),
..default() ..default()
}, },),
),
Val::Px(30.), Val::Px(30.),
Val::Px(35.), Val::Px(35.),
Val::Px(465.), Val::Px(465.),
Val::Px(777.), Val::Px(777.),
); );
} }
fn render<T: Bundle>( fn render<T: Bundle>(