From d0eb5c53585459e70049fb994dfda48263dc6b86 Mon Sep 17 00:00:00 2001 From: Marcelo Geldres Date: Sat, 2 Apr 2022 15:16:19 -0400 Subject: [PATCH 1/3] Fully responsive layout Some parts were not responsive to the window size. they were corrected --- game/game_logic/src/scenes/main_menu.rs | 72 +++++++++++++++---------- 1 file changed, 44 insertions(+), 28 deletions(-) diff --git a/game/game_logic/src/scenes/main_menu.rs b/game/game_logic/src/scenes/main_menu.rs index 2625a2a7..fa0e73e9 100644 --- a/game/game_logic/src/scenes/main_menu.rs +++ b/game/game_logic/src/scenes/main_menu.rs @@ -161,16 +161,22 @@ impl MainMenu { //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); + //Window size storing variables + let window_height = draw.get_screen_height(); + let window_width = draw.get_screen_width(); + + //Return button variables + let button_pos_x = 100; //116 Wide + let button_pos_y = window_height - (window_height/5); //26 height + + draw.draw_text("Return", button_pos_x, button_pos_y, 34, Color::BLACK); + if mouse_x >= 100 && mouse_y >= button_pos_y && mouse_x <= 216 && mouse_y <= (window_height - (window_height/5)) + 26 { + draw.draw_text("Return", button_pos_x + 3, button_pos_y + 1, 34, Color::GRAY); + draw.draw_text("Return", button_pos_x, button_pos_y, 34, Color::BLACK); if draw.is_mouse_button_down(MouseButton::MOUSE_LEFT_BUTTON) { return MenuStateSignal::DoMainMenu; //Goes back to main menu } } - return MenuStateSignal::DoOptions; } @@ -192,28 +198,31 @@ impl MainMenu { draw.draw_text(&mouse_y.to_string(), 70, 5, 20, Color::BLACK); //Screen Size - // let window_height = draw.get_screen_height(); + 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); + draw.draw_text("Carter Tomlenovich", (window_width/2) - 170, 120, 40, Color::DARKBLUE); + draw.draw_text("Emilia Firas", (window_width/2) - 170, 160, 40, Color::DARKBLUE); + draw.draw_text("Emmet Logue", (window_width/2) - 170, 200, 40, Color::DARKBLUE); + draw.draw_text("Evan Pratten", (window_width/2) - 170, 240, 40, Color::DARKBLUE); + draw.draw_text("James Nickoli", (window_width/2) - 170, 280, 40, Color::DARKBLUE); + draw.draw_text("Marcelo Geldres", (window_width/2) - 170, 320, 40, Color::DARKBLUE); + draw.draw_text("Percy", (window_width/2) - 170, 360, 40, Color::DARKBLUE); + draw.draw_text("Silas Bartha", (window_width/2) - 170, 400, 40, Color::DARKBLUE); + draw.draw_text("Taya Armstrong", (window_width/2) - 170, 440, 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); + //Return button variables + let button_pos_x = 100; //116 Wide + let button_pos_y = window_height - (window_height/5); //26 height + + draw.draw_text("Return", button_pos_x, button_pos_y, 34, Color::BLACK); + if mouse_x >= 100 && mouse_y >= button_pos_y && mouse_x <= 216 && mouse_y <= (window_height - (window_height/5)) + 26 { + draw.draw_text("Return", button_pos_x + 3, button_pos_y + 1, 34, Color::GRAY); + draw.draw_text("Return", button_pos_x, button_pos_y, 34, Color::BLACK); if draw.is_mouse_button_down(MouseButton::MOUSE_LEFT_BUTTON) { - return MenuStateSignal::DoMainMenu; + return MenuStateSignal::DoMainMenu; //Goes back to main menu } } @@ -234,6 +243,10 @@ impl MainMenu { let mouse_x = draw.get_mouse_x(); let mouse_y = draw.get_mouse_y(); + //Window size storing variables + let window_height = draw.get_screen_height(); + let window_width = draw.get_screen_width(); + //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); @@ -241,13 +254,16 @@ impl MainMenu { 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); + //Return button variables + let button_pos_x = 100; //116 Wide + let button_pos_y = window_height - (window_height/5); //26 height + + draw.draw_text("Return", button_pos_x, button_pos_y, 34, Color::BLACK); + if mouse_x >= 100 && mouse_y >= button_pos_y && mouse_x <= 216 && mouse_y <= (window_height - (window_height/5)) + 26 { + draw.draw_text("Return", button_pos_x + 3, button_pos_y + 1, 34, Color::GRAY); + draw.draw_text("Return", button_pos_x, button_pos_y, 34, Color::BLACK); if draw.is_mouse_button_down(MouseButton::MOUSE_LEFT_BUTTON) { - return MenuStateSignal::DoMainMenu; + return MenuStateSignal::DoMainMenu; //Goes back to main menu } } From 2770fe4572207cb77701fcc5a0c40c78b10e2ab2 Mon Sep 17 00:00:00 2001 From: Marcelo Geldres Date: Sat, 2 Apr 2022 18:33:06 -0400 Subject: [PATCH 2/3] Forgot the exit button mb --- 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 fa0e73e9..45eef3fc 100644 --- a/game/game_logic/src/scenes/main_menu.rs +++ b/game/game_logic/src/scenes/main_menu.rs @@ -130,6 +130,9 @@ impl MainMenu { 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 draw.is_mouse_button_down(MouseButton::MOUSE_LEFT_BUTTON) { + return MenuStateSignal::QuitGame; + } } From 6f61eaf10c2d3b8338981f5f3b9f7798024a4ffd Mon Sep 17 00:00:00 2001 From: Evan Pratten Date: Sat, 2 Apr 2022 18:35:48 -0400 Subject: [PATCH 3/3] Fix mouse call --- game/game_logic/src/scenes/main_menu.rs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/game/game_logic/src/scenes/main_menu.rs b/game/game_logic/src/scenes/main_menu.rs index 45eef3fc..caf82caa 100644 --- a/game/game_logic/src/scenes/main_menu.rs +++ b/game/game_logic/src/scenes/main_menu.rs @@ -90,7 +90,7 @@ 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); - if draw.is_mouse_button_down(MouseButton::MOUSE_LEFT_BUTTON) { + if draw.is_mouse_button_pressed(MouseButton::MOUSE_LEFT_BUTTON) { return MenuStateSignal::StartGame; } } @@ -98,7 +98,7 @@ 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) { + if draw.is_mouse_button_pressed(MouseButton::MOUSE_LEFT_BUTTON) { return MenuStateSignal::DoOptions; } } @@ -106,14 +106,14 @@ 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) { + if draw.is_mouse_button_pressed(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) { + if draw.is_mouse_button_pressed(MouseButton::MOUSE_LEFT_BUTTON) { return MenuStateSignal::DoLeaderboard; } } @@ -121,7 +121,7 @@ impl MainMenu { 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) { + if draw.is_mouse_button_pressed(MouseButton::MOUSE_LEFT_BUTTON) { //Function for Volume here } } @@ -130,7 +130,7 @@ impl MainMenu { 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 draw.is_mouse_button_down(MouseButton::MOUSE_LEFT_BUTTON) { + if draw.is_mouse_button_pressed(MouseButton::MOUSE_LEFT_BUTTON) { return MenuStateSignal::QuitGame; } }