button

src/lib/utils/button.rs

@@ -0,0 +1,71 @@
+use raylib::prelude::*;
+
+pub struct OnScreenButton {
+    bounds: Rectangle,
+    text: String,
+    background: Color,
+    border: Color,
+    border_hover: Color,
+    font_px: i32,
+    draw_border: bool,
+}
+
+impl OnScreenButton {
+    pub fn new(
+        text: String,
+        bounds: Rectangle,
+        background: Color,
+        border: Color,
+        border_hover: Color,
+        font_px: i32,
+        draw_border: bool,
+    ) -> Self {
+        Self {
+            bounds,
+            text,
+            background,
+            border,
+            border_hover,
+            font_px,
+            draw_border,
+        }
+    }
+
+    pub fn is_hovered(&self, draw_handle: &RaylibDrawHandle) -> bool {
+        return self
+            .bounds
+            .check_collision_point_rec(draw_handle.get_mouse_position());
+    }
+
+    pub fn render(&self, draw_handle: &mut RaylibDrawHandle) {
+        // Draw the button background
+        draw_handle.draw_rectangle_rec(self.bounds, self.background);
+
+        // Check mouse info
+        let is_being_hovered = self.is_hovered(draw_handle);
+
+        // Render the border
+        if self.draw_border {
+            draw_handle.draw_rectangle_lines_ex(
+                self.bounds,
+                3,
+                match is_being_hovered {
+                    true => self.border_hover,
+                    false => self.border,
+                },
+            );
+        }
+
+        // Render the text
+        draw_handle.draw_text(
+            &self.text,
+            self.bounds.x as i32 + 10,
+            self.bounds.y as i32 + ((self.bounds.height as i32 - self.font_px) / 2),
+            self.font_px,
+            match is_being_hovered {
+                true => self.border_hover,
+                false => self.border,
+            },
+        )
+    }
+}

src/lib/utils/mod.rs

@@ -1,5 +1,6 @@
 pub mod profiler;
 pub mod triangles;
+pub mod button;
 
 pub fn calculate_linear_slide(playthrough_percent: f64) -> f64 {
     if playthrough_percent < 0.25 {

src/logic/shopscreen.rs

@@ -31,6 +31,16 @@ impl ShopScreen {
         }
     }
 
+    fn render_buy_section(
+        &mut self,
+        draw_handle: &mut RaylibDrawHandle,
+        _thread: &RaylibThread,
+        audio_system: &mut AudioPlayer,
+        game_core: &mut GameCore,
+        draw_bounds: Rectangle
+    ) {
+    }
+
     // // Creates all the items
     // pub fn create_items(&mut self, screen_dimension: Vector2) {
     //     // gets every item.. hacky
@@ -80,100 +90,7 @@ impl Screen for ShopScreen {
         draw_handle.clear_background(Color::GRAY);
         // TODO: Maybe we can stick some art here?
 
-        // If escape is pressed again, return to the previous render state
+        
-        if draw_handle.is_key_pressed(KeyboardKey::KEY_ESCAPE) {
-            return Some(game_core.last_state);
-        }
-
-        // Window dimensions
-        let win_height = draw_handle.get_screen_height();
-        let win_width = draw_handle.get_screen_width();
-
-        // Render the backing to the menu itself
-        draw_handle.draw_rectangle(
-            (win_width / 2) - ((SCREEN_PANEL_SIZE.x as i32 + 6) / 2),
-            (win_height / 2) - ((SCREEN_PANEL_SIZE.y as i32 + 6) / 2),
-            SCREEN_PANEL_SIZE.x as i32 + 6,
-            SCREEN_PANEL_SIZE.y as i32 + 6,
-            Color::BLACK,
-        );
-        draw_handle.draw_rectangle(
-            (win_width / 2) - (SCREEN_PANEL_SIZE.x as i32 / 2),
-            (win_height / 2) - (SCREEN_PANEL_SIZE.y as i32 / 2),
-            SCREEN_PANEL_SIZE.x as i32,
-            SCREEN_PANEL_SIZE.y as i32,
-            Color::WHITE,
-        );
-
-        // Render heading text
-        draw_handle.draw_text(
-            "SHOP",
-            (win_width / 2) - 80,
-            (win_height / 2) - (SCREEN_PANEL_SIZE.y as i32 / 2) + 10,
-            40,
-            Color::BLACK,
-        );
-
-        // Close and quit buttons
-        let bottom_left_button_dimensions = Rectangle {
-            x: (win_width as f32 / 2.0) - (SCREEN_PANEL_SIZE.x / 2.0) + 5.0,
-            y: (win_height as f32 / 2.0) + (SCREEN_PANEL_SIZE.y / 2.0) - 50.0,
-            width: (SCREEN_PANEL_SIZE.x / 2.0) - 15.0,
-            height: 40.0,
-        };
-        let bottom_right_button_dimensions = Rectangle {
-            x: (win_width as f32 / 2.0) + 5.0,
-            y: bottom_left_button_dimensions.y,
-            width: bottom_left_button_dimensions.width,
-            height: bottom_left_button_dimensions.height,
-        };
-
-        // Check if the mouse is over either button
-        let mouse_over_bottom_left_button =
-            bottom_left_button_dimensions.check_collision_point_rec(mouse_position);
-        let mouse_over_bottom_right_button =
-            bottom_right_button_dimensions.check_collision_point_rec(mouse_position);
-
-        // Render buttons
-        draw_handle.draw_rectangle_lines_ex(
-            bottom_left_button_dimensions,
-            3,
-            match mouse_over_bottom_left_button {
-                true => Color::GRAY,
-                false => Color::BLACK,
-            },
-        );
-        draw_handle.draw_text(
-            "Menu",
-            bottom_left_button_dimensions.x as i32 + 15,
-            bottom_left_button_dimensions.y as i32 + 5,
-            30,
-            Color::BLACK,
-        );
-        draw_handle.draw_rectangle_lines_ex(
-            bottom_right_button_dimensions,
-            3,
-            match mouse_over_bottom_right_button {
-                true => Color::GRAY,
-                false => Color::BLACK,
-            },
-        );
-        draw_handle.draw_text(
-            "Play",
-            bottom_right_button_dimensions.x as i32 + 15,
-            bottom_right_button_dimensions.y as i32 + 5,
-            30,
-            Color::BLACK,
-        );
-
-        // Handle click actions on the buttons
-        if draw_handle.is_mouse_button_pressed(MouseButton::MOUSE_LEFT_BUTTON) {
-            if mouse_over_bottom_left_button {
-                return Some(GameState::MainMenu);
-            } else if mouse_over_bottom_right_button {
-                return Some(GameState::InGame);
-            }
-        }
 
         return None;
     }