From 36eb5a000eb7e10267231413cad7030e1d64f0ff Mon Sep 17 00:00:00 2001
From: hut <hut@hut.pm>
Date: Fri, 5 Apr 2024 22:16:01 +0200
Subject: [PATCH] add selectagon around target

---
 assets/models/selectagon.glb | Bin 0 -> 4064 bytes
 src/camera.rs                |   2 +-
 src/hud.rs                   |  46 ++++++++++++++++++++++++++++++++---
 src/world.rs                 |   1 +
 4 files changed, 45 insertions(+), 4 deletions(-)
 create mode 100644 assets/models/selectagon.glb

diff --git a/assets/models/selectagon.glb b/assets/models/selectagon.glb
new file mode 100644
index 0000000000000000000000000000000000000000..4990ff607a2ed7d814b0f24a94d215fba9a4dffd
GIT binary patch
literal 4064
zcmb7G-;Wbj6h5q=APOQXqJZ`4io#Ito$1VUDr{XAkQLaP{XsOF&8F?ncAK=F&CC=b
zn@xBzF)`7<fP@!b))$j~G9m3>;JXhd`Ue=_Bs`etId^8-+ikaWA)IsO&Ue0h&Ua2H
zRBH3r#{l5ZqX2&$0Qh3AFtfpmLEwfgx4|lI!}W`y=d&EUx#oKfFGy7|C3U6dHdb6e
zHGQ#=x|>Ohw52nR-F5w->NOCor#aiyn0qgD8*~&b1nvsUEwY<8W|!;5(DkduTCnWa
zt3gn`>n;bO?=~vo8e7s>P{vzXj>l1eX&bCjtm7G*lkYUv@K#)U!8Nh8i8;yh2CKWl
znoN!}<~_d|q&XK@pYMgmP!_nz(>AvSx3YTH$~vZP>KdoNeaB0i+U}&(bPuVOHMr0%
zD`SW(&t`1x0#A$R%*hCyXYkVQnav%p3lo#@;waVD4M*2)-7#ff9jT-UD_*lybLXln
zq-E$gT~s($@OrT<$FwMrN;pDf@m6GUOv`pOjuLfeL6d#n91xOF&n2_TWw}UmJtK^)
zquUwNu{UwXvCg;Sp`s$|CI7Y?7HhR?dDd%I)*5brv)W*#V&G1BHP7!9%hO2N!${Se
zhR9f%3=TyIhYKtpr>x;*BhDn7Z_?yx-f|T>JEBf}-LKZGA#PZ-Ma3}mtEFa0j~ndE
z!rb)ybYVuW%S>VR_T(*=6B?Vp_SICOFne{Gvz(3{RvRnTGNl-JUD9TbZ^{W3%lInr
z{OE#Gb9L4A?^NAyBx%{JuX_!*5zgOV$MrRFH8fWCnhpGQ**dY^!@-KQ?ig9iG<1Vo
zmMugERlvn?a6cT&G7Mqs+%Pqf#tkwllt&h~ssAee-WD$m;K0=zK!V5tETOEA-MKbp
z;O`bkrSyS{Jg<*o>DcDz>3ZMosCj?7Jd`R5p4C`<{oK^#t;tzNThXmwor|1F>3-<m
zias{Etd&759u!tr<tGn6I$_bT(AUq%I2KMn(c<~Jl5Es$)5c9uZ^ju@CnH|2iyi5>
zI@pSuZgh2sHBcJYagA_)Q@<SoxH3Hh#fOjczyGms{JUen{ya+TwjSlb{dfBk;r9?f
zQSd|K<%i?49;^Oidz5&!m6G+`G{0}}A%3FZhsH|}$J?Y2)iX+5YNgtw5Ap9ImNmrq
zp)t-#*7Nk#)9q2>O6!rV2cG@Cy@&XTf*%?yn&d}`6;1Mch)I(KKQvZ$CO=B7>`Z<S
zv8*A+4~=g;`)A_#fAje>2Y;AQ;#M5Dm2--d^FDlid#R28U4vf$@=Dy^jYq-s;E7`b
z7V=+@9g%z(w<+GGwie-|KM(TclUx<A-W7w<b?_>`>~SYP;f(ncd@I(CG@)4L4&ax)
zAg8R4^ojAL;h_2@{{Xz?S8{1ygK9|5lU_RaDx9QelAGXVJqm{AlH?|M;!N<8Kh}hL
zO!TMv)gD#+grZMd%^h$T)iVe$`3K--Z7OFRC-qG1*z*oPs_8*bJ*ZCyk9Wy;I6LWg
z;8lLfxdWfy+S;N%cJ&b-<hx$(CO$`gYwH}n!~A~#6P^+OFi$-6p7?uxbWXfce!pK>
zSdjd~Jn_?e;*WgqGx10H{T@>uNBTTS^x5%D8b}=;cRk%C&!mra!93Yx?1@kIGZE{v
zt0yk(U+!Aud!M^J37_h>V&2_-#4mRM^;bRJLwUqE*zbcQ@H*_ne+S@2I1VS!o`9F(
z5WEFP(H?~t;1zfqPNO{y$KW+M1u3*Ccmv*q_u(Yklkh6M1LJTW?Rj_)&cMf@q1AxF
z2XGP2qCE@m!iS)Pjn;;9@CjIuLz{yOkcLmeKx@E9z~K^1qMZa2GVmE(MSB&p;J`Jw
jjP^1J{00N;N4p=cz!ba$htVE}&*3^8gfX;Zkca;P2^(>G

literal 0
HcmV?d00001

diff --git a/src/camera.rs b/src/camera.rs
index d4efda2..a5ae187 100644
--- a/src/camera.rs
+++ b/src/camera.rs
@@ -141,7 +141,7 @@ fn manage_player_actor(
 }
 
 #[allow(clippy::too_many_arguments)]
-fn apply_input_to_player(
+pub fn apply_input_to_player(
     time: Res<Time>,
     settings: Res<settings::Settings>,
     mut windows: Query<&mut Window, With<PrimaryWindow>>,
diff --git a/src/hud.rs b/src/hud.rs
index 467c593..d4f99fa 100644
--- a/src/hud.rs
+++ b/src/hud.rs
@@ -1,6 +1,7 @@
-use crate::{actor, audio, camera, chat, nature, settings};
+use crate::{actor, audio, camera, chat, nature, settings, world};
 use bevy::prelude::*;
 use bevy::diagnostic::{DiagnosticsStore, FrameTimeDiagnosticsPlugin};
+use bevy::transform::TransformSystem;
 use bevy_xpbd_3d::prelude::*;
 use bevy::math::DVec3;
 use std::collections::VecDeque;
@@ -25,7 +26,12 @@ impl Plugin for HudPlugin {
             update,
             handle_input,
             handle_target_event,
-            update_target_selectagon,
+        ));
+        app.add_systems(PostUpdate, (
+            update_target_selectagon
+                .after(PhysicsSet::Sync)
+                .after(camera::apply_input_to_player)
+                .before(TransformSystem::TransformPropagate),
         ));
         app.insert_resource(Log {
             logs: VecDeque::with_capacity(LOG_MAX),
@@ -42,6 +48,7 @@ impl Plugin for HudPlugin {
 #[derive(Component)] struct ChatText;
 #[derive(Component)] struct Reticule;
 #[derive(Component)] struct ToggleableHudElement;
+#[derive(Component)] struct Selectagon;
 #[derive(Component)] pub struct IsClickable;
 #[derive(Component)] pub struct IsTargeted;
 
@@ -432,6 +439,15 @@ fn setup(
         },
     ));
 
+    // Selectagon
+    commands.spawn((
+        Selectagon,
+        SceneBundle {
+            scene: asset_server.load(world::asset_name_to_path("selectagon")),
+            ..default()
+        },
+    ));
+
     // AR-related things
     ambient_light.brightness = if settings.hud_active {
         AMBIENT_LIGHT_AR
@@ -574,7 +590,6 @@ fn update(
 }
 
 fn handle_input(
-    mut commands: Commands,
     keyboard_input: Res<ButtonInput<KeyCode>>,
     mouse_input: Res<ButtonInput<MouseButton>>,
     mut settings: ResMut<settings::Settings>,
@@ -643,5 +658,30 @@ fn handle_target_event(
 }
 
 fn update_target_selectagon(
+    mut q_selectagon: Query<(&mut Transform, &mut Visibility), (With<Selectagon>, Without<IsTargeted>, Without<Camera>)>,
+    q_target: Query<&Transform, (With<IsTargeted>, Without<Camera>, Without<Selectagon>)>,
+    q_camera: Query<&Transform, (With<Camera>, Without<IsTargeted>, Without<Selectagon>)>,
 ) {
+    if q_camera.is_empty() {
+        return;
+    }
+    let camera_trans = q_camera.get_single().unwrap();
+
+    if let Ok((mut selectagon_trans, mut selectagon_vis)) = q_selectagon.get_single_mut() {
+        if let Ok(target_trans) = q_target.get_single() {
+            match *selectagon_vis {
+                Visibility::Hidden => { *selectagon_vis = Visibility::Visible; },
+                _ => {}
+            }
+            selectagon_trans.translation = target_trans.translation;
+            selectagon_trans.scale = target_trans.scale;
+            selectagon_trans.rotation = camera_trans.rotation;
+        }
+        else {
+            match *selectagon_vis {
+                Visibility::Hidden => {},
+                _ => { *selectagon_vis = Visibility::Hidden; }
+            }
+        }
+    }
 }
diff --git a/src/world.rs b/src/world.rs
index 47d34e5..ec7e43f 100644
--- a/src/world.rs
+++ b/src/world.rs
@@ -33,6 +33,7 @@ pub fn asset_name_to_path(name: &str) -> &'static str {
         "satellite" => "models/satellite.glb#Scene0",
         "pizzeria" => "models/pizzeria2.glb#Scene0",
         "pizzasign" => "models/pizzasign.glb#Scene0",
+        "selectagon" => "models/selectagon.glb#Scene0",
         _ => "models/error.glb#Scene0",
     }
 }