From 1962d4d325ddf67efad4b1d13e0681067b69f4c0 Mon Sep 17 00:00:00 2001
From: Franklin <franklinblanco@tutanota.com>
Date: Mon, 27 Nov 2023 15:36:57 -0400
Subject: [PATCH 1/2] Velocity and velocity shed

---
 src/comps/core/markers/bullet.rs              |  6 +++--
 src/comps/core/weapons/caliber.rs             | 27 ++++++++++++++++---
 .../core/guns/equipped_gun_collisions.rs      |  2 --
 src/logic/core/guns/mod.rs                    |  3 ++-
 src/logic/core/guns/shoot.rs                  | 20 ++------------
 src/logic/core/guns/update_bullet.rs          | 17 ++++++++++++
 src/scenes/scene1/init.rs                     |  3 ++-
 src/ui/editor/plugin.rs                       |  3 ++-
 8 files changed, 52 insertions(+), 29 deletions(-)
 create mode 100644 src/logic/core/guns/update_bullet.rs

diff --git a/src/comps/core/markers/bullet.rs b/src/comps/core/markers/bullet.rs
index a61b575..ff99f66 100644
--- a/src/comps/core/markers/bullet.rs
+++ b/src/comps/core/markers/bullet.rs
@@ -1,14 +1,16 @@
 use bevy::{
     prelude::{Component, Vec3},
     reflect::Reflect,
-    time::Timer,
+    time::Timer, ecs::reflect::ReflectComponent,
 };
 
 use crate::comps::core::weapons::caliber::Caliber;
 
-#[derive(Component, Reflect)]
+#[derive(Component, Reflect, Default)]
+#[reflect(Component)]
 pub struct BulletMarker {
     pub caliber: Caliber,
     pub starting_point: Vec3,
     pub timer: Timer,
+    pub current_velocity: Vec3,
 }
diff --git a/src/comps/core/weapons/caliber.rs b/src/comps/core/weapons/caliber.rs
index 618bf71..f1fa7b2 100644
--- a/src/comps/core/weapons/caliber.rs
+++ b/src/comps/core/weapons/caliber.rs
@@ -1,13 +1,15 @@
 use bevy::reflect::Reflect;
 
 #[allow(unused)]
-#[derive(Clone, Reflect)]
+#[derive(Clone, Reflect, Default)]
 pub enum Caliber {
     /// 5.56x45mm
     NATO556,
     /// 9x19mm
+    #[default]
     Parabellum9mm,
-    /// 5.45x39mm
+    /// 5.45x39mm (7N6M)
+    /// Reference: [Wikipedia](https://en.wikipedia.org/wiki/5.45%C3%9739mm)
     RU545
 }
 impl Caliber {
@@ -32,11 +34,12 @@ impl Caliber {
             Caliber::RU545 => 75.0,
         }
     }
+    /// Unit = kg
     pub fn mass(&self) -> f32 {
         match self {
-            Caliber::NATO556 => 0.1,
+            Caliber::NATO556 => 0.00402,
             Caliber::Parabellum9mm => 0.05,
-            Caliber::RU545 => 0.07,
+            Caliber::RU545 => 0.00343,
         }
     }
     pub fn linear_damping(&self) -> f32 {
@@ -60,4 +63,20 @@ impl Caliber {
             Caliber::RU545 => 0.06
         }
     }
+    /// Unit = m/s
+    pub fn muzzle_velocity(&self) -> f32 {
+        match self {
+            Caliber::NATO556 => 991.0,
+            Caliber::Parabellum9mm => todo!(),
+            Caliber::RU545 => 880.0,
+        }
+    }
+    /// Unit = m/s
+    pub fn velocity_shed(&self) -> f32 {
+        match self {
+            Caliber::NATO556 => todo!(),
+            Caliber::Parabellum9mm => todo!(),
+            Caliber::RU545 => 120.0,
+        }
+    }
 }
