From 7700d4bef9b1be7a98d00e932bfa959ca6990008 Mon Sep 17 00:00:00 2001
From: extrawurst <mail@rusticorn.com>
Date: Mon, 23 Jun 2025 00:05:24 +0200
Subject: [PATCH] beaming in characters

---
 assets/models/beaming.glb   | Bin 0 -> 1972 bytes
 assets/textures/beaming.png | Bin 0 -> 463 bytes
 src/abilities/arrow.rs      |   2 +-
 src/abilities/curver.rs     |   2 +-
 src/abilities/gun.rs        |   2 +-
 src/abilities/missile.rs    |   2 +-
 src/abilities/thrown.rs     |   2 +-
 src/aim/marker.rs           |   2 +-
 src/head_drop.rs            |   2 +-
 src/heal_effect.rs          |   2 +-
 src/keys.rs                 |   2 +-
 src/loading_assets.rs       |   3 +++
 src/npc.rs                  |  50 +++++++++++++++++++++++++++++++++---
 src/player.rs               |   3 +++
 src/utils/billboards.rs     |  38 ++++++++++++++++++++-------
 15 files changed, 91 insertions(+), 21 deletions(-)
 create mode 100644 assets/models/beaming.glb
 create mode 100644 assets/textures/beaming.png

diff --git a/assets/models/beaming.glb b/assets/models/beaming.glb
new file mode 100644
index 0000000000000000000000000000000000000000..39887023ad14a4a0004c00c254b9ca101fc4ec48
GIT binary patch
literal 1972
zcmeHIOK4PA7(PjAwE<D+PP!Nlg+jR*?_)BLtEe-1PLs^UnL!Fs^vuke$;JEf+%tJF
zL_=0)QM%|#5fxmxOBUm*Mbc`Z3#(wEZln}Ml%gWIP(obzpL=g~FxJPu^SbB!=luWo
z{onteGj+2x*ohFjvK67dTM+uLn9nsa@jS}0-o$lkQ%1PMu#QJ2nPWR%qz*2Tj7jY(
zWs&Ued}JyXjYWIoSi)13d4^-dW;H6~ISG3e2!M4t9C=uuXkwdKV8ca!O~STQrD8!o
zGI!+7tcfk^P5Q3k{&AB)ED1A*6Yir-$kBwHP~>=0O~#X{-bAk|$>P1q?1#1pr_3N`
zz=D|WBpCy2ppqFK$n`_$s?#W&v}jam73-WeDDVl$j)lIk$t|-n%86+jm4ef#PukRj
zh)rB39_@2Xhn46IZ!n14#0H2o14)1sR_HTGD!!iboJdzB>1Y31mW?!BW>^L{rovUi
zIWx))E~ZU9o-bxg*?i8|CzmgbrAM)@NVqiceP2Fb=szlBT?J6UH!8wK1E`G@fR3*R
z4|oQ0c*Jr|3UwB>avH26$|e{Z7O96E%8go$vO@-)#(E3_8Wt_hx<WvI({9(UgFc~R
zWlAgq3?c@p013}w0aSY!K&v>G>)6!hL9AXyjSFMLh7J@c1O%K=q@Gw*ODKw#6va+x
ziIhfr<fJ4E5e;a$iJt%5)1$&B9xy#L(5FFXLb=+K0p&ix;(gxgCwQxyu%R-Wv3;Yj
z0B8|n7yHtq>4LB48}99j`n4<1aym-wI)}3pOG;SG^R=3Po<VF*SX~@#EtZNygKWs~
zL01v#V|_Icq#ZUTa`;GG<t<-DeG6E7AL%&g){d;i{1y&-JJ1T+dC)N7Cct_sp{D%q
zd2L7~6B3?g#4UnE8r&_xtQ5{fF9+I(y0?iPmt%0O4#Q=d$>!ijonMJw-O~~S`0Q^R
zZ`glrv%^@t=JyBBPZ<lJclmXoE(p_wI?>{IZfJY=u5Ora&kpw&;5je8+dhZi>-)$J
zcyxG$p$uBO_0_*HUd;BVOEc%5{5jHnZG0#CZT9@{>laqnSASR-{yIH9_1CxZPp6j8
zoOu+#Yu)_WZr%K2?~l&$JKnw>%dOVKxz_s0l}nEvKY5xud*Sc3E7K3wUOYdwc7EmM
z<r}w0p8fOL&Tr<E9jjkNa_B_o=`RnQL-+nSy<3T2y1KTy=>EmRL8uVQ!hh6K=GX#y
E1!C?~!vFvP

literal 0
HcmV?d00001

diff --git a/assets/textures/beaming.png b/assets/textures/beaming.png
new file mode 100644
index 0000000000000000000000000000000000000000..2b755f61d146f52b0bcc7ec4744389decce7701c
GIT binary patch
literal 463
zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRSjKx9jP7LeL$-D%zJ3U<-Ln`LH
zz2wbxC_sSWVCB5yzvmzMeWbU^L&dSY?5dW*<ofk9XTCPOoqKjy-sZDsZ2I%FuNB+z
zuiw1+dF|%kb^8~;e)IOd<*fO4e{Ly%_VfF<`k(Xm|5<+eqW7o!ECT8c7K}$Y75o?q
mnL30W<}f@O6~Z18yP28U3mBd(2nqzo5QC?ypUXO@geCxbtCpky

literal 0
HcmV?d00001

diff --git a/src/abilities/arrow.rs b/src/abilities/arrow.rs
index 2dfbf6a..17ec2dd 100644
--- a/src/abilities/arrow.rs
+++ b/src/abilities/arrow.rs
@@ -106,7 +106,7 @@ fn update(
                 ),
             )
             .insert((
-                Billboard,
+                Billboard::All,
                 Transform::from_translation(first_hit.point1),
                 NotShadowCaster,
                 AnimationTimer::new(Timer::from_seconds(0.005, TimerMode::Repeating)),
diff --git a/src/abilities/curver.rs b/src/abilities/curver.rs
index 8e6b8ca..2a20180 100644
--- a/src/abilities/curver.rs
+++ b/src/abilities/curver.rs
@@ -195,7 +195,7 @@ fn shot_collision(
                 .bundle_with_atlas(&mut sprite_params, texture_atlas),
             )
             .insert((
-                Billboard,
+                Billboard::All,
                 Transform::from_translation(shot_pos),
                 NotShadowCaster,
                 AnimationTimer::new(Timer::from_seconds(0.01, TimerMode::Repeating)),
diff --git a/src/abilities/gun.rs b/src/abilities/gun.rs
index 62866f1..6e0263b 100644
--- a/src/abilities/gun.rs
+++ b/src/abilities/gun.rs
@@ -191,7 +191,7 @@ fn shot_collision(
                 .bundle_with_atlas(&mut sprite_params, texture_atlas),
             )
             .insert((
-                Billboard,
+                Billboard::All,
                 Transform::from_translation(shot_pos),
                 NotShadowCaster,
                 AnimationTimer::new(Timer::from_seconds(0.01, TimerMode::Repeating)),
diff --git a/src/abilities/missile.rs b/src/abilities/missile.rs
index a831b5c..0ad761a 100644
--- a/src/abilities/missile.rs
+++ b/src/abilities/missile.rs
@@ -192,7 +192,7 @@ fn shot_collision(
                 .bundle_with_atlas(&mut sprite_params, texture_atlas),
             )
             .insert((
-                Billboard,
+                Billboard::All,
                 Transform::from_translation(shot_pos),
                 NotShadowCaster,
                 AnimationTimer::new(Timer::from_seconds(0.01, TimerMode::Repeating)),
diff --git a/src/abilities/thrown.rs b/src/abilities/thrown.rs
index fbd1035..d3a556d 100644
--- a/src/abilities/thrown.rs
+++ b/src/abilities/thrown.rs
@@ -174,7 +174,7 @@ fn shot_collision(
                     ),
                 )
                 .insert((
-                    Billboard,
+                    Billboard::All,
                     Transform::from_translation(shot_pos),
                     NotShadowCaster,
                     AnimationTimer::new(Timer::from_seconds(0.02, TimerMode::Repeating)),
diff --git a/src/aim/marker.rs b/src/aim/marker.rs
index 6366134..dda88c3 100644
--- a/src/aim/marker.rs
+++ b/src/aim/marker.rs
@@ -42,7 +42,7 @@ fn marker_event(
     let id = commands
         .spawn((
             Name::new("aim-marker"),
-            Billboard,
+            Billboard::All,
             TargetMarker,
             Transform::default(),
             Sprite3dBuilder {
diff --git a/src/head_drop.rs b/src/head_drop.rs
index b1b750b..da5a453 100644
--- a/src/head_drop.rs
+++ b/src/head_drop.rs
@@ -134,7 +134,7 @@ fn on_head_drop(
             || drop.impulse,
         )
         .with_child((
-            Billboard,
+            Billboard::All,
             SquishAnimation(2.6),
             SceneRoot(mesh.scenes[0].clone()),
         ));
diff --git a/src/heal_effect.rs b/src/heal_effect.rs
index 0e585ba..196fbfc 100644
--- a/src/heal_effect.rs
+++ b/src/heal_effect.rs
@@ -62,7 +62,7 @@ fn update_effects(
             cmds.entity(e).with_child((
                 Name::new("heal-particle"),
                 SceneRoot(assets.mesh_heal_particle.clone()),
-                Billboard,
+                Billboard::All,
                 Transform::from_translation(start_pos),
                 HealParticle {
                     start_scale,
diff --git a/src/keys.rs b/src/keys.rs
index 1f7a45d..82fdabc 100644
--- a/src/keys.rs
+++ b/src/keys.rs
@@ -43,7 +43,7 @@ fn on_spawn_key(trigger: Trigger<KeySpawn>, mut commands: Commands, assets: Res<
         Restitution::new(0.6),
         Children::spawn((
             Spawn((
-                Billboard,
+                Billboard::All,
                 SquishAnimation(2.6),
                 SceneRoot(assets.mesh_key.clone()),
             )),
diff --git a/src/loading_assets.rs b/src/loading_assets.rs
index 46dbbc4..0b66904 100644
--- a/src/loading_assets.rs
+++ b/src/loading_assets.rs
@@ -110,6 +110,9 @@ pub struct GameAssets {
     #[asset(path = "models/medic_particle.glb#Scene0")]
     pub mesh_heal_particle: Handle<Scene>,
 
+    #[asset(path = "models/beaming.glb#Scene0")]
+    pub beaming: Handle<Scene>,
+
     #[asset(path = "models/projectiles", collection(mapped, typed))]
     pub projectiles: HashMap<AssetFileName, Handle<Gltf>>,
 
diff --git a/src/npc.rs b/src/npc.rs
index d2b2c3e..f63939d 100644
--- a/src/npc.rs
+++ b/src/npc.rs
@@ -9,10 +9,12 @@ use crate::{
     heads_database::HeadsDatabase,
     hitpoints::{Hitpoints, Kill},
     keys::KeySpawn,
+    loading_assets::GameAssets,
     sounds::PlaySound,
     tb_entities::EnemySpawn,
+    utils::billboards::Billboard,
 };
-use bevy::prelude::*;
+use bevy::{pbr::NotShadowCaster, prelude::*};
 use std::collections::HashMap;
 
 #[derive(Component, Reflect)]
@@ -25,14 +27,23 @@ struct NpcSpawning {
     spawn_index: u32,
 }
 
+#[derive(Component, Reflect)]
+#[reflect(Component)]
+pub struct SpawningBeam(pub f32);
+
 #[derive(Event)]
 struct OnCheckSpawns;
 
+#[derive(Event)]
+pub struct SpawnCharacter(pub Vec3);
+
 pub fn plugin(app: &mut App) {
     app.init_resource::<NpcSpawning>();
     app.add_systems(OnEnter(GameState::Playing), setup);
+    app.add_systems(Update, update_beams.run_if(in_state(GameState::Playing)));
 
     global_observer!(app, on_spawn_check);
+    global_observer!(app, on_spawn);
 }
 
 fn setup(mut commands: Commands) {
@@ -43,7 +54,7 @@ fn setup(mut commands: Commands) {
 fn on_spawn_check(
     _trigger: Trigger<OnCheckSpawns>,
     mut commands: Commands,
-    query: Query<(Entity, &EnemySpawn), Without<Npc>>,
+    query: Query<(Entity, &EnemySpawn, &Transform), Without<Npc>>,
     heads_db: Res<HeadsDatabase>,
     spawning: Res<NpcSpawning>,
 ) {
@@ -53,7 +64,7 @@ fn on_spawn_check(
         names.insert(heads_db.head_key(i).to_string(), i);
     }
 
-    for (e, spawn) in query.iter() {
+    for (e, spawn, transform) in query.iter() {
         if let Some(order) = spawn.spawn_order {
             if order > spawning.spawn_index {
                 continue;
@@ -79,6 +90,7 @@ fn on_spawn_check(
             .with_child((Name::from("body-rig"), AnimatedCharacter::new(id)))
             .observe(on_kill);
 
+        commands.trigger(SpawnCharacter(transform.translation));
         commands.trigger(PlaySound::Beaming);
     }
 }
@@ -107,3 +119,35 @@ fn on_kill(
         commands.trigger(KeySpawn(transform.translation, enemy.key.clone()));
     }
 }
+
+fn on_spawn(
+    trigger: Trigger<SpawnCharacter>,
+    mut commands: Commands,
+    assets: Res<GameAssets>,
+    time: Res<Time>,
+) {
+    commands.spawn((
+        Transform::from_translation(trigger.event().0 + Vec3::new(0., -2., 0.))
+            .with_scale(Vec3::new(1., 40., 1.)),
+        Billboard::XZ,
+        NotShadowCaster,
+        SpawningBeam(time.elapsed_secs()),
+        SceneRoot(assets.beaming.clone()),
+    ));
+}
+
+fn update_beams(
+    mut commands: Commands,
+    mut query: Query<(Entity, &SpawningBeam, &mut Transform)>,
+    time: Res<Time>,
+) {
+    for (entity, beam, mut transform) in query.iter_mut() {
+        let age = time.elapsed_secs() - beam.0;
+
+        transform.scale.x = age.sin() * 2.;
+
+        if age > 3. {
+            commands.entity(entity).despawn();
+        }
+    }
+}
diff --git a/src/player.rs b/src/player.rs
index 92a8d84..a589550 100644
--- a/src/player.rs
+++ b/src/player.rs
@@ -11,6 +11,7 @@ use crate::{
     heads_database::{HeadControls, HeadsDatabase},
     hitpoints::{Hitpoints, Kill},
     loading_assets::AudioAssets,
+    npc::SpawnCharacter,
     physics_layers::GameLayer,
     sounds::PlaySound,
     tb_entities::SpawnPoint,
@@ -98,6 +99,8 @@ fn spawn(
         AudioPlayer::new(asset_server.load("sfx/heads/angry demonstrator.ogg")),
         PlaybackSettings::DESPAWN,
     ));
+
+    commands.trigger(SpawnCharacter(transform.translation));
 }
 
 fn on_kill(
diff --git a/src/utils/billboards.rs b/src/utils/billboards.rs
index cfb8b9e..8a12e30 100644
--- a/src/utils/billboards.rs
+++ b/src/utils/billboards.rs
@@ -2,9 +2,13 @@ use crate::camera::MainCamera;
 use bevy::prelude::*;
 use bevy_sprite3d::Sprite3dPlugin;
 
-#[derive(Component, Reflect)]
+#[derive(Component, Reflect, Default, PartialEq, Eq)]
 #[reflect(Component)]
-pub struct Billboard;
+pub enum Billboard {
+    #[default]
+    All,
+    XZ,
+}
 
 pub fn plugin(app: &mut App) {
     if !app.is_plugin_added::<Sprite3dPlugin>() {
@@ -18,8 +22,8 @@ pub fn plugin(app: &mut App) {
 fn face_camera(
     cam_query: Query<&GlobalTransform, With<MainCamera>>,
     mut query: Query<
-        (&mut Transform, &ChildOf, &InheritedVisibility),
-        (With<Billboard>, Without<MainCamera>),
+        (&mut Transform, &ChildOf, &InheritedVisibility, &Billboard),
+        Without<MainCamera>,
     >,
     parent_transform: Query<&GlobalTransform>,
 ) {
@@ -27,7 +31,7 @@ fn face_camera(
         return;
     };
 
-    for (mut transform, parent, visible) in query.iter_mut() {
+    for (mut transform, parent, visible, billboard) in query.iter_mut() {
         if !matches!(*visible, InheritedVisibility::VISIBLE) {
             continue;
         }
@@ -37,18 +41,34 @@ fn face_camera(
         };
 
         let target = cam_transform.reparented_to(parent_global);
-        transform.look_at(target.translation, Vec3::Y);
+
+        let target = match *billboard {
+            Billboard::All => target.translation,
+            Billboard::XZ => Vec3::new(
+                target.translation.x,
+                transform.translation.y,
+                target.translation.z,
+            ),
+        };
+
+        transform.look_at(target, Vec3::Y);
     }
 }
 
 fn face_camera_no_parent(
     cam_query: Query<&GlobalTransform, With<MainCamera>>,
-    mut query: Query<&mut Transform, (With<Billboard>, Without<MainCamera>, Without<ChildOf>)>,
+    mut query: Query<(&mut Transform, &Billboard), (Without<MainCamera>, Without<ChildOf>)>,
 ) {
     let Ok(cam_transform) = cam_query.single() else {
         return;
     };
-    for mut transform in query.iter_mut() {
-        transform.look_at(cam_transform.translation(), Vec3::Y);
+    for (mut transform, billboard) in query.iter_mut() {
+        let target = cam_transform.translation();
+        let target = match *billboard {
+            Billboard::All => cam_transform.translation(),
+            Billboard::XZ => Vec3::new(target.x, transform.translation.y, target.z),
+        };
+
+        transform.look_at(target, Vec3::Y);
     }
 }