Throw projectile (#19)
This commit is contained in:
extrawurst
184
src/abilities/gun.rs
Normal file
184
src/abilities/gun.rs
Normal file
@@ -0,0 +1,184 @@
|
||||
use super::{Projectile, TriggerState};
|
||||
use crate::{
|
||||
GameState,
|
||||
aim::AimState,
|
||||
billboards::Billboard,
|
||||
loading_assets::GameAssets,
|
||||
physics_layers::GameLayer,
|
||||
player::{Player, PlayerRig},
|
||||
sounds::PlaySound,
|
||||
utils::sprite_3d_animation::AnimationTimer,
|
||||
};
|
||||
use avian3d::prelude::{
|
||||
Collider, CollisionLayers, CollisionStarted, LayerMask, PhysicsLayer, Sensor,
|
||||
};
|
||||
use bevy::{pbr::NotShadowCaster, prelude::*};
|
||||
use bevy_polyline::prelude::*;
|
||||
use bevy_sprite3d::{Sprite3dBuilder, Sprite3dParams};
|
||||
use std::f32::consts::PI;
|
||||
|
||||
#[derive(Component)]
|
||||
struct GunProjectile {
|
||||
time: f32,
|
||||
}
|
||||
|
||||
const MAX_SHOT_AGES: f32 = 1.;
|
||||
|
||||
#[derive(Resource)]
|
||||
struct ShotAssets {
|
||||
image: Handle<Image>,
|
||||
layout: Handle<TextureAtlasLayout>,
|
||||
}
|
||||
|
||||
pub fn plugin(app: &mut App) {
|
||||
app.add_systems(OnEnter(GameState::Playing), setup);
|
||||
app.add_systems(
|
||||
Update,
|
||||
(update, shot_collision, timeout).run_if(in_state(GameState::Playing)),
|
||||
);
|
||||
app.add_observer(on_trigger_state);
|
||||
}
|
||||
|
||||
fn setup(mut commands: Commands, assets: Res<GameAssets>, mut sprite_params: Sprite3dParams) {
|
||||
let layout = TextureAtlasLayout::from_grid(UVec2::splat(256), 7, 6, None, None);
|
||||
let texture_atlas_layout = sprite_params.atlas_layouts.add(layout);
|
||||
|
||||
commands.insert_resource(ShotAssets {
|
||||
image: assets.impact_atlas.clone(),
|
||||
layout: texture_atlas_layout,
|
||||
});
|
||||
}
|
||||
|
||||
fn on_trigger_state(
|
||||
trigger: Trigger<TriggerState>,
|
||||
mut commands: Commands,
|
||||
aim: Res<AimState>,
|
||||
player_rot: Query<&Transform, With<PlayerRig>>,
|
||||
player: Query<(&Transform, &Player)>,
|
||||
target_transform: Query<&Transform, (Without<Player>, Without<PlayerRig>)>,
|
||||
time: Res<Time>,
|
||||
mut polyline_materials: ResMut<Assets<PolylineMaterial>>,
|
||||
mut polylines: ResMut<Assets<Polyline>>,
|
||||
) {
|
||||
if matches!(trigger.event(), TriggerState::Active) {
|
||||
let Some((player_pos, player_head)) =
|
||||
player.iter().next().map(|(t, p)| (t.translation, p.0))
|
||||
else {
|
||||
return;
|
||||
};
|
||||
|
||||
// TODO: proper weapon classes
|
||||
if ![2, 3, 9].contains(&player_head) {
|
||||
return;
|
||||
}
|
||||
|
||||
commands.trigger(PlaySound::Gun);
|
||||
|
||||
let Some(rotation) = player_rot.iter().next().map(|t| t.rotation) else {
|
||||
return;
|
||||
};
|
||||
|
||||
let rotation = if let Some(target) = aim.target {
|
||||
let t = target_transform
|
||||
.get(target)
|
||||
.expect("target must have transform");
|
||||
Transform::from_translation(player_pos)
|
||||
.looking_at(t.translation, Vec3::Y)
|
||||
.rotation
|
||||
} else {
|
||||
rotation.mul_quat(Quat::from_rotation_y(PI))
|
||||
};
|
||||
|
||||
let mut t = Transform::from_translation(player_pos).with_rotation(rotation);
|
||||
t.translation += t.forward().as_vec3() * 2.;
|
||||
|
||||
commands
|
||||
.spawn((
|
||||
Name::new("projectile-gun"),
|
||||
GunProjectile {
|
||||
time: time.elapsed_secs(),
|
||||
},
|
||||
Projectile { damage: 10 },
|
||||
Collider::capsule_endpoints(0.5, Vec3::new(0., 0., 0.), Vec3::new(0., 0., -3.)),
|
||||
CollisionLayers::new(
|
||||
LayerMask(GameLayer::Projectile.to_bits()),
|
||||
LayerMask(GameLayer::Npc.to_bits() | GameLayer::Level.to_bits()),
|
||||
),
|
||||
Sensor,
|
||||
Visibility::default(),
|
||||
t,
|
||||
))
|
||||
.with_child(PolylineBundle {
|
||||
polyline: PolylineHandle(polylines.add(Polyline {
|
||||
vertices: vec![Vec3::Z * 2., Vec3::Z * -2.],
|
||||
})),
|
||||
material: PolylineMaterialHandle(polyline_materials.add(PolylineMaterial {
|
||||
width: 10.0,
|
||||
color: LinearRgba::rgb(0.9, 0.9, 0.),
|
||||
perspective: false,
|
||||
..default()
|
||||
})),
|
||||
..default()
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
fn update(mut query: Query<&mut Transform, With<GunProjectile>>) {
|
||||
for mut transform in query.iter_mut() {
|
||||
let forward = transform.forward();
|
||||
transform.translation += forward * 2.;
|
||||
}
|
||||
}
|
||||
|
||||
fn timeout(mut commands: Commands, query: Query<(Entity, &GunProjectile)>, time: Res<Time>) {
|
||||
let current_time = time.elapsed_secs();
|
||||
|
||||
for (e, GunProjectile { time }) in query.iter() {
|
||||
if current_time > time + MAX_SHOT_AGES {
|
||||
commands.entity(e).despawn_recursive();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fn shot_collision(
|
||||
mut commands: Commands,
|
||||
mut collision_event_reader: EventReader<CollisionStarted>,
|
||||
query_shot: Query<(&GunProjectile, &Transform)>,
|
||||
assets: Res<ShotAssets>,
|
||||
mut sprite_params: Sprite3dParams,
|
||||
) {
|
||||
for CollisionStarted(e1, e2) in collision_event_reader.read() {
|
||||
if !query_shot.contains(*e1) && !query_shot.contains(*e2) {
|
||||
continue;
|
||||
}
|
||||
|
||||
let shot_entity = if query_shot.contains(*e1) { *e1 } else { *e2 };
|
||||
|
||||
let shot_pos = query_shot.get(shot_entity).unwrap().1.translation;
|
||||
|
||||
commands.entity(shot_entity).despawn_recursive();
|
||||
|
||||
let texture_atlas = TextureAtlas {
|
||||
layout: assets.layout.clone(),
|
||||
index: 0,
|
||||
};
|
||||
|
||||
commands
|
||||
.spawn(
|
||||
Sprite3dBuilder {
|
||||
image: assets.image.clone(),
|
||||
pixels_per_metre: 128.,
|
||||
alpha_mode: AlphaMode::Blend,
|
||||
unlit: true,
|
||||
..default()
|
||||
}
|
||||
.bundle_with_atlas(&mut sprite_params, texture_atlas),
|
||||
)
|
||||
.insert((
|
||||
Billboard,
|
||||
Transform::from_translation(shot_pos),
|
||||
NotShadowCaster,
|
||||
AnimationTimer::new(Timer::from_seconds(0.01, TimerMode::Repeating)),
|
||||
));
|
||||
}
|
||||
}
|
||||
49
src/abilities/mod.rs
Normal file
49
src/abilities/mod.rs
Normal file
@@ -0,0 +1,49 @@
|
||||
mod gun;
|
||||
mod thrown;
|
||||
|
||||
use crate::{GameState, npc::Hit, tb_entities::EnemySpawn};
|
||||
use avian3d::prelude::*;
|
||||
use bevy::prelude::*;
|
||||
|
||||
#[derive(Component)]
|
||||
pub struct Projectile {
|
||||
pub damage: u32,
|
||||
}
|
||||
|
||||
#[derive(Event, Reflect)]
|
||||
pub enum TriggerState {
|
||||
Active,
|
||||
Inactive,
|
||||
}
|
||||
|
||||
pub fn plugin(app: &mut App) {
|
||||
app.add_plugins(gun::plugin);
|
||||
app.add_plugins(thrown::plugin);
|
||||
|
||||
app.add_systems(Update, enemy_hit.run_if(in_state(GameState::Playing)));
|
||||
}
|
||||
|
||||
fn enemy_hit(
|
||||
mut commands: Commands,
|
||||
mut collision_event_reader: EventReader<CollisionStarted>,
|
||||
query_shot: Query<&Projectile>,
|
||||
query_npc: Query<&EnemySpawn>,
|
||||
) {
|
||||
for CollisionStarted(e1, e2) in collision_event_reader.read() {
|
||||
if !query_shot.contains(*e1) && !query_shot.contains(*e2) {
|
||||
continue;
|
||||
}
|
||||
if !query_npc.contains(*e1) && !query_npc.contains(*e2) {
|
||||
continue;
|
||||
}
|
||||
|
||||
let (enemy_entity, projectile) = if query_npc.contains(*e1) {
|
||||
(*e1, query_shot.get(*e2))
|
||||
} else {
|
||||
(*e2, query_shot.get(*e1))
|
||||
};
|
||||
|
||||
let damage = projectile.map(|p| p.damage).unwrap_or_default();
|
||||
commands.entity(enemy_entity).trigger(Hit { damage });
|
||||
}
|
||||
}
|
||||
217
src/abilities/thrown.rs
Normal file
217
src/abilities/thrown.rs
Normal file
@@ -0,0 +1,217 @@
|
||||
use super::TriggerState;
|
||||
use crate::{
|
||||
GameState,
|
||||
abilities::Projectile,
|
||||
aim::AimState,
|
||||
billboards::Billboard,
|
||||
loading_assets::GameAssets,
|
||||
physics_layers::GameLayer,
|
||||
player::{Player, PlayerRig},
|
||||
sounds::PlaySound,
|
||||
utils::sprite_3d_animation::AnimationTimer,
|
||||
};
|
||||
use avian3d::prelude::*;
|
||||
use bevy::{pbr::NotShadowCaster, prelude::*};
|
||||
use bevy_sprite3d::{Sprite3dBuilder, Sprite3dParams};
|
||||
use std::f32::consts::PI;
|
||||
|
||||
#[derive(Component)]
|
||||
struct ThrownProjectile;
|
||||
|
||||
#[derive(Component, Reflect)]
|
||||
#[reflect(Component)]
|
||||
struct AutoRotation(Quat);
|
||||
|
||||
#[derive(Resource)]
|
||||
struct ShotAssets {
|
||||
image: Handle<Image>,
|
||||
layout: Handle<TextureAtlasLayout>,
|
||||
}
|
||||
|
||||
pub fn plugin(app: &mut App) {
|
||||
app.register_type::<AutoRotation>();
|
||||
|
||||
app.add_systems(OnEnter(GameState::Playing), setup);
|
||||
app.add_systems(Update, shot_collision.run_if(in_state(GameState::Playing)));
|
||||
app.add_systems(FixedUpdate, update_auto_rotation);
|
||||
app.add_observer(on_trigger_state);
|
||||
}
|
||||
|
||||
fn setup(mut commands: Commands, assets: Res<GameAssets>, mut sprite_params: Sprite3dParams) {
|
||||
let layout = TextureAtlasLayout::from_grid(UVec2::splat(256), 7, 6, None, None);
|
||||
let texture_atlas_layout = sprite_params.atlas_layouts.add(layout);
|
||||
|
||||
commands.insert_resource(ShotAssets {
|
||||
image: assets.impact_atlas.clone(),
|
||||
layout: texture_atlas_layout,
|
||||
});
|
||||
}
|
||||
|
||||
fn launch_velocity(
|
||||
start_pos: Vec3,
|
||||
target_pos: Vec3,
|
||||
initial_velocity: f32,
|
||||
gravity: f32,
|
||||
) -> Option<Vec3> {
|
||||
// Calculate displacement
|
||||
let delta = target_pos - start_pos;
|
||||
|
||||
// Calculate horizontal distance
|
||||
let horizontal_dist = (delta.x * delta.x + delta.z * delta.z).sqrt();
|
||||
|
||||
// Calculate terms for the quadratic formula
|
||||
let v_squared = initial_velocity * initial_velocity;
|
||||
let discriminant = v_squared * v_squared
|
||||
- gravity * (gravity * horizontal_dist * horizontal_dist + 2.0 * delta.y * v_squared);
|
||||
|
||||
if discriminant < 0.0 {
|
||||
return None;
|
||||
}
|
||||
|
||||
// Calculate pitch angles
|
||||
let term1 = v_squared / (gravity * horizontal_dist);
|
||||
let term2 = discriminant.sqrt() / (gravity * horizontal_dist);
|
||||
|
||||
// let pitch_high = (term1 + term2).atan();
|
||||
let pitch_low = (term1 - term2).atan();
|
||||
|
||||
// Calculate yaw angle
|
||||
let yaw = delta.z.atan2(delta.x);
|
||||
|
||||
let pitch = pitch_low;
|
||||
|
||||
let dir_x = pitch.cos() * yaw.cos();
|
||||
let dir_y = pitch.sin();
|
||||
let dir_z = pitch.cos() * yaw.sin();
|
||||
|
||||
let result = Vec3::new(
|
||||
initial_velocity * dir_x,
|
||||
initial_velocity * dir_y,
|
||||
initial_velocity * dir_z,
|
||||
);
|
||||
|
||||
Some(result)
|
||||
}
|
||||
|
||||
fn on_trigger_state(
|
||||
trigger: Trigger<TriggerState>,
|
||||
mut commands: Commands,
|
||||
aim: Res<AimState>,
|
||||
player_rot: Query<&Transform, With<PlayerRig>>,
|
||||
player: Query<(&Transform, &Player)>,
|
||||
target_transform: Query<&Transform, (Without<Player>, Without<PlayerRig>)>,
|
||||
assets: Res<GameAssets>,
|
||||
) {
|
||||
if matches!(trigger.event(), TriggerState::Active) {
|
||||
let Some((player_pos, player_head)) =
|
||||
player.iter().next().map(|(t, p)| (t.translation, p.0))
|
||||
else {
|
||||
return;
|
||||
};
|
||||
|
||||
// TODO: proper weapon classes
|
||||
if ![0, 8, 16, 17].contains(&player_head) {
|
||||
return;
|
||||
}
|
||||
|
||||
commands.trigger(PlaySound::Throw);
|
||||
|
||||
let Some((rotation, player_forward)) =
|
||||
player_rot.iter().next().map(|t| (t.rotation, t.forward()))
|
||||
else {
|
||||
return;
|
||||
};
|
||||
|
||||
const SPEED: f32 = 35.;
|
||||
|
||||
let vel = if let Some(target) = aim.target {
|
||||
let t = target_transform
|
||||
.get(target)
|
||||
.expect("target must have transform");
|
||||
|
||||
launch_velocity(
|
||||
player_pos + player_forward.as_vec3() * 2.,
|
||||
t.translation,
|
||||
SPEED,
|
||||
9.81,
|
||||
)
|
||||
.unwrap()
|
||||
} else {
|
||||
rotation.mul_quat(Quat::from_rotation_y(-PI / 2.))
|
||||
* (Vec3::new(2., 1., 0.).normalize() * SPEED)
|
||||
};
|
||||
|
||||
let t = Transform::from_translation(player_pos);
|
||||
|
||||
commands
|
||||
.spawn((
|
||||
Name::new("projectile-thrown"),
|
||||
ThrownProjectile,
|
||||
Projectile { damage: 20 },
|
||||
Collider::sphere(0.5),
|
||||
CollisionLayers::new(
|
||||
LayerMask(GameLayer::Projectile.to_bits()),
|
||||
LayerMask(GameLayer::Npc.to_bits() | GameLayer::Level.to_bits()),
|
||||
),
|
||||
RigidBody::Dynamic,
|
||||
LinearVelocity(vel),
|
||||
Visibility::default(),
|
||||
t,
|
||||
))
|
||||
.with_child((
|
||||
AutoRotation(Quat::from_rotation_x(0.4) * Quat::from_rotation_z(0.3)),
|
||||
Transform::from_scale(Vec3::splat(10.)),
|
||||
SceneRoot(assets.molotov.clone()),
|
||||
));
|
||||
}
|
||||
}
|
||||
|
||||
fn shot_collision(
|
||||
mut commands: Commands,
|
||||
mut collision_event_reader: EventReader<CollisionStarted>,
|
||||
query_shot: Query<(&ThrownProjectile, &Transform)>,
|
||||
assets: Res<ShotAssets>,
|
||||
mut sprite_params: Sprite3dParams,
|
||||
) {
|
||||
for CollisionStarted(e1, e2) in collision_event_reader.read() {
|
||||
if !query_shot.contains(*e1) && !query_shot.contains(*e2) {
|
||||
continue;
|
||||
}
|
||||
|
||||
let shot_entity = if query_shot.contains(*e1) { *e1 } else { *e2 };
|
||||
|
||||
let shot_pos = query_shot.get(shot_entity).unwrap().1.translation;
|
||||
|
||||
commands.entity(shot_entity).despawn_recursive();
|
||||
|
||||
let texture_atlas = TextureAtlas {
|
||||
layout: assets.layout.clone(),
|
||||
index: 0,
|
||||
};
|
||||
|
||||
commands.trigger(PlaySound::ThrowHit);
|
||||
commands
|
||||
.spawn(
|
||||
Sprite3dBuilder {
|
||||
image: assets.image.clone(),
|
||||
pixels_per_metre: 32.,
|
||||
alpha_mode: AlphaMode::Blend,
|
||||
unlit: true,
|
||||
..default()
|
||||
}
|
||||
.bundle_with_atlas(&mut sprite_params, texture_atlas),
|
||||
)
|
||||
.insert((
|
||||
Billboard,
|
||||
Transform::from_translation(shot_pos),
|
||||
NotShadowCaster,
|
||||
AnimationTimer::new(Timer::from_seconds(0.02, TimerMode::Repeating)),
|
||||
));
|
||||
}
|
||||
}
|
||||
|
||||
fn update_auto_rotation(mut query: Query<(&AutoRotation, &mut Transform)>) {
|
||||
for (auto_rotation, mut transform) in query.iter_mut() {
|
||||
transform.rotate_local(auto_rotation.0);
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user