diff --git a/src/logic/core/guns/equipped_gun_collisions.rs b/src/logic/core/guns/equipped_gun_collisions.rs
index dad9027..9f3ae13 100644
--- a/src/logic/core/guns/equipped_gun_collisions.rs
+++ b/src/logic/core/guns/equipped_gun_collisions.rs
@@ -10,7 +10,6 @@ pub fn update_gun_position_on_collision(
     mut events: EventReader<EquippedGunCollisionEvent>,
 ) {
     for event in events.read() {
-        println!("Collision");
         for mut player_firing_info in query.iter_mut() {
             match event.collision_type {
                 CollisionEventType::Start => {
@@ -19,7 +18,6 @@ pub fn update_gun_position_on_collision(
                 },
                 CollisionEventType::End => {
                     player_firing_info.gun_colliding_with_object = false;
-                    //player_firing_info.gun_ready_pose = GunReadyPose::HighReady;
                 },
             }
         }
diff --git a/src/logic/core/guns/mod.rs b/src/logic/core/guns/mod.rs
index 9c668ea..40b27fb 100644
--- a/src/logic/core/guns/mod.rs
+++ b/src/logic/core/guns/mod.rs
@@ -2,4 +2,5 @@ pub mod despawn_shots;
 pub mod player_firing;
 pub mod shoot;
 pub mod inspect;
-pub mod equipped_gun_collisions;
\ No newline at end of file
+pub mod equipped_gun_collisions;
+pub mod update_bullet;
\ No newline at end of file
diff --git a/src/logic/core/guns/shoot.rs b/src/logic/core/guns/shoot.rs
index cb5269f..fb3ef72 100644
--- a/src/logic/core/guns/shoot.rs
+++ b/src/logic/core/guns/shoot.rs
@@ -64,8 +64,6 @@ pub fn shoot_bullet(
         meshes,
         materials,
         firing_point,
-        forward,
-        up,
         caliber,
     );
 }
@@ -75,8 +73,6 @@ pub fn spawn_bullet(
     meshes: &mut ResMut<Assets<Mesh>>,
     materials: &mut ResMut<Assets<StandardMaterial>>,
     firing_point: Transform,
-    forward: Vec3,
-    _up: Vec3,
     caliber: Caliber,
 ) {
     commands.spawn((
@@ -88,6 +84,7 @@ pub fn spawn_bullet(
                 Duration::from_secs_f32(caliber.max_airtime_secs()),
                 TimerMode::Once,
             ),
+            current_velocity: firing_point.forward() * caliber.muzzle_velocity(),
         },
         MaterialMeshBundle {
             mesh: {
@@ -113,21 +110,8 @@ pub fn spawn_bullet(
             transform: firing_point,
             ..Default::default()
         },
-        RigidBody::Dynamic,
-        GravityScale(4.0),
-        Collider::ball(caliber.size()),
-        Velocity::zero(),
-        Damping {
-            linear_damping: caliber.linear_damping(),
-            angular_damping: caliber.angular_damping(),
-        },
-        ColliderMassProperties::Mass(caliber.mass()),
-        ExternalImpulse {
-            impulse: forward * caliber.impulse(),
-            torque_impulse: Vec3::ZERO,
-        },
+        RigidBody::KinematicPositionBased,
         ActiveEvents::COLLISION_EVENTS,
         CollisionGroups::new(Group::from_bits_retain(ColliderFlags::BULLETS.bits()), Group::from_bits_retain((ColliderFlags::SOLIDS | ColliderFlags::FLOOR).bits())),
-        Ccd::enabled(),
     ));
 }
diff --git a/src/logic/core/guns/update_bullet.rs b/src/logic/core/guns/update_bullet.rs
new file mode 100644
index 0000000..1533040
--- /dev/null
+++ b/src/logic/core/guns/update_bullet.rs
@@ -0,0 +1,17 @@
+use bevy::prelude::*;
+use bevy_rapier3d::prelude::*;
+
+use crate::comps::core::markers::bullet::BulletMarker;
+
+pub fn update_bullet(
+    mut commands: Commands,
+    mut bullets: Query<(Entity, &mut BulletMarker, &mut Transform)>,
+    time: Res<Time>,
+) {
+
+    for (bullet, mut marker, mut transform) in bullets.iter_mut() {
+        transform.translation += (marker.current_velocity * time.delta_seconds()) + (Vec3 { x: 0.0, y: -9.81, z: 0.0  } * time.delta_seconds() * marker.caliber.mass());
+        let vel_shed =  marker.caliber.velocity_shed();
+        marker.current_velocity -=  transform.forward() * vel_shed * time.delta_seconds();
+    }
+}
\ No newline at end of file
diff --git a/src/scenes/scene1/init.rs b/src/scenes/scene1/init.rs
index 6c21884..6617de8 100644
--- a/src/scenes/scene1/init.rs
+++ b/src/scenes/scene1/init.rs
@@ -7,7 +7,7 @@ use crate::{
         spawners::{player::player_spawner, spawn::SpawnerPlugin}, events::{bullet_collision::BulletCollisionEvent, equipped_gun_collision::EquippedGunCollisionEvent},
     },
     logic::core::{
-        guns::{despawn_shots::{despawn_muzzle_flashes, despawn_stray_bullets}, inspect::inspect_firearm, equipped_gun_collisions::update_gun_position_on_collision},
+        guns::{despawn_shots::{despawn_muzzle_flashes, despawn_stray_bullets}, inspect::inspect_firearm, equipped_gun_collisions::update_gun_position_on_collision, update_bullet::update_bullet},
         player::{
             camera_player_sync::{
                 follow_cursor_with_camera, update_camera_vertical_position, MouseMovementSettings,
@@ -62,6 +62,7 @@ pub fn load_scene(application: &mut App) {
     application.add_systems(Update, inspect_firearm);
     application.add_systems(Update, collision_handler);
     application.add_systems(Update, update_gun_position_on_collision);
+    application.add_systems(Update, update_bullet);
 
     //application.add_systems(Update, animate_player);
     //application.add_systems(Update, register_bullet_hits);
diff --git a/src/ui/editor/plugin.rs b/src/ui/editor/plugin.rs
index 8baeed1..a754ed4 100644
--- a/src/ui/editor/plugin.rs
+++ b/src/ui/editor/plugin.rs
@@ -5,7 +5,7 @@ use bevy_inspector_egui::bevy_egui::EguiPlugin;
 use crate::{
     comps::core::{markers::{
         holdable::{HoldableObjectData, InPlayerHands},
-        player::{Player, PlayerData, PlayerHand}, inspect_screen::InspectScreenSlotUiMarker,
+        player::{Player, PlayerData, PlayerHand}, inspect_screen::InspectScreenSlotUiMarker, bullet::BulletMarker,
     }, weapons::{firearm_data::FirearmData, magazine_data::MagazineData, caliber::Caliber, firearm::Firearm, spray_pattern::FirearmSprayPattern, firearm_state::FirearmState}},
     logic::core::{
         guns::player_firing::PlayerFiringInfo,
@@ -39,6 +39,7 @@ impl Plugin for MainEditorUiPlugin {
             .register_type::<PlayerValuesState>()
             .register_type::<FirearmData>()
             .register_type::<MagazineData>()
+            .register_type::<BulletMarker>()
             .register_type::<HoldableObjectData>()
             .register_type::<InPlayerHands>()
             .register_type::<PlayerData>()
-- 
2.40.1


From be9e812011024953922ee9f27386410f1fcccc04 Mon Sep 17 00:00:00 2001
From: Franklin <franklinblanco@tutanota.com>
Date: Tue, 28 Nov 2023 10:22:56 -0400
Subject: [PATCH 2/2] New bullet system works REALLY Nice. Maybe remove the
 bullet despawn timer, and change it for a min. velocity

---
 Design.md                            |  2 +-
 src/comps/core/markers/bullet.rs     |  9 +++-
 src/logic/core/guns/despawn_shots.rs |  2 +-
 src/logic/core/guns/shoot.rs         | 16 +++---
 src/logic/core/guns/update_bullet.rs | 80 +++++++++++++++++++++++++---
 src/logic/core/player/hands.rs       |  3 +-
 6 files changed, 94 insertions(+), 18 deletions(-)

diff --git a/Design.md b/Design.md
index 6fa470e..b48da22 100644
--- a/Design.md
+++ b/Design.md
@@ -47,7 +47,7 @@ Multiplayer
     - [ ] Gun Bob on walk
 - [ ] Reload animation (procedural)
     - [ ] Real world magazines
-- [ ] Rewriting bullet physics to use raycasts & kinematic rigidbodies (logic controlled)
+- [x] Rewriting bullet physics to use raycasts & kinematic rigidbodies (logic controlled)
 - [x] Create a Controls struct that holds mappings to all the game keys and replace them in all the game's code
 - [x] Gun dropping drops on only one side of player
 - [x] Gun dropping does not apply impulse for some reason...
diff --git a/src/comps/core/markers/bullet.rs b/src/comps/core/markers/bullet.rs
index ff99f66..0c27da8 100644
--- a/src/comps/core/markers/bullet.rs
+++ b/src/comps/core/markers/bullet.rs
@@ -1,11 +1,17 @@
 use bevy::{
     prelude::{Component, Vec3},
     reflect::Reflect,
-    time::Timer, ecs::reflect::ReflectComponent,
+    time::Timer, ecs::{reflect::ReflectComponent, entity::Entity},
 };
 
 use crate::comps::core::weapons::caliber::Caliber;
 
+#[derive(PartialEq, Clone, Reflect)]
+pub struct BulletHit {
+    pub entity: Entity,
+    pub position: Vec3,
+}
+
 #[derive(Component, Reflect, Default)]
 #[reflect(Component)]
 pub struct BulletMarker {
@@ -13,4 +19,5 @@ pub struct BulletMarker {
     pub starting_point: Vec3,
     pub timer: Timer,
     pub current_velocity: Vec3,
+    pub hits: Vec<BulletHit>,
 }
diff --git a/src/logic/core/guns/despawn_shots.rs b/src/logic/core/guns/despawn_shots.rs
index 48cf5b8..c28474a 100644
--- a/src/logic/core/guns/despawn_shots.rs
+++ b/src/logic/core/guns/despawn_shots.rs
@@ -68,7 +68,7 @@ pub fn despawn_stray_bullets(
     }
 }
 
-fn spawn_bullet_hit_marker(
+pub fn spawn_bullet_hit_marker(
     commands: &mut Commands,
     at: Vec3,
     meshes: &mut ResMut<Assets<Mesh>>,
diff --git a/src/logic/core/guns/shoot.rs b/src/logic/core/guns/shoot.rs
index fb3ef72..29aa26d 100644
--- a/src/logic/core/guns/shoot.rs
+++ b/src/logic/core/guns/shoot.rs
@@ -1,9 +1,9 @@
 use std::time::Duration;
 
-use bevy::{prelude::*, render::render_resource::PrimitiveTopology};
+use bevy::prelude::*;
 use bevy_rapier3d::prelude::*;
 
-use crate::{comps::core::{markers::{bullet::BulletMarker, muzzle_flash::MuzzleFlashMarker, collider_flags::ColliderFlags}, weapons::caliber::Caliber}, logic::core::player::player_settings::PlayerSettings};
+use crate::comps::core::{markers::{bullet::BulletMarker, muzzle_flash::MuzzleFlashMarker, collider_flags::ColliderFlags}, weapons::caliber::Caliber};
 
 
 pub fn shoot_bullet(
@@ -14,7 +14,6 @@ pub fn shoot_bullet(
     forward: Vec3,
     up: Vec3,
     caliber: Caliber,
-    player_settings: &Res<PlayerSettings>
 ) {
     // Spawn muzzle flash LIGHT
     commands.spawn((
@@ -40,7 +39,7 @@ pub fn shoot_bullet(
     ));
 
     // Spawn Line
-    if player_settings.shot_lines_enabled {
+    /*if player_settings.shot_lines_enabled {
         commands.spawn(
             MaterialMeshBundle {
                 mesh: {
@@ -57,13 +56,15 @@ pub fn shoot_bullet(
                 ..Default::default()
             }
         );
-    }
+    }*/
 
     spawn_bullet(
         commands,
         meshes,
         materials,
         firing_point,
+        up,
+        forward,
         caliber,
     );
 }
@@ -73,6 +74,8 @@ pub fn spawn_bullet(
     meshes: &mut ResMut<Assets<Mesh>>,
     materials: &mut ResMut<Assets<StandardMaterial>>,
     firing_point: Transform,
+    _up: Vec3,
+    forward: Vec3,
     caliber: Caliber,
 ) {
     commands.spawn((
@@ -84,7 +87,8 @@ pub fn spawn_bullet(
                 Duration::from_secs_f32(caliber.max_airtime_secs()),
                 TimerMode::Once,
             ),
-            current_velocity: firing_point.forward() * caliber.muzzle_velocity(),
+            current_velocity: forward * caliber.muzzle_velocity(),
+            hits: Vec::new()
         },
         MaterialMeshBundle {
             mesh: {
diff --git a/src/logic/core/guns/update_bullet.rs b/src/logic/core/guns/update_bullet.rs
index 1533040..a7b30ce 100644
--- a/src/logic/core/guns/update_bullet.rs
+++ b/src/logic/core/guns/update_bullet.rs
@@ -1,17 +1,83 @@
-use bevy::prelude::*;
+use bevy::{prelude::*, render::render_resource::PrimitiveTopology, ecs::system::SystemParam};
 use bevy_rapier3d::prelude::*;
 
-use crate::comps::core::markers::bullet::BulletMarker;
+use crate::{comps::core::{markers::{bullet::{BulletMarker, BulletHit}, proxy::weapons::gun_colliders::GunFirearmCollider}, events::{bullet_collision::BulletCollisionEvent, collision_event_type::CollisionEventType}}, logic::core::player::player_settings::PlayerSettings};
+
+#[derive(SystemParam)]
+pub struct UpdateBulletQueryParams<'w, 's> {
+    bullets: Query<'w, 's, (Entity, &'static mut BulletMarker, &'static mut Transform)>,
+    firearm_colliders: Query<'w, 's, Entity, With<GunFirearmCollider>>,
+}
 
 pub fn update_bullet(
     mut commands: Commands,
-    mut bullets: Query<(Entity, &mut BulletMarker, &mut Transform)>,
     time: Res<Time>,
+    rapier_context: Res<RapierContext>,
+    mut meshes: ResMut<Assets<Mesh>>,
+    mut materials: ResMut<Assets<StandardMaterial>>,
+    player_settings: Res<PlayerSettings>,
+    mut query: UpdateBulletQueryParams,
+    mut bullet_collision_event: EventWriter<BulletCollisionEvent>,
 ) {
+    for (bullet, mut marker, mut transform) in query.bullets.iter_mut() {
+        let future_frame_pos = (marker.current_velocity * time.delta_seconds()) + (Vec3 { x: 0.0, y: -9.81, z: 0.0  } * time.delta_seconds() * marker.caliber.mass());
 
-    for (bullet, mut marker, mut transform) in bullets.iter_mut() {
-        transform.translation += (marker.current_velocity * time.delta_seconds()) + (Vec3 { x: 0.0, y: -9.81, z: 0.0  } * time.delta_seconds() * marker.caliber.mass());
-        let vel_shed =  marker.caliber.velocity_shed();
-        marker.current_velocity -=  transform.forward() * vel_shed * time.delta_seconds();
+        let max_toi = transform.translation.distance(future_frame_pos + transform.translation);
+
+        let mut query_filter = QueryFilter::default();
+        for firearm_collider in query.firearm_colliders.iter() {
+            query_filter = query_filter.exclude_collider(firearm_collider);
+        }
+
+        if let Some(bullet_hit) = raycast_until_destination(&rapier_context, query_filter, transform.translation, future_frame_pos, max_toi) {
+            if marker.hits.iter().find(|hit| hit.entity == bullet_hit.entity).is_none() {
+                marker.hits.push(bullet_hit.clone());
+                bullet_collision_event.send(BulletCollisionEvent { bullet, other: bullet_hit.entity, at: Transform::from_translation(bullet_hit.position), collision_type: CollisionEventType::Start })
+            }
+        }
+        
+        if player_settings.shot_lines_enabled {
+            commands.spawn(
+                MaterialMeshBundle {
+                    mesh: {
+                        let mut mesh = Mesh::new(PrimitiveTopology::LineStrip);
+                        mesh.insert_attribute(Mesh::ATTRIBUTE_POSITION, Vec::from([Vec3::ZERO, (future_frame_pos.normalize_or_zero() * max_toi)]));
+                        meshes.add(mesh)
+                    },
+                    material: materials.add(StandardMaterial {
+                        base_color: Color::RED,
+                        emissive: Color::RED,
+                        ..Default::default()
+                    }),
+                    visibility: Visibility::Visible,
+                    transform: *transform,
+                    ..Default::default()
+                }
+            );
+        }
+
+        // Raycast to future frame pos
+        transform.translation += future_frame_pos;
+        let vel_shed =  marker.caliber.velocity_shed() * marker.current_velocity.normalize() * time.delta_seconds();
+        marker.current_velocity -= vel_shed;
     }
+}
+
+fn raycast_until_destination(
+    rapier_context: &RapierContext,
+    query_filter: QueryFilter<'_>,
+    origin: Vec3,
+    dir: Vec3,
+    max_toi: f32,
+) -> Option<BulletHit> { 
+    if let Some((entity, toi)) = rapier_context.cast_ray(
+        origin,
+        dir,
+        max_toi,
+        true,
+        query_filter,
+    ) {
+        return Some(BulletHit { entity, position: origin + dir * toi });
+    }
+    None
 }
\ No newline at end of file
diff --git a/src/logic/core/player/hands.rs b/src/logic/core/player/hands.rs
index 35b284a..fecf192 100644
--- a/src/logic/core/player/hands.rs
+++ b/src/logic/core/player/hands.rs
@@ -266,7 +266,6 @@ pub fn capture_hand_usage(
                                                             forward,
                                                             up,
                                                             firearm_data.caliber.clone(),
-                                                            &resources.player_settings
                                                         );
                                                         // Increment indexes and timers
                                                         player_firing_info.current_round_index += 1;
@@ -336,7 +335,7 @@ pub fn interact_action(
     for player_entity in query.player_query.iter() {
         for global_transform in query.camera_query.iter() {
             let ray_pos = global_transform.translation();
-            let ray_dir = global_transform.forward() * 2.0; // TODO: Move this into global Resource state
+            let ray_dir = global_transform.forward() * 3.0; // TODO: Move this into global Resource state
             let max_toi = 4.0;
             let solid = true;
 
-- 
2.40.1