diff --git a/crates/border-wars/assets/border_wars.png b/crates/border-wars/assets/border_wars.png new file mode 100644 index 0000000..f1ead7f Binary files /dev/null and b/crates/border-wars/assets/border_wars.png differ diff --git a/crates/border-wars/assets/button.png b/crates/border-wars/assets/button.png new file mode 100644 index 0000000..c31c44b Binary files /dev/null and b/crates/border-wars/assets/button.png differ diff --git a/crates/border-wars/assets/button_menu_icon.png b/crates/border-wars/assets/button_menu_icon.png deleted file mode 100644 index 9679078..0000000 Binary files a/crates/border-wars/assets/button_menu_icon.png and /dev/null differ diff --git a/crates/border-wars/assets/button_menu_icon_hover.png b/crates/border-wars/assets/button_menu_icon_hover.png deleted file mode 100644 index 061f334..0000000 Binary files a/crates/border-wars/assets/button_menu_icon_hover.png and /dev/null differ diff --git a/crates/border-wars/assets/button_settings_icon.png b/crates/border-wars/assets/button_settings_icon.png deleted file mode 100644 index 51e67b9..0000000 Binary files a/crates/border-wars/assets/button_settings_icon.png and /dev/null differ diff --git a/crates/border-wars/assets/button_settings_icon_hover.png b/crates/border-wars/assets/button_settings_icon_hover.png deleted file mode 100644 index 4f7f284..0000000 Binary files a/crates/border-wars/assets/button_settings_icon_hover.png and /dev/null differ diff --git a/crates/border-wars/assets/bw.png b/crates/border-wars/assets/bw.png deleted file mode 100644 index b03136c..0000000 Binary files a/crates/border-wars/assets/bw.png and /dev/null differ diff --git a/crates/border-wars/assets/bw_menu_bg.png b/crates/border-wars/assets/bw_menu_bg.png new file mode 100644 index 0000000..1f9b38b Binary files /dev/null and b/crates/border-wars/assets/bw_menu_bg.png differ diff --git a/crates/border-wars/assets/host.png b/crates/border-wars/assets/host.png index fd0acf0..bd19fe5 100644 Binary files a/crates/border-wars/assets/host.png and b/crates/border-wars/assets/host.png differ diff --git a/crates/border-wars/assets/host_icon.png b/crates/border-wars/assets/host_icon.png new file mode 100644 index 0000000..8ed4215 Binary files /dev/null and b/crates/border-wars/assets/host_icon.png differ diff --git a/crates/border-wars/assets/info.png b/crates/border-wars/assets/info.png new file mode 100644 index 0000000..7ce0889 Binary files /dev/null and b/crates/border-wars/assets/info.png differ diff --git a/crates/border-wars/assets/join.png b/crates/border-wars/assets/join.png index 26b453e..fbeb77e 100644 Binary files a/crates/border-wars/assets/join.png and b/crates/border-wars/assets/join.png differ diff --git a/crates/border-wars/assets/join_icon.png b/crates/border-wars/assets/join_icon.png new file mode 100644 index 0000000..6c09df5 Binary files /dev/null and b/crates/border-wars/assets/join_icon.png differ diff --git a/crates/border-wars/assets/setting.png b/crates/border-wars/assets/setting.png new file mode 100644 index 0000000..50895d0 Binary files /dev/null and b/crates/border-wars/assets/setting.png differ diff --git a/crates/border-wars/assets/trait.png b/crates/border-wars/assets/trait.png new file mode 100644 index 0000000..9d54aec Binary files /dev/null and b/crates/border-wars/assets/trait.png differ diff --git a/crates/border-wars/src/scenes/menu.rs b/crates/border-wars/src/scenes/menu.rs index 82990c3..aace5d3 100644 --- a/crates/border-wars/src/scenes/menu.rs +++ b/crates/border-wars/src/scenes/menu.rs @@ -10,9 +10,9 @@ pub struct MenuPlugin; impl Plugin for MenuPlugin { fn build(&self, app: &mut App) { app.add_systems(OnEnter(CurrentScene::Menu), menu_ui); - app.add_systems(Update, change_scaling); - app.add_systems(Update, hover_system); - app.add_systems(Update, pressed_system); + // app.add_systems(Update, change_scaling); + // app.add_systems(Update, hover_system); + // app.add_systems(Update, pressed_system); app.add_systems(OnExit(CurrentScene::Menu), destroy_menu); } } @@ -33,9 +33,8 @@ struct MenuEntity; /// Display the UI of the menu to host a game or join one. fn menu_ui(mut commands: Commands, asset_server: Res) { - commands - .spawn(NodeBundle { + .spawn(ImageBundle { style: Style { margin: UiRect::all(Val::Auto), width: Val::Px(1280.), @@ -43,6 +42,7 @@ fn menu_ui(mut commands: Commands, asset_server: Res) { flex_direction: FlexDirection::Column, ..default() }, + image: asset_server.load("bw_menu_bg.png").into(), z_index: ZIndex::Local(0), ..default() }) @@ -59,8 +59,8 @@ fn menu_ui(mut commands: Commands, asset_server: Res) { CurrentScene::Setting, &mut commands, HoveredTexture { - texture: asset_server.load("button_settings_icon.png"), - hovered_texture: asset_server.load("button_settings_icon_hover.png"), + texture: asset_server.load("setting.png"), + hovered_texture: asset_server.load("setting.png"), }, ); @@ -74,8 +74,8 @@ fn menu_ui(mut commands: Commands, asset_server: Res) { CurrentScene::Lobby, &mut commands, HoveredTexture { - texture: asset_server.load("button_menu_icon.png"), - hovered_texture: asset_server.load("button_menu_icon_hover.png"), + texture: asset_server.load("info.png"), + hovered_texture: asset_server.load("info.png"), }, ); } @@ -90,7 +90,7 @@ fn create_side_button( commands .spawn(ButtonBundle { style: Style { - width: Val::Px(75.), + width: Val::Px(53.), aspect_ratio: Some(1.), margin, ..default() @@ -111,8 +111,8 @@ fn create_button( commands .spawn(ButtonBundle { style: Style { - width: Val::Px(266.), - height: Val::Px(70.), + width: Val::Px(297.), + height: Val::Px(40.), margin: UiRect::all(Val::Auto), ..default() }, @@ -156,7 +156,7 @@ fn default_style() -> Style { Style { flex_direction: FlexDirection::Column, width: Val::Percent(100.), - height: Val::Percent(55.), + height: Val::Percent(40.), margin: UiRect::all(Val::Auto), ..default() } @@ -167,17 +167,17 @@ fn main_node(main_node: &mut ChildBuilder<'_, '_, '_>, asset_server: &Res, asset_server: &Res, asset_server: &Res, asset_server: &Res