From af1d9d7159b81835170386325fbfcd12b4878361 Mon Sep 17 00:00:00 2001
From: raphael <lauray@outlook.fr>
Date: Thu, 4 Apr 2024 23:08:55 +0200
Subject: [PATCH] Ajout de l'ui du menu

---
 crates/border-wars/assets/menu/button.png | Bin 0 -> 1873 bytes
 crates/border-wars/src/scenes/menu.rs     | 177 +++++++++++++++++-----
 2 files changed, 142 insertions(+), 35 deletions(-)
 create mode 100644 crates/border-wars/assets/menu/button.png

diff --git a/crates/border-wars/assets/menu/button.png b/crates/border-wars/assets/menu/button.png
new file mode 100644
index 0000000000000000000000000000000000000000..c31c44b423c46fa26c0c887902075ede6fceb939
GIT binary patch
literal 1873
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
LNkvXXu0mjfCsdhq

literal 0
HcmV?d00001

diff --git a/crates/border-wars/src/scenes/menu.rs b/crates/border-wars/src/scenes/menu.rs
index dbb7af2..c42c69d 100644
--- a/crates/border-wars/src/scenes/menu.rs
+++ b/crates/border-wars/src/scenes/menu.rs
@@ -2,8 +2,6 @@
 
 use bevnet::{Connection, SendTo, Uuid};
 use bevy::prelude::*;
-use bevy::render::render_resource::TextureUsages;
-use bevy_egui::egui::epaint::textures;
 use bevy_egui::{egui, EguiContexts};
 
 use crate::networking::connection::RequestJoin;
@@ -101,7 +99,8 @@ fn menu_ui2(mut commands: Commands, asset_server: Res<AssetServer>) {
             z_index: ZIndex::Local(0),
             ..default()
         })
-        .insert(MenuEntity);
+        .insert(MenuEntity)
+        .with_children(|child: &mut ChildBuilder| renderer(child, &asset_server));
 
     create_side_button(
         UiRect {
@@ -132,20 +131,6 @@ fn menu_ui2(mut commands: Commands, asset_server: Res<AssetServer>) {
             hovered_texture: asset_server.load("menu/info_hover.png"),
         },
     );
-
-    renderer(
-        &asset_server,
-        commands,
-        Some(HoveredTexture {
-            texture: asset_server.load("menu/border_wars.png"),
-            hovered_texture: asset_server.load("menu/border_wars.png"),
-        }),
-        None,
-        Val::Px(78.),
-        Val::Px(614.),
-        Val::Px(25.),
-        Val::Px(333.),
-    )
 }
 
 /// A function to create a side button.
@@ -170,36 +155,158 @@ fn create_side_button(
         .insert((target_scene, textures, MenuEntity));
 }
 
-fn renderer(
-    asset_server: &Res<AssetServer>,
-    mut background: Commands,
-    textures: Option<HoveredTexture>,
-    texture: Option<&str>,
+fn renderer(commands: &mut ChildBuilder, asset_server: &Res<AssetServer>) {
+    render(
+        commands,
+        (UiImage {
+                texture: asset_server.load("menu/border_wars.png"),
+                ..default()
+            },
+        ),
+        Val::Px(78.),
+        Val::Px(614.),
+        Val::Px(25.),
+        Val::Px(333.),
+    );
+
+    render(
+        commands,
+        (UiImage {
+                texture: asset_server.load("menu/host_icon.png"),
+                ..default()
+            },
+        ),
+        Val::Px(42.),
+        Val::Px(53.),
+        Val::Px(223.),
+        Val::Px(356.),
+    );
+
+    render(
+        commands,
+        (UiImage {
+                texture: asset_server.load("menu/host.png"),
+                ..default()
+            },
+        ),
+        Val::Px(38.),
+        Val::Px(105.),
+        Val::Px(229.),
+        Val::Px(429.),
+    );
+
+    render(
+        commands,
+        (UiImage {
+                texture: asset_server.load("menu/trait.png"),
+                ..default()
+            },
+        ),
+        Val::Px(7.),
+        Val::Px(427.),
+        Val::Px(279.),
+        Val::Px(426.),
+    );
+
+    render(
+        commands,
+        (UiImage {
+                texture: asset_server.load("menu/button.png"),
+                ..default()
+            },
+        ),
+        Val::Px(34.),
+        Val::Px(253.),
+        Val::Px(299.),
+        Val::Px(513.),
+    );
+
+    render(
+        commands,
+        (UiImage {
+                texture: asset_server.load("menu/join_icon.png"),
+                ..default()
+            },
+        ),
+        Val::Px(41.),
+        Val::Px(63.),
+        Val::Px(393.),
+        Val::Px(353.),
+    );
+
+    render(
+        commands,
+        (UiImage {
+                texture: asset_server.load("menu/join.png"),
+                ..default()
+            },
+        ),
+        Val::Px(38.),
+        Val::Px(101.),
+        Val::Px(392.),
+        Val::Px(428.),
+    );
+
+    render(
+        commands,
+        (UiImage {
+                texture: asset_server.load("menu/trait.png"),
+                ..default()
+            },
+        ),
+        Val::Px(7.),
+        Val::Px(427.),
+        Val::Px(443.),
+        Val::Px(426.),
+    );
+
+    render(
+        commands,
+        (UiImage {
+                texture: asset_server.load("menu/button.png"),
+                ..default()
+            },
+        ),
+        Val::Px(34.),
+        Val::Px(253.),
+        Val::Px(463.),
+        Val::Px(513.),
+    );
+
+    render(
+        commands,
+        (UiImage {
+                texture: asset_server.load("menu/airplane.png"),
+                ..default()
+            },
+        ),
+        Val::Px(30.),
+        Val::Px(35.),
+        Val::Px(465.),
+        Val::Px(777.),
+    );
+
+}
+
+fn render<T: Bundle>(
+    background: &mut ChildBuilder,
+    textures: T,
     height: Val,
     width: Val,
     top: Val,
     left: Val,
 ) {
-    let mut i = background
+    background
         .spawn(ImageBundle {
             style: Style {
                 height,
                 width,
                 top,
                 left,
+                position_type: PositionType::Absolute,
                 ..default()
             },
-            image: match textures {
-                Some(ref textures) => textures.texture.clone().into(),
-                _ => match texture {
-                    Some(texture) => asset_server.load(texture).into(),
-                    _ => panic!("PAS DE TEXTURES FRER"),
-                },
-            },
             ..default()
-        });
-        if textures.is_some() {
-            i.insert(textures.unwrap());
-        }
-        
+        })
+        .insert(textures);
 }