Some quick reorg of ingame logic

src/logic/ingame/hud.rs

@@ -0,0 +1,42 @@
+use raylib::prelude::*;
+
+use crate::gamecore::GameCore;
+
+pub fn render_hud(
+    draw_handle: &mut RaylibDrawHandle,
+    game_core: &mut GameCore,
+    window_center: Vector2,
+) {
+    // Get the relevant data
+    let breath = game_core.player.breath_percent;
+    let dist_from_player_to_end = game_core
+        .player
+        .position
+        .distance_to(game_core.world.end_position);
+    let dist_from_start_to_end = Vector2::zero().distance_to(game_core.world.end_position);
+    let progress = (dist_from_start_to_end - dist_from_player_to_end) / dist_from_start_to_end;
+
+    // Render the base of the progress bar
+    let progress_bar_rect = Rectangle {
+        x: 20.0,
+        y: (window_center.y * 2.0) - 20.0 - 40.0,
+        width: (window_center.x * 2.0) - 40.0,
+        height: 40.0,
+    };
+    draw_handle.draw_rectangle_rec(progress_bar_rect, Color::BLUE);
+    draw_handle.draw_rectangle_lines_ex(progress_bar_rect, 6, Color::WHITE);
+
+    // Render the slider of the progress bar
+    let progress_bar_slider = Rectangle {
+        x: (((window_center.x * 2.0) - 40.0) * progress.abs().clamp(0.0, 1.0)) + 10.0,
+        y: (window_center.y * 2.0) - 20.0 - 50.0,
+        width: 40.0,
+        height: 60.0,
+    };
+    draw_handle.draw_rectangle_rec(progress_bar_slider, Color::BLUE);
+    //TODO: This causes a render bug
+    draw_handle.draw_rectangle_lines_ex(progress_bar_slider, 6, Color::WHITE);
+
+    // TODO: Breath bar
+    // TODO: Boost bar
+}

src/logic/ingame/ingame.rs

@@ -1,12 +0,0 @@
-
-
-
-pub enum ingame_states{
-	BUYING,
-	SWIMMING,
-	DEAD,
-}
-
-
-
-

src/logic/ingame/mod.rs

