save
Some checks failed
Rust Checks / checks (push) Failing after 1m38s

This commit is contained in:
CoCo_Sol 2024-03-31 22:52:19 +02:00
parent 1275c9e24c
commit 0aaf000c47

View file

@ -2,7 +2,7 @@
use bevy::prelude::*; use bevy::prelude::*;
use crate::{change_scaling, CurrentScene}; use crate::CurrentScene;
/// The plugin for the menu. /// The plugin for the menu.
pub struct MenuPlugin; pub struct MenuPlugin;
@ -16,7 +16,7 @@ impl Plugin for MenuPlugin {
} }
} }
/// TODO /// A Component to identify hovered textures.
#[derive(Component, Clone)] #[derive(Component, Clone)]
struct HoveredTexture { struct HoveredTexture {
/// TODO /// TODO
@ -26,7 +26,8 @@ struct HoveredTexture {
hovered_texture: Handle<Image>, hovered_texture: Handle<Image>,
} }
/// TODO /// A Component to identify menus entities.
/// In order to be able to remove them later.
#[derive(Component)] #[derive(Component)]
struct MenuEntity; struct MenuEntity;
@ -59,7 +60,7 @@ fn menu_ui(mut commands: Commands, asset_server: Res<AssetServer>) {
&mut commands, &mut commands,
HoveredTexture { HoveredTexture {
texture: asset_server.load("setting.png"), texture: asset_server.load("setting.png"),
hovered_texture: asset_server.load("setting.png"), hovered_texture: asset_server.load("info.png"),
}, },
); );
@ -74,12 +75,12 @@ fn menu_ui(mut commands: Commands, asset_server: Res<AssetServer>) {
&mut commands, &mut commands,
HoveredTexture { HoveredTexture {
texture: asset_server.load("info.png"), texture: asset_server.load("info.png"),
hovered_texture: asset_server.load("info.png"), hovered_texture: asset_server.load("setting.png"),
}, },
); );
} }
/// TODO /// A function to create a side button.
fn create_side_button( fn create_side_button(
margin: UiRect, margin: UiRect,
target_scene: CurrentScene, target_scene: CurrentScene,
@ -119,7 +120,7 @@ fn create_button(
image: textures.texture.clone().into(), image: textures.texture.clone().into(),
..default() ..default()
}) })
.insert((target_scene, textures, MenuEntity)); .insert((target_scene, textures));
} }
/// TODO /// TODO
@ -163,8 +164,7 @@ fn default_style() -> Style {
/// TODO /// TODO
fn main_node(main_node: &mut ChildBuilder<'_, '_, '_>, asset_server: &Res<AssetServer>) { fn main_node(main_node: &mut ChildBuilder<'_, '_, '_>, asset_server: &Res<AssetServer>) {
main_node main_node.spawn(ImageBundle {
.spawn(ImageBundle {
style: Style { style: Style {
height: Val::Px(78.), height: Val::Px(78.),
width: Val::Px(614.), width: Val::Px(614.),
@ -178,8 +178,7 @@ fn main_node(main_node: &mut ChildBuilder<'_, '_, '_>, asset_server: &Res<AssetS
}, },
image: asset_server.load("border_wars.png").into(), image: asset_server.load("border_wars.png").into(),
..default() ..default()
}) });
.insert(MenuEntity);
main_node main_node
.spawn(NodeBundle { .spawn(NodeBundle {
@ -203,13 +202,11 @@ fn main_node(main_node: &mut ChildBuilder<'_, '_, '_>, asset_server: &Res<AssetS
style: default_style(), style: default_style(),
..default() ..default()
}) })
.insert(MenuEntity)
.with_children(|host| { .with_children(|host| {
host.spawn(NodeBundle { host.spawn(NodeBundle {
style: default_style(), style: default_style(),
..default() ..default()
}) })
.insert(MenuEntity)
.with_children(|ui| { .with_children(|ui| {
ui.spawn(NodeBundle { ui.spawn(NodeBundle {
style: Style { style: Style {
@ -268,13 +265,11 @@ fn main_node(main_node: &mut ChildBuilder<'_, '_, '_>, asset_server: &Res<AssetS
style: default_style(), style: default_style(),
..default() ..default()
}) })
.insert(MenuEntity)
.with_children(|join| { .with_children(|join| {
join.spawn(NodeBundle { join.spawn(NodeBundle {
style: default_style(), style: default_style(),
..default() ..default()
}) })
.insert(MenuEntity)
.with_children(|ui| { .with_children(|ui| {
ui.spawn(NodeBundle { ui.spawn(NodeBundle {
style: Style { style: Style {