From 7783c4a165ce36d8d7395be0ccf0517e6105c77e Mon Sep 17 00:00:00 2001
From: Franklin Blanco <me@franklinblanco.dev>
Date: Sun, 17 Sep 2023 18:01:37 -0700
Subject: [PATCH] RELOAD SYSTEM WITH ANIMATION DONE!

---
 assets/weapons/m4a1_rifle.glb           | Bin 55110836 -> 55112272 bytes
 src/logic/core/guns/player_firing.rs    |   2 +
 src/logic/core/guns/spawn_firearm.rs    |   3 +-
 src/logic/core/player/camera_effects.rs |  12 ---
 src/logic/core/player/hands.rs          | 137 ++++++++++++++----------
 src/scenes/scene1/init.rs               |   4 +-
 src/setup/animations.rs                 |   2 +-
 7 files changed, 89 insertions(+), 71 deletions(-)

diff --git a/assets/weapons/m4a1_rifle.glb b/assets/weapons/m4a1_rifle.glb
index 366b2adf0485d2ea8da2acf6bf4cce5536bb6dd0..af01c313fda779244656d8ad594af8f5c36e04a2 100644
GIT binary patch
delta 6577
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

delta 5069
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
UXrF29<Edlc<E-{D&E%K;KhaSWM*si-

diff --git a/src/logic/core/guns/player_firing.rs b/src/logic/core/guns/player_firing.rs
index 49ceba7..f708065 100644
--- a/src/logic/core/guns/player_firing.rs
+++ b/src/logic/core/guns/player_firing.rs
@@ -14,6 +14,7 @@ pub struct PlayerFiringInfo {
     /// Decreases with time, each gun has its own rebound time
     pub current_round_index: usize,
     pub full_auto_timer: Timer,
+    pub is_reloading: bool,
 }
 
 impl Default for PlayerFiringInfo {
@@ -23,6 +24,7 @@ impl Default for PlayerFiringInfo {
             rounds_in_last_spray: Default::default(),
             current_round_index: Default::default(),
             full_auto_timer: Timer::new(Duration::from_secs_f32(0.0), TimerMode::Repeating),
+            is_reloading: false,
         }
     }
 }
diff --git a/src/logic/core/guns/spawn_firearm.rs b/src/logic/core/guns/spawn_firearm.rs
index 4307994..1c7d684 100644
--- a/src/logic/core/guns/spawn_firearm.rs
+++ b/src/logic/core/guns/spawn_firearm.rs
@@ -45,7 +45,6 @@ pub fn spawn_firearm_on_player_hands(
             TimerMode::Once,
         );
         // Load animations
-        commands.insert_resource(FirearmAnimations { reload_magazine: asset_server.load(format!("{}#Animation0", DEFAULT_PLAYER_FIREARM.firearm_data().asset_path)),
-    rock_charging_handle: asset_server.load(format!("{}#Animation1", DEFAULT_PLAYER_FIREARM.firearm_data().asset_path)) })
+        commands.insert_resource(FirearmAnimations { reload_magazine: asset_server.load(format!("{}#Animation0", DEFAULT_PLAYER_FIREARM.firearm_data().asset_path))})
     }
 }