@@ -1,3 +1,6 @@
+mod playerlogic;
+mod hud;
+
 use raylib::prelude::*;
 
 use crate::{
@@ -7,10 +10,6 @@ use crate::{
 
 use super::screen::Screen;
 
-const NORMAL_PLAYER_SPEED: i32 = 4;
-const BOOST_PLAYER_SPEED: i32 = NORMAL_PLAYER_SPEED * 2;
-const CAMERA_FOLLOW_SPEED: f32 = 0.7;
-
 pub enum InGameState {
     BUYING,
     SWIMMING,
@@ -28,80 +27,6 @@ impl InGameScreen {
         }
     }
 
-    fn update_player_movement(
-        &mut self,
-        draw_handle: &mut RaylibDrawHandle,
-        game_core: &mut GameCore,
-        window_center: Vector2,
-    ) {
-        // Handle player movement
-        let mouse_pose = draw_handle.get_mouse_position();
-        let mouse_world_pose =
-            draw_handle.get_screen_to_world2D(mouse_pose, game_core.master_camera);
-        let raw_movement_direction = mouse_world_pose - game_core.player.position;
-        let mut normalized_movement_direction = raw_movement_direction;
-        normalized_movement_direction.normalize();
-        game_core.player.direction = normalized_movement_direction;
-
-        // In the case the player is in "null", just jump the camera to them
-        if game_core.player.position == Vector2::zero() {
-            game_core.master_camera.target = game_core.player.position - (window_center / 2.0);
-        }
-
-        // Handle action buttons
-        let user_request_boost = draw_handle.is_mouse_button_down(MouseButton::MOUSE_LEFT_BUTTON);
-        let user_request_action =
-            draw_handle.is_mouse_button_pressed(MouseButton::MOUSE_RIGHT_BUTTON);
-
-        // Move the player in their direction
-        let speed_multiplier = match user_request_boost && game_core.player.boost_percent >= 0.0 {
-            true => BOOST_PLAYER_SPEED as f32,
-            false => NORMAL_PLAYER_SPEED as f32,
-        };
-
-        // Only do this if the mouse is far enough away
-        let player_real_movement = game_core.player.direction * speed_multiplier;
-        if raw_movement_direction.distance_to(Vector2::zero()) > game_core.player.size.y / 2.0 {
-            game_core.player.position += player_real_movement;
-        }
-
-        // Move the camera to follow the player
-        let direction_from_cam_to_player =
-            (game_core.player.position - window_center) - game_core.master_camera.target;
-        let player_screen_position =
-            draw_handle.get_world_to_screen2D(game_core.player.position, game_core.master_camera);
-
-        // Camera only moves if you get close to the edge of the screen
-        if player_screen_position.distance_to(window_center).abs() > (window_center.y - 40.0) {
-            game_core.master_camera.target += player_real_movement;
-        }
-    }
-
-    fn render_player(
-        &mut self,
-        context_2d: &mut RaylibMode2D<RaylibDrawHandle>,
-        game_core: &mut GameCore,
-    ) {
-        // Get the player
-        let player = &game_core.player;
-
-        // Convert the player direction to a rotation
-        let player_rotation = Vector2::zero().angle_to(player.direction);
-
-        // TODO: tmp rect
-        context_2d.draw_rectangle_pro(
-            Rectangle {
-                x: player.position.x,
-                y: player.position.y,
-                width: player.size.x,
-                height: player.size.y,
-            },
-            player.size / 2.0,
-            player_rotation.to_degrees() + 90.0,
-            Color::BLACK,
-        );
-    }
-
     fn render_world(
         &mut self,
         context_2d: &mut RaylibMode2D<RaylibDrawHandle>,
@@ -110,41 +35,7 @@ impl InGameScreen {
         context_2d.draw_circle(0, 0, 10.0, Color::BLACK);
     }
 
-    fn render_hud(&mut self, draw_handle: &mut RaylibDrawHandle, game_core: &mut GameCore, window_center: Vector2) {
+    
-        // Get the relevant data
-        let breath = game_core.player.breath_percent;
-        let dist_from_player_to_end = game_core
-            .player
-            .position
-            .distance_to(game_core.world.end_position);
-        let dist_from_start_to_end = Vector2::zero().distance_to(game_core.world.end_position);
-        let progress = (dist_from_start_to_end - dist_from_player_to_end) / dist_from_start_to_end;
-
-        // Render the base of the progress bar
-        let progress_bar_rect = Rectangle {
-            x: 20.0,
-            y: (window_center.y * 2.0) - 20.0 - 40.0,
-            width: (window_center.x * 2.0) - 40.0,
-            height: 40.0
-        };
-        draw_handle.draw_rectangle_rec(progress_bar_rect, Color::BLUE);
-        draw_handle.draw_rectangle_lines_ex(progress_bar_rect, 6, Color::WHITE);
-
-        // Render the slider of the progress bar
-        let progress_bar_slider = Rectangle {
-            x: (((window_center.x * 2.0) - 40.0) * progress.abs().clamp(0.0, 1.0)) + 10.0,
-            y: (window_center.y * 2.0) - 20.0 - 50.0,
-            width: 40.0,
-            height: 60.0
-        };
-        draw_handle.draw_rectangle_rec(progress_bar_slider, Color::BLUE);
-        //TODO: This causes a render bug
-        draw_handle.draw_rectangle_lines_ex(progress_bar_slider, 6, Color::WHITE);
-
-        // TODO: Breath bar
-        // TODO: Boost bar
-
-    }
 }
 
 impl Screen for InGameScreen {
@@ -172,7 +63,7 @@ impl Screen for InGameScreen {
         };
 
         // Update player movement
-        self.update_player_movement(draw_handle, game_core, window_center);
+        playerlogic::update_player_movement(draw_handle, game_core, window_center);
 
         // Open a 2D context
         {
@@ -182,11 +73,11 @@ impl Screen for InGameScreen {
             self.render_world(&mut context_2d, game_core);
 
             // Render Player
-            self.render_player(&mut context_2d, game_core);
+            playerlogic::render_player(&mut context_2d, game_core);
         }
 
         // Render the hud
-        self.render_hud(draw_handle, game_core, window_center);
+        hud::render_hud(draw_handle, game_core, window_center);
 
         return None;
     }

src/logic/ingame/playerlogic.rs

@@ -0,0 +1,74 @@
+use raylib::prelude::*;
+
+use crate::gamecore::GameCore;
+
+const NORMAL_PLAYER_SPEED: i32 = 4;
+const BOOST_PLAYER_SPEED: i32 = NORMAL_PLAYER_SPEED * 2;
+const CAMERA_FOLLOW_SPEED: f32 = 0.7;
+
+pub fn update_player_movement(
+    draw_handle: &mut RaylibDrawHandle,
+    game_core: &mut GameCore,
+    window_center: Vector2,
+) {
+    // Handle player movement
+    let mouse_pose = draw_handle.get_mouse_position();
+    let mouse_world_pose = draw_handle.get_screen_to_world2D(mouse_pose, game_core.master_camera);
+    let raw_movement_direction = mouse_world_pose - game_core.player.position;
+    let mut normalized_movement_direction = raw_movement_direction;
+    normalized_movement_direction.normalize();
+    game_core.player.direction = normalized_movement_direction;
+
+    // In the case the player is in "null", just jump the camera to them
+    if game_core.player.position == Vector2::zero() {
+        game_core.master_camera.target = game_core.player.position - (window_center / 2.0);
+    }
+
+    // Handle action buttons
+    let user_request_boost = draw_handle.is_mouse_button_down(MouseButton::MOUSE_LEFT_BUTTON);
+    let user_request_action = draw_handle.is_mouse_button_pressed(MouseButton::MOUSE_RIGHT_BUTTON);
+
+    // Move the player in their direction
+    let speed_multiplier = match user_request_boost && game_core.player.boost_percent >= 0.0 {
+        true => BOOST_PLAYER_SPEED as f32,
+        false => NORMAL_PLAYER_SPEED as f32,
+    };
+
+    // Only do this if the mouse is far enough away
+    let player_real_movement = game_core.player.direction * speed_multiplier;
+    if raw_movement_direction.distance_to(Vector2::zero()) > game_core.player.size.y / 2.0 {
+        game_core.player.position += player_real_movement;
+    }
+
+    // Move the camera to follow the player
+    let direction_from_cam_to_player =
+        (game_core.player.position - window_center) - game_core.master_camera.target;
+    let player_screen_position =
+        draw_handle.get_world_to_screen2D(game_core.player.position, game_core.master_camera);
+
+    // Camera only moves if you get close to the edge of the screen
+    if player_screen_position.distance_to(window_center).abs() > (window_center.y - 40.0) {
+        game_core.master_camera.target += player_real_movement;
+    }
+}
+
+pub fn render_player(context_2d: &mut RaylibMode2D<RaylibDrawHandle>, game_core: &mut GameCore) {
+    // Get the player
+    let player = &game_core.player;
+
+    // Convert the player direction to a rotation
+    let player_rotation = Vector2::zero().angle_to(player.direction);
+
+    // TODO: tmp rect
+    context_2d.draw_rectangle_pro(
+        Rectangle {
+            x: player.position.x,
+            y: player.position.y,
+            width: player.size.x,
+            height: player.size.y,
+        },
+        player.size / 2.0,
+        player_rotation.to_degrees() + 90.0,
+        Color::BLACK,
+    );
+}