Adding hud data

Cargo.toml

@@ -6,7 +6,9 @@ edition = "2018"
 description = ""
 
 [dependencies]
-raylib = { version = "3.5", git = "https://github.com/ewpratten/raylib-rs", branch = "master" }
+raylib = { version = "3.5", git = "https://github.com/ewpratten/raylib-rs", branch = "master", features = [
+    "with_serde"
+] }
 serialstudio = "0.1.0"
 serde = "1.0.125"
 serde_json = "1.0.64"
@@ -14,4 +16,4 @@ failure = "0.1.8"
 parry2d = "0.4.0"
 log = "0.4.14"
 env_logger = "0.8.3"
-nalgebra = "0.26.1"
+nalgebra = "0.26.1"

assets/worlds/mainworld.json

@@ -1,3 +1,6 @@
 {
-    
+    "end_position": {
+        "x": 100.0,
+        "y": 100.0
+    }
 }

src/lib/utils/profiler.rs

@@ -16,7 +16,12 @@ pub struct ProfilerData {
     pub active_sounds: i32,
 
     // Game core
-    pub game_state: String
+    pub game_state: String,
+
+    // Player 
+    pub player_coins: u32,
+    pub player_boost_percent: f32,
+    pub player_breath_percent: f32
 }
 
 /// The development profiler
@@ -117,6 +122,33 @@ impl GameProfiler {
                         },
                     ],
                 },
+                DataGroup {
+                    title: "Player".to_string(),
+                    widget_type: None,
+                    datasets: vec![
+                        DataSet {
+                            title: Some("Coins".to_string()),
+                            value: json!(self.data.player_coins),
+                            graph: Some(false),
+                            unit: Some("coins".to_string()),
+                            w_type: None,
+                        },
+                        DataSet {
+                            title: Some("Breath".to_string()),
+                            value: json!(self.data.player_boost_percent),
+                            graph: Some(false),
+                            unit: Some("%".to_string()),
+                            w_type: None,
+                        },
+                        DataSet {
+                            title: Some("Breath".to_string()),
+                            value: json!(self.data.player_breath_percent),
+                            graph: Some(false),
+                            unit: Some("%".to_string()),
+                            w_type: None,
+                        },
+                    ],
+                },
             ],
         };
 

src/logic/ingame/mod.rs

@@ -34,15 +34,15 @@ impl InGameScreen {
         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 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);
@@ -68,13 +68,13 @@ impl InGameScreen {
         // 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);
+        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(
@@ -107,9 +107,21 @@ impl InGameScreen {
         context_2d: &mut RaylibMode2D<RaylibDrawHandle>,
         game_core: &mut GameCore,
     ) {
-
         context_2d.draw_circle(0, 0, 10.0, Color::BLACK);
-       
+    }
+
+    fn render_hud(&mut self, draw_handle: &mut RaylibDrawHandle, game_core: &mut GameCore) {
+        // 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;
+
+        
+
     }
 }
 

src/main.rs

@@ -120,6 +120,9 @@ fn main() {
             profiler.data.audio_volume = audio_system.get_master_volume();
             profiler.data.active_sounds = audio_system.get_sounds_playing();
             profiler.data.game_state = game_core.state.to_string();
+            profiler.data.player_coins = game_core.player.coins;
+            profiler.data.player_boost_percent = game_core.player.boost_percent;
+            profiler.data.player_breath_percent = game_core.player.breath_percent;
 
             // Send telemetry data
             profiler.update();

src/player.rs

@@ -8,7 +8,8 @@ pub struct Player {
     pub direction: Vector2,
     pub size: Vector2,
     pub coins: u32,
-    pub boost_percent: f32
+    pub boost_percent: f32,
+    pub breath_percent: f32
 }
 
 impl Player {
@@ -19,6 +20,7 @@ impl Player {
                 x: 11.0 * 4.0,
                 y: 21.0 * 4.0
             },
+            breath_percent: 1.0,
             ..Default::default()
 			
         }

src/world.rs

@@ -1,11 +1,14 @@
 use std::{fs::File, io::BufReader};
 
+use raylib::math::Vector2;
 use serde::{Deserialize, Serialize};
 use std::io::Read;
 use failure::Error;
 
 #[derive(Debug, Serialize, Deserialize, Clone)]
-pub struct World {}
+pub struct World {
+    pub end_position: Vector2
+}
 
 impl World {
     pub fn load_from_json(file: String) -> Result<Self, Error> {