diff --git a/src/logic/core/player/camera_effects.rs b/src/logic/core/player/camera_effects.rs
index 3e77089..e69de29 100644
--- a/src/logic/core/player/camera_effects.rs
+++ b/src/logic/core/player/camera_effects.rs
@@ -1,12 +0,0 @@
-use bevy::prelude::*;
-
-use crate::setup::animations::FirearmAnimations;
-
-pub fn setup_scene_once_loaded(
-    animations: Res<FirearmAnimations>,
-    mut players: Query<&mut AnimationPlayer, Added<AnimationPlayer>>,
-) {
-    for mut player in &mut players {
-        player.play(animations.reload_magazine.clone_weak()).repeat();
-    }
-}
\ No newline at end of file
diff --git a/src/logic/core/player/hands.rs b/src/logic/core/player/hands.rs
index dc9eaaf..a24a3c7 100644
--- a/src/logic/core/player/hands.rs
+++ b/src/logic/core/player/hands.rs
@@ -2,11 +2,12 @@ use bevy::prelude::*;
 
 use crate::{
     comps::core::markers::{firearm::{FirearmData, MagazineData}, holdable::InPlayerHands, player::PlayerHand},
-    logic::core::guns::player_firing::PlayerFiringInfo, utils::rad_deg::radians_from_degrees,
+    logic::core::guns::player_firing::PlayerFiringInfo, utils::rad_deg::radians_from_degrees, setup::animations::FirearmAnimations,
 };
 
 pub fn capture_hand_usage(
     mouse_buttons: Res<Input<MouseButton>>,
+    keyboard_input: Res<Input<KeyCode>>,
     mut hand_query: Query<&mut Transform, With<PlayerHand>>,
     time: Res<Time>,
 
@@ -15,69 +16,97 @@ pub fn capture_hand_usage(
         (&mut Transform, &'static FirearmData, &mut MagazineData),
         (With<InPlayerHands>, Without<PlayerHand>),
     >,
+
+    animation_clips: Res<Assets<AnimationClip>>,
+
+    animations: Res<FirearmAnimations>,
+    mut players: Query<&mut AnimationPlayer>,
 ) {
     player_firing_info.full_auto_timer.tick(time.delta());
 
     for (mut _firearm_transform, firearm_data, mut magazine_data) in firearm_query.iter_mut() {
         for mut hand_transform in hand_query.iter_mut() {
-            // AIMING IN/OUT
-            if mouse_buttons.pressed(MouseButton::Right) {
-                let rotation_lerp_quat = hand_transform.rotation.lerp(
-                    firearm_data.final_aimed_rotation,
-                    (time.delta_seconds() / firearm_data.rebound_time_seconds).clamp(0.0, 1.0),
-                );
-                let position_lerp_vec3 = hand_transform.translation.lerp(
-                    firearm_data.final_aimed_position,
-                    (time.delta_seconds() / firearm_data.rebound_time_seconds).clamp(0.0, 1.0),
-                );
-                hand_transform.rotation = rotation_lerp_quat;
-                hand_transform.translation = position_lerp_vec3;
-            } else {   
-                hand_transform.rotation = hand_transform
-                    .rotation
-                    .lerp(firearm_data.final_rotation, (time.delta_seconds() / firearm_data.rebound_time_seconds).clamp(0.0, 1.0));
-                hand_transform.translation = hand_transform.translation.lerp(
-                    firearm_data.final_position,
-                    (time.delta_seconds() / firearm_data.rebound_time_seconds).clamp(0.0, 1.0),
-                );
-            }
-            // SHOOTING & RECOIL
-            if mouse_buttons.pressed(MouseButton::Left) {
-                if player_firing_info.full_auto_timer.finished() {
-                    if magazine_data.rounds_shot < magazine_data.max_capacity {
-                        // Get recoil numbers from patterns
-                        let vertical_recoil_number: f32 = match firearm_data.recoil_pattern.vertical.get(player_firing_info.current_round_index) {
-                            Some(vert_recoil_number) => *vert_recoil_number,
-                            None => {
-                                *firearm_data.recoil_pattern.vertical.last().expect("FOUND A FIREARM_DATA WITHOUT ANY FIREARM_RECOIL_PATTERN.")
-                            },
-                        };
-                        let horizontal_recoil_number: f32 = match firearm_data.recoil_pattern.horizontal.get(player_firing_info.current_round_index) {
-                            Some(horizontal_recoil_number) => *horizontal_recoil_number,
-                            None => {
-                                *firearm_data.recoil_pattern.horizontal.last().expect("FOUND A FIREARM_DATA WITHOUT ANY FIREARM_RECOIL_PATTERN.")
-                            },
-                        };
-                        // Increment indexes and timers
-                        player_firing_info.current_round_index += 1;
-                        player_firing_info.last_shot_timestamp = time.elapsed_seconds();
-                        player_firing_info.full_auto_timer.reset();
-                        magazine_data.rounds_shot += 1;
 
-                        // Apply recoil
-                        hand_transform
-                            .rotate_x(radians_from_degrees(firearm_data.vertical_recoil_modifier * vertical_recoil_number));
-                        hand_transform.rotate_y(radians_from_degrees(firearm_data.horizontal_recoil_modifier * horizontal_recoil_number));
-                    } else {
-                        //TODO: play magazine empty sound
+            if player_firing_info.is_reloading {
+                for mut player in &mut players {
+                    if let Some(reload_animation) = animation_clips.get(&animations.reload_magazine) {
+                        if player.elapsed() >= reload_animation.duration() {
+                            magazine_data.rounds_shot = 0;
+                            player_firing_info.is_reloading = false;
+                        }
                     }
-                    
                 }
-            } else {
-                if player_firing_info.full_auto_timer.finished() {
-                    player_firing_info.current_round_index = 0;
+            } else { // Player is not in a reload animation
+                if keyboard_input.just_pressed(KeyCode::R) {
+                    // Start reload animation
+                    for mut player in &mut players {
+                        player.start(animations.reload_magazine.clone_weak());
+                        player_firing_info.is_reloading = true;
+                    }
+                    // Set is_reloading = true
+                    // At the end of reload animation, set magazine data to capacity = 0
+
+                }
+                // AIMING IN/OUT
+                if mouse_buttons.pressed(MouseButton::Right) {
+                    let rotation_lerp_quat = hand_transform.rotation.lerp(
+                        firearm_data.final_aimed_rotation,
+                        (time.delta_seconds() / firearm_data.rebound_time_seconds).clamp(0.0, 1.0),
+                    );
+                    let position_lerp_vec3 = hand_transform.translation.lerp(
+                        firearm_data.final_aimed_position,
+                        (time.delta_seconds() / firearm_data.rebound_time_seconds).clamp(0.0, 1.0),
+                    );
+                    hand_transform.rotation = rotation_lerp_quat;
+                    hand_transform.translation = position_lerp_vec3;
+                } else {   
+                    hand_transform.rotation = hand_transform
+                        .rotation
+                        .lerp(firearm_data.final_rotation, (time.delta_seconds() / firearm_data.rebound_time_seconds).clamp(0.0, 1.0));
+                    hand_transform.translation = hand_transform.translation.lerp(
+                        firearm_data.final_position,
+                        (time.delta_seconds() / firearm_data.rebound_time_seconds).clamp(0.0, 1.0),
+                    );
+                }
+                // SHOOTING & RECOIL
+                if mouse_buttons.pressed(MouseButton::Left) {
+                    if player_firing_info.full_auto_timer.finished() {
+                        if magazine_data.rounds_shot < magazine_data.max_capacity {
+                            // Get recoil numbers from patterns
+                            let vertical_recoil_number: f32 = match firearm_data.recoil_pattern.vertical.get(player_firing_info.current_round_index) {
+                                Some(vert_recoil_number) => *vert_recoil_number,
+                                None => {
+                                    *firearm_data.recoil_pattern.vertical.last().expect("FOUND A FIREARM_DATA WITHOUT ANY FIREARM_RECOIL_PATTERN.")
+                                },
+                            };
+                            let horizontal_recoil_number: f32 = match firearm_data.recoil_pattern.horizontal.get(player_firing_info.current_round_index) {
+                                Some(horizontal_recoil_number) => *horizontal_recoil_number,
+                                None => {
+                                    *firearm_data.recoil_pattern.horizontal.last().expect("FOUND A FIREARM_DATA WITHOUT ANY FIREARM_RECOIL_PATTERN.")
+                                },
+                            };
+                            // Increment indexes and timers
+                            player_firing_info.current_round_index += 1;
+                            player_firing_info.last_shot_timestamp = time.elapsed_seconds();
+                            player_firing_info.full_auto_timer.reset();
+                            magazine_data.rounds_shot += 1;
+
+                            // Apply recoil
+                            hand_transform
+                                .rotate_x(radians_from_degrees(firearm_data.vertical_recoil_modifier * vertical_recoil_number));
+                            hand_transform.rotate_y(radians_from_degrees(firearm_data.horizontal_recoil_modifier * horizontal_recoil_number));
+                        } else {
+                            //TODO: play magazine empty sound
+                        }
+                        
+                    }
+                } else {
+                    if player_firing_info.full_auto_timer.finished() {
+                        player_firing_info.current_round_index = 0;
+                    }
                 }
             }
+            
         }
     }
 
diff --git a/src/scenes/scene1/init.rs b/src/scenes/scene1/init.rs
index b118bc2..a9764e0 100644
--- a/src/scenes/scene1/init.rs
+++ b/src/scenes/scene1/init.rs
@@ -10,7 +10,7 @@ use crate::{
             },
             hands::capture_hand_usage,
             player_vertical_sync::sync_player_y_state,
-            spawn_player::spawn_player, camera_effects::setup_scene_once_loaded,
+            spawn_player::spawn_player,
         },
     },
 };
@@ -43,6 +43,6 @@ pub fn load_scene(application: &mut App) {
     application.add_systems(Update, capture_hand_usage);
 
     application.add_systems(Startup, setup_lighting);
-    application.add_systems(Update, setup_scene_once_loaded);
+    //application.add_systems(Update, setup_scene_once_loaded);
     //application.add_systems(Update, play_animation);
 }
diff --git a/src/setup/animations.rs b/src/setup/animations.rs
index dfea75d..179bca7 100644
--- a/src/setup/animations.rs
+++ b/src/setup/animations.rs
@@ -3,5 +3,5 @@ use bevy::prelude::*;
 #[derive(Resource)]
 pub struct FirearmAnimations {
     pub reload_magazine: Handle<AnimationClip>,
-    pub rock_charging_handle: Handle<AnimationClip>,
+    
 }
\ No newline at end of file