From 33e21f2759764802b39253852aac3d69c2388afc Mon Sep 17 00:00:00 2001 From: Evan Pratten Date: Fri, 1 Apr 2022 23:48:05 -0400 Subject: [PATCH 1/8] Add main menu file --- game/game_logic/src/scenes/main_menu.rs | 67 +++++++++++++++++++++++++ game/game_logic/src/scenes/mod.rs | 22 ++++++-- 2 files changed, 84 insertions(+), 5 deletions(-) create mode 100644 game/game_logic/src/scenes/main_menu.rs diff --git a/game/game_logic/src/scenes/main_menu.rs b/game/game_logic/src/scenes/main_menu.rs new file mode 100644 index 00000000..da3d1dec --- /dev/null +++ b/game/game_logic/src/scenes/main_menu.rs @@ -0,0 +1,67 @@ +//! This scene encompasses the main menu system + +use nalgebra as na; +use raylib::prelude::*; + +use crate::{ + discord::{DiscordChannel, DiscordRpcSignal}, + global_resource_package::GlobalResources, + project_constants::ProjectConstants, +}; + +#[derive(Debug)] +pub struct MainMenu { + has_updated_discord_rpc: bool, +} + +impl MainMenu { + /// Construct a new `MainMenu` + pub fn new( + raylib_handle: &mut RaylibHandle, + thread: &RaylibThread, + constants: &ProjectConstants, + ) -> Self { + Self { + has_updated_discord_rpc: false, + } + } + + /// Handler for each frame + pub async fn render_frame( + &mut self, + raylib: &mut RaylibHandle, + rl_thread: &RaylibThread, + discord: &DiscordChannel, + global_resources: &GlobalResources, + constants: &ProjectConstants, + ) -> bool { + // Handle updating discord RPC + if !self.has_updated_discord_rpc { + discord + .send(DiscordRpcSignal::EndGameTimer) + .await + .unwrap(); + discord + .send(DiscordRpcSignal::ChangeDetails { + details: "Looking at a menu".to_string(), + party_status: None, + }) + .await + .unwrap(); + self.has_updated_discord_rpc = true; + } + + // Get a drawing handle + let mut draw = raylib.begin_drawing(rl_thread); + + // Clear the screen + draw.clear_background(Color::WHITE); + + // TODO: Render stuff + + + // Return true if you want the game to start. + // Otherwise, keep returning false until the player clicks the start button + return false; + } +} diff --git a/game/game_logic/src/scenes/mod.rs b/game/game_logic/src/scenes/mod.rs index 940ccafd..41fe528a 100644 --- a/game/game_logic/src/scenes/mod.rs +++ b/game/game_logic/src/scenes/mod.rs @@ -10,16 +10,19 @@ use crate::{ project_constants::ProjectConstants, }; -use self::{player_interaction::PlayableScene, test_fox::TestFoxScene}; +use self::{player_interaction::PlayableScene, test_fox::TestFoxScene, main_menu::MainMenu}; mod player_interaction; mod test_fox; +mod main_menu; /// Delegate for handling rendering. /// This is a struct to allow for stateful data (like sub-screens) to be set up pub struct SceneRenderDelegate { + is_in_main_menu: bool, /* Scenes */ scene_test_fox: TestFoxScene, scene_playable: PlayableScene, + scene_main_menu: MainMenu } impl SceneRenderDelegate { @@ -34,10 +37,13 @@ impl SceneRenderDelegate { // Init some scenes let scene_test_fox = TestFoxScene::new(raylib, rl_thread); let scene_playable = PlayableScene::new(raylib, rl_thread, constants); + let scene_main_menu = MainMenu::new(raylib, rl_thread, constants); Self { + is_in_main_menu: true, scene_test_fox, scene_playable, + scene_main_menu, } } @@ -52,10 +58,16 @@ impl SceneRenderDelegate { global_resources: &GlobalResources, constants: &ProjectConstants, ) { - // For now, we will just render the game scene - self.scene_playable - .render_frame(raylib, rl_thread, &discord, global_resources, constants) - .await; + // Render the main menu if in it, otherwise, render the game + if self.is_in_main_menu { + self.is_in_main_menu = !self.scene_main_menu + .render_frame(raylib, rl_thread, discord, global_resources, constants) + .await; + }else { + self.scene_playable + .render_frame(raylib, rl_thread, &discord, global_resources, constants) + .await; + } } } From fc8c9e8f025f6615d74828c14035c988bba0c2b0 Mon Sep 17 00:00:00 2001 From: Marcelo Geldres Date: Sat, 2 Apr 2022 09:18:56 -0400 Subject: [PATCH 2/8] Main Menu Initial Layout --- game/game_logic/src/scenes/main_menu.rs | 57 ++++++++++++++++++++++++- 1 file changed, 55 insertions(+), 2 deletions(-) diff --git a/game/game_logic/src/scenes/main_menu.rs b/game/game_logic/src/scenes/main_menu.rs index da3d1dec..71a1a575 100644 --- a/game/game_logic/src/scenes/main_menu.rs +++ b/game/game_logic/src/scenes/main_menu.rs @@ -1,7 +1,7 @@ //! This scene encompasses the main menu system use nalgebra as na; -use raylib::prelude::*; +use raylib::{prelude::*, ffi::{Texture, GetMouseX, GetMouseY, IsMouseButtonDown}}; use crate::{ discord::{DiscordChannel, DiscordRpcSignal}, @@ -57,8 +57,61 @@ impl MainMenu { // Clear the screen draw.clear_background(Color::WHITE); - // TODO: Render stuff + //I wanna see where mouseeee + unsafe{ + let mut mouseX = GetMouseX(); + let mut mouseY = GetMouseY(); + draw.draw_text((&mouseX.to_string()), 20, 5, 20, Color::BLACK); + draw.draw_text((&mouseY.to_string()), 70, 5, 20, Color::BLACK); + } + + + + // TODO: Render stuff + //Initial Option placeholder words in the main menu + draw.draw_text("Game Title", 100, 90, 60, Color::BLACK); + draw.draw_text("Start Game", 100, 190, 34, Color::BLACK); + draw.draw_text("Options", 100, 250, 34, Color::BLACK); + draw.draw_text("Credits", 100, 410, 34, Color::BLACK); + draw.draw_text("Leaderboard", 100, 470, 34, Color::BLACK); + draw.draw_text("Exit", 100, 550, 34, Color::BLACK); + + //Unsafe block?? + unsafe { + //First two are starting X and Y position, last two finishing X and Y. Made to resemble a box + if GetMouseX() >= 100 && GetMouseY() >= 193 && GetMouseX() <= 290 && GetMouseY() <= 216{ + //Insides while make a lil shade for it to look cool + draw.draw_text("Start Game", 103, 191, 34, Color::GRAY); + draw.draw_text("Start Game", 100, 190, 34, Color::BLACK); + if IsMouseButtonDown(0) { + return true; + } + } + + if GetMouseX() >= 100 && GetMouseY() >= 250 && GetMouseX() <= 222 && GetMouseY() <= 275{ + draw.draw_text("Options", 103, 251, 34, Color::GRAY); + draw.draw_text("Options", 100, 250, 34, Color::BLACK); + + } + + if GetMouseX() >= 100 && GetMouseY() >= 410 && GetMouseX() <= 222 && GetMouseY() <= 437{ + draw.draw_text("Credits", 103, 411, 34, Color::GRAY); + draw.draw_text("Credits", 100, 410, 34, Color::BLACK); + + } + if GetMouseX() >= 100 && GetMouseY() >= 470 && GetMouseX() <= 316 && GetMouseY() <= 496{ + draw.draw_text("Leaderboard", 103, 471, 34, Color::GRAY); + draw.draw_text("Leaderboard", 100, 470, 34, Color::BLACK); + + } + if GetMouseX() >= 100 && GetMouseY() >= 550 && GetMouseX() <= 162 && GetMouseY() <= 575{ + draw.draw_text("Exit", 103, 551, 34, Color::GRAY); + draw.draw_text("Exit", 100, 550, 34, Color::BLACK); + + } + + } // Return true if you want the game to start. // Otherwise, keep returning false until the player clicks the start button From 3fca413dfd5654fec22f6135e874e868ab82ba92 Mon Sep 17 00:00:00 2001 From: Marcelo Geldres Date: Sat, 2 Apr 2022 10:52:39 -0400 Subject: [PATCH 3/8] Unsafe usage Correction --- game/game_logic/src/scenes/main_menu.rs | 33 ++++++++++++------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/game/game_logic/src/scenes/main_menu.rs b/game/game_logic/src/scenes/main_menu.rs index 71a1a575..3c2ebe1c 100644 --- a/game/game_logic/src/scenes/main_menu.rs +++ b/game/game_logic/src/scenes/main_menu.rs @@ -58,15 +58,16 @@ impl MainMenu { draw.clear_background(Color::WHITE); //I wanna see where mouseeee + let mouse_x; + let mouse_y; + unsafe{ - let mut mouseX = GetMouseX(); - let mut mouseY = GetMouseY(); - - draw.draw_text((&mouseX.to_string()), 20, 5, 20, Color::BLACK); - draw.draw_text((&mouseY.to_string()), 70, 5, 20, Color::BLACK); + mouse_x = GetMouseX(); + mouse_y = GetMouseY(); } - + draw.draw_text((&mouse_x.to_string()), 20, 5, 20, Color::BLACK); + draw.draw_text((&mouse_y.to_string()), 70, 5, 20, Color::BLACK); // TODO: Render stuff //Initial Option placeholder words in the main menu @@ -77,42 +78,40 @@ impl MainMenu { draw.draw_text("Leaderboard", 100, 470, 34, Color::BLACK); draw.draw_text("Exit", 100, 550, 34, Color::BLACK); - //Unsafe block?? - unsafe { //First two are starting X and Y position, last two finishing X and Y. Made to resemble a box - if GetMouseX() >= 100 && GetMouseY() >= 193 && GetMouseX() <= 290 && GetMouseY() <= 216{ + if mouse_x >= 100 && mouse_y >= 193 && mouse_x <= 290 && mouse_y <= 216{ //Insides while make a lil shade for it to look cool draw.draw_text("Start Game", 103, 191, 34, Color::GRAY); draw.draw_text("Start Game", 100, 190, 34, Color::BLACK); - if IsMouseButtonDown(0) { - return true; + unsafe{ //I think I still need unsafe here + if IsMouseButtonDown(0) { + return true; + } } } - if GetMouseX() >= 100 && GetMouseY() >= 250 && GetMouseX() <= 222 && GetMouseY() <= 275{ + if mouse_x >= 100 && mouse_y >= 250 && mouse_x <= 222 && mouse_y <= 275{ draw.draw_text("Options", 103, 251, 34, Color::GRAY); draw.draw_text("Options", 100, 250, 34, Color::BLACK); } - if GetMouseX() >= 100 && GetMouseY() >= 410 && GetMouseX() <= 222 && GetMouseY() <= 437{ + if mouse_x >= 100 && mouse_y >= 410 && mouse_x <= 222 && mouse_y <= 437{ draw.draw_text("Credits", 103, 411, 34, Color::GRAY); draw.draw_text("Credits", 100, 410, 34, Color::BLACK); } - if GetMouseX() >= 100 && GetMouseY() >= 470 && GetMouseX() <= 316 && GetMouseY() <= 496{ + if mouse_x >= 100 && mouse_y >= 470 && mouse_x <= 316 && mouse_y <= 496{ draw.draw_text("Leaderboard", 103, 471, 34, Color::GRAY); draw.draw_text("Leaderboard", 100, 470, 34, Color::BLACK); } - if GetMouseX() >= 100 && GetMouseY() >= 550 && GetMouseX() <= 162 && GetMouseY() <= 575{ + if mouse_x >= 100 && mouse_y >= 550 && mouse_x <= 162 && mouse_y <= 575{ draw.draw_text("Exit", 103, 551, 34, Color::GRAY); draw.draw_text("Exit", 100, 550, 34, Color::BLACK); } - } - // Return true if you want the game to start. // Otherwise, keep returning false until the player clicks the start button return false; From 760cd7206dfcd30ff860c009408623731c04a69a Mon Sep 17 00:00:00 2001 From: Marcelo Geldres Date: Sat, 2 Apr 2022 11:26:41 -0400 Subject: [PATCH 4/8] Unsafe blocks fully removed --- game/game_logic/src/scenes/main_menu.rs | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/game/game_logic/src/scenes/main_menu.rs b/game/game_logic/src/scenes/main_menu.rs index 3c2ebe1c..e891d54f 100644 --- a/game/game_logic/src/scenes/main_menu.rs +++ b/game/game_logic/src/scenes/main_menu.rs @@ -58,16 +58,11 @@ impl MainMenu { draw.clear_background(Color::WHITE); //I wanna see where mouseeee - let mouse_x; - let mouse_y; - - unsafe{ - mouse_x = GetMouseX(); - mouse_y = GetMouseY(); - } - - draw.draw_text((&mouse_x.to_string()), 20, 5, 20, Color::BLACK); - draw.draw_text((&mouse_y.to_string()), 70, 5, 20, Color::BLACK); + let mouse_x = draw.get_mouse_x(); + let mouse_y = draw.get_mouse_y(); + + draw.draw_text(&mouse_x.to_string(), 20, 5, 20, Color::BLACK); + draw.draw_text(&mouse_y.to_string(), 70, 5, 20, Color::BLACK); // TODO: Render stuff //Initial Option placeholder words in the main menu @@ -83,11 +78,9 @@ impl MainMenu { //Insides while make a lil shade for it to look cool draw.draw_text("Start Game", 103, 191, 34, Color::GRAY); draw.draw_text("Start Game", 100, 190, 34, Color::BLACK); - unsafe{ //I think I still need unsafe here - if IsMouseButtonDown(0) { + if draw.is_mouse_button_down(MouseButton::MOUSE_LEFT_BUTTON) { return true; } - } } if mouse_x >= 100 && mouse_y >= 250 && mouse_x <= 222 && mouse_y <= 275{ From 0d54f3118b13b1eac7d497378ee5a5e3d0a35b23 Mon Sep 17 00:00:00 2001 From: Evan Pratten Date: Sat, 2 Apr 2022 11:29:43 -0400 Subject: [PATCH 5/8] Menu routing system --- .vscode/settings.json | 1 + game/game_logic/src/scenes/main_menu.rs | 93 ++++++++++++++++++------- game/game_logic/src/scenes/mod.rs | 53 ++++++++++---- 3 files changed, 109 insertions(+), 38 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 1754528f..611d78e5 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,6 +1,7 @@ { "git.detectSubmodules": false, "cSpell.words": [ + "leaderboard", "msaa", "raylib", "repr", diff --git a/game/game_logic/src/scenes/main_menu.rs b/game/game_logic/src/scenes/main_menu.rs index 71a1a575..9131c79a 100644 --- a/game/game_logic/src/scenes/main_menu.rs +++ b/game/game_logic/src/scenes/main_menu.rs @@ -1,7 +1,10 @@ //! This scene encompasses the main menu system use nalgebra as na; -use raylib::{prelude::*, ffi::{Texture, GetMouseX, GetMouseY, IsMouseButtonDown}}; +use raylib::{ + ffi::{GetMouseX, GetMouseY, IsMouseButtonDown, Texture}, + prelude::*, +}; use crate::{ discord::{DiscordChannel, DiscordRpcSignal}, @@ -9,6 +12,16 @@ use crate::{ project_constants::ProjectConstants, }; +#[derive(Debug, Clone)] +pub enum MenuStateSignal { + StartGame, + QuitGame, + DoMainMenu, + DoOptions, + DoCredits, + DoLeaderboard, +} + #[derive(Debug)] pub struct MainMenu { has_updated_discord_rpc: bool, @@ -26,21 +39,17 @@ impl MainMenu { } } - /// Handler for each frame - pub async fn render_frame( + pub async fn render_main_menu_frame( &mut self, raylib: &mut RaylibHandle, rl_thread: &RaylibThread, discord: &DiscordChannel, global_resources: &GlobalResources, constants: &ProjectConstants, - ) -> bool { + ) -> MenuStateSignal { // Handle updating discord RPC if !self.has_updated_discord_rpc { - discord - .send(DiscordRpcSignal::EndGameTimer) - .await - .unwrap(); + discord.send(DiscordRpcSignal::EndGameTimer).await.unwrap(); discord .send(DiscordRpcSignal::ChangeDetails { details: "Looking at a menu".to_string(), @@ -58,15 +67,13 @@ impl MainMenu { draw.clear_background(Color::WHITE); //I wanna see where mouseeee - unsafe{ + unsafe { let mut mouseX = GetMouseX(); let mut mouseY = GetMouseY(); draw.draw_text((&mouseX.to_string()), 20, 5, 20, Color::BLACK); draw.draw_text((&mouseY.to_string()), 70, 5, 20, Color::BLACK); } - - // TODO: Render stuff //Initial Option placeholder words in the main menu @@ -80,41 +87,77 @@ impl MainMenu { //Unsafe block?? unsafe { //First two are starting X and Y position, last two finishing X and Y. Made to resemble a box - if GetMouseX() >= 100 && GetMouseY() >= 193 && GetMouseX() <= 290 && GetMouseY() <= 216{ + if GetMouseX() >= 100 && GetMouseY() >= 193 && GetMouseX() <= 290 && GetMouseY() <= 216 + { //Insides while make a lil shade for it to look cool draw.draw_text("Start Game", 103, 191, 34, Color::GRAY); draw.draw_text("Start Game", 100, 190, 34, Color::BLACK); if IsMouseButtonDown(0) { - return true; + return MenuStateSignal::StartGame; } } - if GetMouseX() >= 100 && GetMouseY() >= 250 && GetMouseX() <= 222 && GetMouseY() <= 275{ + if GetMouseX() >= 100 && GetMouseY() >= 250 && GetMouseX() <= 222 && GetMouseY() <= 275 + { draw.draw_text("Options", 103, 251, 34, Color::GRAY); draw.draw_text("Options", 100, 250, 34, Color::BLACK); - } - if GetMouseX() >= 100 && GetMouseY() >= 410 && GetMouseX() <= 222 && GetMouseY() <= 437{ + if GetMouseX() >= 100 && GetMouseY() >= 410 && GetMouseX() <= 222 && GetMouseY() <= 437 + { draw.draw_text("Credits", 103, 411, 34, Color::GRAY); draw.draw_text("Credits", 100, 410, 34, Color::BLACK); - } - if GetMouseX() >= 100 && GetMouseY() >= 470 && GetMouseX() <= 316 && GetMouseY() <= 496{ + if GetMouseX() >= 100 && GetMouseY() >= 470 && GetMouseX() <= 316 && GetMouseY() <= 496 + { draw.draw_text("Leaderboard", 103, 471, 34, Color::GRAY); draw.draw_text("Leaderboard", 100, 470, 34, Color::BLACK); - } - if GetMouseX() >= 100 && GetMouseY() >= 550 && GetMouseX() <= 162 && GetMouseY() <= 575{ + if GetMouseX() >= 100 && GetMouseY() >= 550 && GetMouseX() <= 162 && GetMouseY() <= 575 + { draw.draw_text("Exit", 103, 551, 34, Color::GRAY); draw.draw_text("Exit", 100, 550, 34, Color::BLACK); - } - } - // Return true if you want the game to start. - // Otherwise, keep returning false until the player clicks the start button - return false; + // Return MenuStateSignal::StartGame if you want the game to start. + // Otherwise, keep returning MenuStateSignal::DoMainMenu until the player clicks the start button + return MenuStateSignal::DoMainMenu; + } + + pub async fn render_options_frame( + &mut self, + raylib: &mut RaylibHandle, + rl_thread: &RaylibThread, + discord: &DiscordChannel, + global_resources: &GlobalResources, + constants: &ProjectConstants, + ) -> MenuStateSignal { + + return MenuStateSignal::DoOptions; + } + + pub async fn render_credits_frame( + &mut self, + raylib: &mut RaylibHandle, + rl_thread: &RaylibThread, + discord: &DiscordChannel, + global_resources: &GlobalResources, + constants: &ProjectConstants, + ) -> MenuStateSignal { + + return MenuStateSignal::DoCredits; + } + + pub async fn render_leaderboard_frame( + &mut self, + raylib: &mut RaylibHandle, + rl_thread: &RaylibThread, + discord: &DiscordChannel, + global_resources: &GlobalResources, + constants: &ProjectConstants, + ) -> MenuStateSignal { + + return MenuStateSignal::DoLeaderboard; } } diff --git a/game/game_logic/src/scenes/mod.rs b/game/game_logic/src/scenes/mod.rs index 41fe528a..ee1a40c8 100644 --- a/game/game_logic/src/scenes/mod.rs +++ b/game/game_logic/src/scenes/mod.rs @@ -10,19 +10,23 @@ use crate::{ project_constants::ProjectConstants, }; -use self::{player_interaction::PlayableScene, test_fox::TestFoxScene, main_menu::MainMenu}; +use self::{ + main_menu::{MainMenu, MenuStateSignal}, + player_interaction::PlayableScene, + test_fox::TestFoxScene, +}; +mod main_menu; mod player_interaction; mod test_fox; -mod main_menu; /// Delegate for handling rendering. /// This is a struct to allow for stateful data (like sub-screens) to be set up pub struct SceneRenderDelegate { - is_in_main_menu: bool, + menu_control_signal: MenuStateSignal, /* Scenes */ scene_test_fox: TestFoxScene, scene_playable: PlayableScene, - scene_main_menu: MainMenu + scene_main_menu: MainMenu, } impl SceneRenderDelegate { @@ -40,7 +44,7 @@ impl SceneRenderDelegate { let scene_main_menu = MainMenu::new(raylib, rl_thread, constants); Self { - is_in_main_menu: true, + menu_control_signal: MenuStateSignal::DoMainMenu, scene_test_fox, scene_playable, scene_main_menu, @@ -59,14 +63,37 @@ impl SceneRenderDelegate { constants: &ProjectConstants, ) { // Render the main menu if in it, otherwise, render the game - if self.is_in_main_menu { - self.is_in_main_menu = !self.scene_main_menu - .render_frame(raylib, rl_thread, discord, global_resources, constants) - .await; - }else { - self.scene_playable - .render_frame(raylib, rl_thread, &discord, global_resources, constants) - .await; + match self.menu_control_signal { + MenuStateSignal::StartGame => { + self.scene_playable + .render_frame(raylib, rl_thread, &discord, global_resources, constants) + .await; + } + MenuStateSignal::QuitGame => unimplemented!(), + MenuStateSignal::DoMainMenu => { + self.menu_control_signal = self + .scene_main_menu + .render_main_menu_frame(raylib, rl_thread, discord, global_resources, constants) + .await + } + MenuStateSignal::DoOptions => { + self.menu_control_signal = self + .scene_main_menu + .render_options_frame(raylib, rl_thread, discord, global_resources, constants) + .await + }, + MenuStateSignal::DoCredits => { + self.menu_control_signal = self + .scene_main_menu + .render_credits_frame(raylib, rl_thread, discord, global_resources, constants) + .await + }, + MenuStateSignal::DoLeaderboard => { + self.menu_control_signal = self + .scene_main_menu + .render_leaderboard_frame(raylib, rl_thread, discord, global_resources, constants) + .await + }, } } } From bc7fb12564ac99be0383d080474f686e7518be63 Mon Sep 17 00:00:00 2001 From: Evan Pratten Date: Sat, 2 Apr 2022 11:32:50 -0400 Subject: [PATCH 6/8] Fix the rest of the merge issues --- game/game_logic/src/scenes/main_menu.rs | 62 +++++++++++-------------- 1 file changed, 28 insertions(+), 34 deletions(-) diff --git a/game/game_logic/src/scenes/main_menu.rs b/game/game_logic/src/scenes/main_menu.rs index 7c7d1825..769819e1 100644 --- a/game/game_logic/src/scenes/main_menu.rs +++ b/game/game_logic/src/scenes/main_menu.rs @@ -67,11 +67,11 @@ impl MainMenu { draw.clear_background(Color::WHITE); //I wanna see where mouseeee - let mouse_x = draw.get_mouse_x(); - let mouse_y = draw.get_mouse_y(); - - draw.draw_text(&mouse_x.to_string(), 20, 5, 20, Color::BLACK); - draw.draw_text(&mouse_y.to_string(), 70, 5, 20, Color::BLACK); + let mouse_x = draw.get_mouse_x(); + let mouse_y = draw.get_mouse_y(); + + draw.draw_text(&mouse_x.to_string(), 20, 5, 20, Color::BLACK); + draw.draw_text(&mouse_y.to_string(), 70, 5, 20, Color::BLACK); // TODO: Render stuff //Initial Option placeholder words in the main menu @@ -82,36 +82,34 @@ impl MainMenu { draw.draw_text("Leaderboard", 100, 470, 34, Color::BLACK); draw.draw_text("Exit", 100, 550, 34, Color::BLACK); - //First two are starting X and Y position, last two finishing X and Y. Made to resemble a box + //First two are starting X and Y position, last two finishing X and Y. Made to resemble a box - if mouse_x >= 100 && mouse_y >= 193 && mouse_x <= 290 && mouse_y <= 216{ - //Insides while make a lil shade for it to look cool - draw.draw_text("Start Game", 103, 191, 34, Color::GRAY); - draw.draw_text("Start Game", 100, 190, 34, Color::BLACK); - if draw.is_mouse_button_down(MouseButton::MOUSE_LEFT_BUTTON) { - return true; - } + if mouse_x >= 100 && mouse_y >= 193 && mouse_x <= 290 && mouse_y <= 216 { + //Insides while make a lil shade for it to look cool + draw.draw_text("Start Game", 103, 191, 34, Color::GRAY); + draw.draw_text("Start Game", 100, 190, 34, Color::BLACK); + if draw.is_mouse_button_down(MouseButton::MOUSE_LEFT_BUTTON) { + return MenuStateSignal::StartGame; } + } - if mouse_x >= 100 && mouse_y >= 250 && mouse_x <= 222 && mouse_y <= 275{ - draw.draw_text("Options", 103, 251, 34, Color::GRAY); - draw.draw_text("Options", 100, 250, 34, Color::BLACK); - } + if mouse_x >= 100 && mouse_y >= 250 && mouse_x <= 222 && mouse_y <= 275 { + draw.draw_text("Options", 103, 251, 34, Color::GRAY); + draw.draw_text("Options", 100, 250, 34, Color::BLACK); + } + if mouse_x >= 100 && mouse_y >= 410 && mouse_x <= 222 && mouse_y <= 437 { + draw.draw_text("Credits", 103, 411, 34, Color::GRAY); + draw.draw_text("Credits", 100, 410, 34, Color::BLACK); + } + if mouse_x >= 100 && mouse_y >= 470 && mouse_x <= 316 && mouse_y <= 496 { + draw.draw_text("Leaderboard", 103, 471, 34, Color::GRAY); + draw.draw_text("Leaderboard", 100, 470, 34, Color::BLACK); + } - if mouse_x >= 100 && mouse_y >= 410 && mouse_x <= 222 && mouse_y <= 437{ - draw.draw_text("Credits", 103, 411, 34, Color::GRAY); - draw.draw_text("Credits", 100, 410, 34, Color::BLACK); - } - if mouse_x >= 100 && mouse_y >= 470 && mouse_x <= 316 && mouse_y <= 496{ - draw.draw_text("Leaderboard", 103, 471, 34, Color::GRAY); - draw.draw_text("Leaderboard", 100, 470, 34, Color::BLACK); - } - - if mouse_x >= 100 && mouse_y >= 550 && mouse_x <= 162 && mouse_y <= 575{ - draw.draw_text("Exit", 103, 551, 34, Color::GRAY); - draw.draw_text("Exit", 100, 550, 34, Color::BLACK); - } + if mouse_x >= 100 && mouse_y >= 550 && mouse_x <= 162 && mouse_y <= 575 { + draw.draw_text("Exit", 103, 551, 34, Color::GRAY); + draw.draw_text("Exit", 100, 550, 34, Color::BLACK); } // Return MenuStateSignal::StartGame if you want the game to start. @@ -127,7 +125,6 @@ impl MainMenu { global_resources: &GlobalResources, constants: &ProjectConstants, ) -> MenuStateSignal { - return MenuStateSignal::DoOptions; } @@ -139,7 +136,6 @@ impl MainMenu { global_resources: &GlobalResources, constants: &ProjectConstants, ) -> MenuStateSignal { - return MenuStateSignal::DoCredits; } @@ -151,8 +147,6 @@ impl MainMenu { global_resources: &GlobalResources, constants: &ProjectConstants, ) -> MenuStateSignal { - return MenuStateSignal::DoLeaderboard; - } } From 06255e252cb392c12279852f833656c1ac00ed8d Mon Sep 17 00:00:00 2001 From: Marcelo Geldres Date: Sat, 2 Apr 2022 11:37:47 -0400 Subject: [PATCH 7/8] Crash --- game/game_logic/src/scenes/main_menu.rs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/game/game_logic/src/scenes/main_menu.rs b/game/game_logic/src/scenes/main_menu.rs index 769819e1..59a70b99 100644 --- a/game/game_logic/src/scenes/main_menu.rs +++ b/game/game_logic/src/scenes/main_menu.rs @@ -96,6 +96,9 @@ impl MainMenu { if mouse_x >= 100 && mouse_y >= 250 && mouse_x <= 222 && mouse_y <= 275 { draw.draw_text("Options", 103, 251, 34, Color::GRAY); draw.draw_text("Options", 100, 250, 34, Color::BLACK); + if draw.is_mouse_button_down(MouseButton::MOUSE_LEFT_BUTTON) { + return MenuStateSignal::DoOptions; + } } if mouse_x >= 100 && mouse_y >= 410 && mouse_x <= 222 && mouse_y <= 437 { From 73ead1e88d1b23c7b73a3f65fef840bf29488657 Mon Sep 17 00:00:00 2001 From: Marcelo Geldres Date: Sat, 2 Apr 2022 13:22:22 -0400 Subject: [PATCH 8/8] Main menu detailed 1 First step to full detail of the main menu --- game/game_logic/src/scenes/main_menu.rs | 103 +++++++++++++++++++++++- 1 file changed, 102 insertions(+), 1 deletion(-) diff --git a/game/game_logic/src/scenes/main_menu.rs b/game/game_logic/src/scenes/main_menu.rs index 59a70b99..2625a2a7 100644 --- a/game/game_logic/src/scenes/main_menu.rs +++ b/game/game_logic/src/scenes/main_menu.rs @@ -66,10 +66,11 @@ impl MainMenu { // Clear the screen draw.clear_background(Color::WHITE); - //I wanna see where mouseeee + //Obtain mouse position let mouse_x = draw.get_mouse_x(); let mouse_y = draw.get_mouse_y(); + //I wanna see where mouseeee draw.draw_text(&mouse_x.to_string(), 20, 5, 20, Color::BLACK); draw.draw_text(&mouse_y.to_string(), 70, 5, 20, Color::BLACK); @@ -78,6 +79,7 @@ impl MainMenu { draw.draw_text("Game Title", 100, 90, 60, Color::BLACK); draw.draw_text("Start Game", 100, 190, 34, Color::BLACK); draw.draw_text("Options", 100, 250, 34, Color::BLACK); + draw.draw_text("Volume", 100, 300, 34, Color::BLACK); draw.draw_text("Credits", 100, 410, 34, Color::BLACK); draw.draw_text("Leaderboard", 100, 470, 34, Color::BLACK); draw.draw_text("Exit", 100, 550, 34, Color::BLACK); @@ -104,17 +106,34 @@ impl MainMenu { if mouse_x >= 100 && mouse_y >= 410 && mouse_x <= 222 && mouse_y <= 437 { draw.draw_text("Credits", 103, 411, 34, Color::GRAY); draw.draw_text("Credits", 100, 410, 34, Color::BLACK); + if draw.is_mouse_button_down(MouseButton::MOUSE_LEFT_BUTTON) { + return MenuStateSignal::DoCredits; + } } if mouse_x >= 100 && mouse_y >= 470 && mouse_x <= 316 && mouse_y <= 496 { draw.draw_text("Leaderboard", 103, 471, 34, Color::GRAY); draw.draw_text("Leaderboard", 100, 470, 34, Color::BLACK); + if draw.is_mouse_button_down(MouseButton::MOUSE_LEFT_BUTTON) { + return MenuStateSignal::DoLeaderboard; + } } + if mouse_x >= 100 && mouse_y >= 300 && mouse_x <= 215 && mouse_y <= 330 { + draw.draw_text("Volume", 103, 301, 34, Color::GRAY); + draw.draw_text("Volume", 100, 300, 34, Color::BLACK); + if draw.is_mouse_button_down(MouseButton::MOUSE_LEFT_BUTTON) { + //Function for Volume here + } + } + + //Exit button has no function yet if mouse_x >= 100 && mouse_y >= 550 && mouse_x <= 162 && mouse_y <= 575 { draw.draw_text("Exit", 103, 551, 34, Color::GRAY); draw.draw_text("Exit", 100, 550, 34, Color::BLACK); } + + // Return MenuStateSignal::StartGame if you want the game to start. // Otherwise, keep returning MenuStateSignal::DoMainMenu until the player clicks the start button return MenuStateSignal::DoMainMenu; @@ -128,6 +147,30 @@ impl MainMenu { global_resources: &GlobalResources, constants: &ProjectConstants, ) -> MenuStateSignal { + + //Draw declared + let mut draw = raylib.begin_drawing(rl_thread); + draw.clear_background(Color::WHITE); + //Mouse Position + let mouse_x = draw.get_mouse_x(); + let mouse_y = draw.get_mouse_y(); + //Show mouse position + draw.draw_text(&mouse_x.to_string(), 20, 5, 20, Color::BLACK); + draw.draw_text(&mouse_y.to_string(), 70, 5, 20, Color::BLACK); + + //Top Label + draw.draw_text("Options", 25, 30, 55, Color::BLACK); + + //Return Button + draw.draw_text("Return", 100, 550, 34, Color::BLACK); + if mouse_x >= 100 && mouse_y >= 550 && mouse_x <= 216 && mouse_y <= 576 { + draw.draw_text("Return", 103, 551, 34, Color::GRAY); + draw.draw_text("Return", 100, 550, 34, Color::BLACK); + if draw.is_mouse_button_down(MouseButton::MOUSE_LEFT_BUTTON) { + return MenuStateSignal::DoMainMenu; //Goes back to main menu + } + } + return MenuStateSignal::DoOptions; } @@ -139,6 +182,41 @@ impl MainMenu { global_resources: &GlobalResources, constants: &ProjectConstants, ) -> MenuStateSignal { + let mut draw = raylib.begin_drawing(rl_thread); + draw.clear_background(Color::WHITE); + //Mouse Position + let mouse_x = draw.get_mouse_x(); + let mouse_y = draw.get_mouse_y(); + //Show mouse position + draw.draw_text(&mouse_x.to_string(), 20, 5, 20, Color::BLACK); + draw.draw_text(&mouse_y.to_string(), 70, 5, 20, Color::BLACK); + + //Screen Size + // let window_height = draw.get_screen_height(); + let window_width = draw.get_screen_width(); + + draw.draw_text("Credits", (window_width/2) - 100, 30, 55, Color::BLACK); + + draw.draw_text("Carter Tomlenovich", (window_width/2) - 170, 280, 40, Color::DARKBLUE); + draw.draw_text("Emilia Firas", (window_width/2) - 170, 120, 40, Color::DARKBLUE); + draw.draw_text("Emmet Logue", (window_width/2) - 170, 320, 40, Color::DARKBLUE); + draw.draw_text("Evan Pratten", (window_width/2) - 170, 160, 40, Color::DARKBLUE); + draw.draw_text("James Nickoli", (window_width/2) - 170, 240, 40, Color::DARKBLUE); + draw.draw_text("Marcelo Geldres", (window_width/2) - 170, 440, 40, Color::DARKBLUE); + draw.draw_text("Percy", (window_width/2) - 170, 400, 40, Color::DARKBLUE); + draw.draw_text("Silas Bartha", (window_width/2) - 170, 200, 40, Color::DARKBLUE); + draw.draw_text("Taya Armstrong", (window_width/2) - 170, 360, 40, Color::DARKBLUE); + + //Return Button + draw.draw_text("Return", 100, 550, 34, Color::BLACK); + if mouse_x >= 100 && mouse_y >= 550 && mouse_x <= 216 && mouse_y <= 576 { + draw.draw_text("Return", 103, 551, 34, Color::GRAY); + draw.draw_text("Return", 100, 550, 34, Color::BLACK); + if draw.is_mouse_button_down(MouseButton::MOUSE_LEFT_BUTTON) { + return MenuStateSignal::DoMainMenu; + } + } + return MenuStateSignal::DoCredits; } @@ -150,6 +228,29 @@ impl MainMenu { global_resources: &GlobalResources, constants: &ProjectConstants, ) -> MenuStateSignal { + let mut draw = raylib.begin_drawing(rl_thread); + draw.clear_background(Color::WHITE); + //Mouse Position + let mouse_x = draw.get_mouse_x(); + let mouse_y = draw.get_mouse_y(); + + //Show mouse position + draw.draw_text(&mouse_x.to_string(), 20, 5, 20, Color::BLACK); + draw.draw_text(&mouse_y.to_string(), 70, 5, 20, Color::BLACK); + + let window_width = draw.get_screen_width(); + draw.draw_text("Leaderboard", (window_width/2) - 176, 30, 55, Color::BLACK); + + //Return Button + draw.draw_text("Return", 100, 550, 34, Color::BLACK); + if mouse_x >= 100 && mouse_y >= 550 && mouse_x <= 216 && mouse_y <= 576 { + draw.draw_text("Return", 103, 551, 34, Color::GRAY); + draw.draw_text("Return", 100, 550, 34, Color::BLACK); + if draw.is_mouse_button_down(MouseButton::MOUSE_LEFT_BUTTON) { + return MenuStateSignal::DoMainMenu; + } + } + return MenuStateSignal::DoLeaderboard; } }