animated chr

src/lib/wrappers/animation.rs

@@ -24,7 +24,9 @@ impl FrameAnimationWrapper {
 
     /// Start the animation
     pub fn start(&mut self, handle: &RaylibDrawHandle) {
-        self.start_time_seconds = handle.get_time();
+        if self.start_time_seconds == 0.0 {
+            self.start_time_seconds = handle.get_time();
+        }
     }
 
     /// Stop (and reset) the animation
@@ -80,8 +82,8 @@ impl FrameAnimationWrapper {
 
         // Rotation origin
         let origin = Vector2 {
-            x: self.size.x,
+            x: self.size.x / 2.0,
-            y: self.size.y
+            y: self.size.y / 2.0
         };
 
         // Render

src/logic/ingame/playerlogic.rs

@@ -9,7 +9,7 @@ const NORMAL_PLAYER_SPEED: i32 = 3;
 const BOOST_PLAYER_SPEED: i32 = NORMAL_PLAYER_SPEED * 2;
 const CAMERA_FOLLOW_SPEED: f32 = 0.7;
 const TURN_SPEED: f32 = 0.15;
-const BOOST_DECREASE_PER_SECOND: f32 = 0.75;
+const BOOST_DECREASE_PER_SECOND: f32 = 0.65;
 const BOOST_REGEN_PER_SECOND: f32 = 0.25;
 const BREATH_DECREASE_PER_SECOND: f32 = 0.01;
 
@@ -84,10 +84,36 @@ pub fn update_player_movement(
 
         // Decrease the boost
         game_core.player.boost_percent -= BOOST_DECREASE_PER_SECOND * dt as f32;
+        game_core.player.is_boosting = true;
+        if game_core.player.boost_percent >= 0.9 {
+            game_core
+                .resources
+                .player_animation_boost_charge
+                .start(draw_handle);
+            game_core.resources.player_animation_regular.stop();
+            game_core.player.is_boost_charging = true;
+        } else {
+            game_core.resources.player_animation_boost_charge.stop();
+            game_core
+                .resources
+                .player_animation_boost
+                .start(draw_handle);
+            game_core.player.is_boost_charging = false;
+        }
     } else {
         // Set the speed multiplier
         speed_multiplier = NORMAL_PLAYER_SPEED as f32;
 
+        // Reset boost animation
+        game_core.player.is_boosting = false;
+        game_core.player.is_boost_charging = false;
+        game_core.resources.player_animation_boost_charge.stop();
+        game_core.resources.player_animation_boost.stop();
+        game_core
+            .resources
+            .player_animation_regular
+            .start(draw_handle);
+
         // Handle boost regen
         if !user_request_boost {
             game_core.player.boost_percent = (game_core.player.boost_percent
@@ -104,6 +130,9 @@ pub fn update_player_movement(
     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;
+        game_core.player.is_moving = true;
+    } else {
+        game_core.player.is_moving = false;
     }
 
     // Move the camera to follow the player
@@ -139,7 +168,7 @@ pub fn render_player(context_2d: &mut RaylibMode2D<RaylibDrawHandle>, game_core:
             x: player.position.x as i32 as f32,
             y: player.position.y as i32 as f32,
         },
-        boost_ring_max_radius ,
+        boost_ring_max_radius,
         boost_ring_max_radius + 1.0,
         0,
         (360.0 * player.breath_percent) as i32,
@@ -147,19 +176,31 @@ pub fn render_player(context_2d: &mut RaylibMode2D<RaylibDrawHandle>, game_core:
         TRANSLUCENT_WHITE_96,
     );
 
-    // Render the player
+    // Render the player based on what is happening
-    game_core.resources.player_animation_regular.draw(context_2d, player.position, player_rotation.to_degrees() + 90.0);
+    if player.is_boost_charging {
-
+        game_core.resources.player_animation_boost_charge.draw(
-    // TODO: tmp rect
+            context_2d,
-    // context_2d.draw_rectangle_pro(
+            player.position,
-    //     Rectangle {
+            player_rotation.to_degrees() - 90.0,
-    //         x: player.position.x,
+        );
-    //         y: player.position.y,
+    } else if player.is_boosting {
-    //         width: player.size.x,
+        game_core.resources.player_animation_boost.draw(
-    //         height: player.size.y,
+            context_2d,
-    //     },
+            player.position,
-    //     player.size / 2.0,
+            player_rotation.to_degrees() - 90.0,
-    //     player_rotation.to_degrees() + 90.0,
+        );
-    //     Color::BLACK,
+    } else if player.is_moving {
-    // );
+        game_core.resources.player_animation_regular.draw(
+            context_2d,
+            player.position,
+            player_rotation.to_degrees() - 90.0,
+        );
+    } else {
+        game_core.resources.player_animation_regular.draw_frame(
+            context_2d,
+            player.position,
+            player_rotation.to_degrees() - 90.0,
+            0,
+        );
+    }
 }

src/player.rs

@@ -9,7 +9,10 @@ pub struct Player {
     pub size: Vector2,
     pub coins: u32,
     pub boost_percent: f32,
-    pub breath_percent: f32
+    pub breath_percent: f32,
+    pub is_moving: bool,
+    pub is_boosting: bool,
+    pub is_boost_charging: bool
 }
 
 impl Player {

src/resources.rs

@@ -14,6 +14,8 @@ pub struct GlobalResources {
 
     // Player
     pub player_animation_regular: FrameAnimationWrapper,
+    pub player_animation_boost_charge: FrameAnimationWrapper,
+    pub player_animation_boost: FrameAnimationWrapper,
 }
 
 impl GlobalResources {
@@ -36,6 +38,24 @@ impl GlobalResources {
                 8,
                 100 / 8,
             ),
+            player_animation_boost_charge: FrameAnimationWrapper::new(
+                raylib.load_texture_from_image(
+                    &thread,
+                    &Image::load_image("./assets/img/character/diveStrokeCharge.png")?,
+                )?,
+                Vector2 { x: 11.0, y: 21.0 },
+                21,
+                100 / 4,
+            ),
+            player_animation_boost: FrameAnimationWrapper::new(
+                raylib.load_texture_from_image(
+                    &thread,
+                    &Image::load_image("./assets/img/character/diveStroke.png")?,
+                )?,
+                Vector2 { x: 17.0, y: 21.0 },
+                21,
+                30,
+            ),
         })
     }
 }