From 246b4d1f467a26f36d57f6451e33650086167f2a Mon Sep 17 00:00:00 2001
From: Talon <talon@iamtalon.me>
Date: Tue, 20 Apr 2021 15:57:44 +0200
Subject: [PATCH] First implementation of 3d radar

---
 .../DesignTimeBuild/.dtbcache.v2              | Bin 63152 -> 63152 bytes
 .vs/EvilSatellites/v16/.suo                   | Bin 107008 -> 106496 bytes
 EvilSatellites/Radar.cs                       |  57 +++++++++++++++++-
 3 files changed, 54 insertions(+), 3 deletions(-)

diff --git a/.vs/EvilSatellites/DesignTimeBuild/.dtbcache.v2 b/.vs/EvilSatellites/DesignTimeBuild/.dtbcache.v2
index 58e9600368cc372cb802994fb64b503072434c1b..81c69e1200ebdc1fce4fbde8abe792b43ac94ce0 100644
GIT binary patch
delta 77
zcmV~$u@S%^2mrvsMKS`Sz|m!dtN<wUIEop}Hg*2@Df^W5+~CAq#X4FNrZlKCz=xt$
a?c$8V4O|InklUCLDIJMeGtlE**Y^XqFc>KS

delta 77
zcmWN<u@!(I3<bb~MI0d{7=AiOa0L@#9!9~zXsz|#&6Va#<2-hO+)UOzGf{>#Ls$-1
aHf=p>E5soLy3ByawP<&@pE97&*xnDJ!WU-%

diff --git a/.vs/EvilSatellites/v16/.suo b/.vs/EvilSatellites/v16/.suo
index 0dcd09aca09a30a3399429dcad943083f4d7f199..a18b445ceef953c34628e60742beb406acf546ed 100644
GIT binary patch
delta 4286
zcmc(i3sjWV7Jz5}`~w3Fh{{`p85|H1VHgHf9?DB40bvNy3Jq^+R#rX`5CaAz%_J@}
zyEsN@NQRZH1pZ>YS_)oLOCoW3%M!aiR*&1$x|9(mcb^$3@9kyXweCG@eRIy)XP^C_
zv(G;J|Hs&4Z|t(Ki}y&B$z*oKm64GVs$@W<v>PS~E|>Iup`S#*23tsyh?|8i;EZ1h
zTZLBvOYKTso+ELMC;d=yL=Y$WETh&0qJX%CC?ynxh?V6YOJp*7g0(0~#vAI<I%Kr|
z(`aqe8X1{1+7F~Uh?q6npE6o=Juj1CqTGW7QPhAV^n>g4V&s^K!&j;D9rEIGmF#<)
zXe8Za@Pd4kA!UXSjjkZVN3{Z|b|O|0&ctfMf#B9wnhfbM1OFl4>XN8F@b{0&S<`6f
zr_QP<A@P{AMjtuiO0u!%b8EiT=VRQ3V>(l*&0Wa*epIUnIpI&-N{lD??zv0d2<}pD
zle=^>!RJks$tq;ys1rOY;M=&`r+iD?r}l(9;YEZJ(}^%5g5ZXtsMZpZgpSY?#Y8j_
zL(C**6LCZ=v56=m61Ze8HTW)*sOH9!sZJej&!;+_SU{u^*AWYe3?d(AIHtJpQ{l7t
zsjM*>CMmcn4Rx@|QR~7x^Qg0&=)#MRbA1#*K}k3fe3WA?80{3$zOoTa>)gyve%Gew
znkMp<qFYMHV}-6Dd@sYIaplSZl8FQ_=AYM*TXm$N>FJ>03*?*RX0UKZwu0}H@0<(d
z4^ZPA4vpU;d`H$NlncW${CYw;T)<5eE9~#2(S0C&>t!#P-BU2dE)omfv#j-?dzK^c
zt?|>b+4g9YG}-~^n6(zHe&U<Q!r4YA2l9sPlH--}MZfi=Uz;yonH(&j#xuYX`04Y5
zvpw6BR>O~tAD>k+=xJMLp;t{uV2J?nxLH#HS{%}3iTpHe(}Ju@@?9i2j6(rg;+!9b
zRAi9{505yTMOC&UfjT_=Y_ruhm>S_GxrMI*Z@$?A8sRlhC_E9ZB(N?*<;I0~QRi-A
z9T#>*c#Br|3`A&{*#I%@o+@w;4yS1wWe?6Bs+e}<sYfp+pL!>*Pg?YWu;V+wp#$q%
zK3=nB&sU10(mLIT0L>;t1nlRDr%_+v$c=TA<vAw9uz7<@^`!r<==Q={7yb9&y|8*x
z)~DWON5_3|Z$;ndpJruz=o02DC2r_~<`|*bUogiP%HwIO9yiAi!wTG#PyshfUnMw;
z&4EHkYAPuFXp~<@+pg!4&)g%GwIn!4@M11^SHFI<a4GPnpb0H=g{O?I>((A@Zx{&J
zRP<8ryC<BdY<&I+87);xD?bFy1wu#iE>JIT_j<N$lGpanhF^5cIREg*_lD0su(0s_
zE%n6<@6SGQ!iP`5-W0t#tw+qIhv1chFdR%94Lg1_t?Mz~C}PQV*?d&)N`ZDz8VYg{
zI<iv*MGEO;j_DQVSkGD-%uzz~e4!&R12o5~Ug%rmw=vgpSeyLy10f4qCtu#N{dH~f
zx+A8Tq@3G&+MdxSW5&reY&w~1UYaK5o@$kwH6_;&Ow!OY2cfx7Y`#nE$Ug?`*dvhC
z@okqJ(y@EXbUTpwVPdHt#9-S!2ca4Z$~HM{p!~m5wt{^IupHgWLeW^A*jyuESG6aq
zs=YD1dP2v&p9m9qR3%v7ojm37Xxzfo+h7SZmVt<mEYq;^SV%U<`l@|{FB-Q#Uc9+?
z^R&OkG&b~a-m@6xMLwAmZ;F@liVtkJdU#Rn8FlZMr5|3gOgL96Z&dAB^!kPNH62gJ
zo(NL!`DS<b2T!;zwJPSsJ?*47$Yhk)WhxnV@2|zU_q2Fx-AVkcp%-327<fo(svQUQ
z4KScSCVo-_{U?<BZ#y+^W?rWEja_GMKYIL`myW-wGz}jpUPC5*nCBz#5hj_oVq<4C
z7Cd;0Fm{BO{8zVWZzy=OiYcJOkcVE8!cDgec=@3U^DGto1=Wkv{TgZcyNNx-qeK(2
zmw1f8`xa$P?xco=I7IMkHJ0IDrv7nyUyFaG1}d|>Jzk>5X`+|lntfE$1w6@KjD}Rp
zVOMw#n0*ukU~X)PQl|@xjJjw3inSY8Rbjs|9{0Saz|-w6xUVwQIVMc6vyI(n9ZPIg
zu((L@;4_`0bz!q@gJnMqx(0)z)ohG5OgGauT1}(AXfV&m=Nfd_fANH5Y&>r#dG7s4
z#J%l-tZf?jSPe!+g=v2@SR~HWh0VhL$`r1lz)uf3(VC{&>B6Egy)uLCoC+@JUlQe9
zN!trrym8fr><zdcr%F>>RtsZcV95=D9$@NFsJD>w-xEM5efR7Iuq1{+iyeFX4ycvl
zNb0eejEoiD<{xXR*k5~Ex_rPMq{Zjo00i@CskGf5pr6N-B~uHMqxt+|IEgDB)HB08
zh+qXOP~vs1O1>YtJ|--ZHe8vZ<ev%rlS4&dWUDu3wJF4RDS1hks@$ykZWrL>DlMJH
ztT26~%?TL)a1ZwX`37{|9VdPB##-PRaR*trDkD1IO#M89iZrqv#9vH|IC$jD&*Urq
zMfIQgN*a7#DVTFKsL53+t|x_@Q6;G`w+75T);F$H*i!@S?I?)Cw|48L(*y4~NICC6
zJ+5;tBmjPK)(^8kZezwcNMwy=pkSxsp@enCLKo{w1PxCLelGEHn_C>|ladEtRDC>j
z0kH0PnCn2#<b@fw!E8(7dN6|9(pQ|UvO8pVQc~I=V{UQajXA;IWDt^ID!$$3?I@56
zXFl$gW-?<E7(27!OMn)(ei>|HuGiCB?c7!<VwZBj4>QYL=}C5^Z|38bOu2;aDUEB)
zIjO&#sqvc|T_xANIe#cuJM!%NyOVC-AIP@9nHVii_7E&u(~;$}3tSeizMsVoW7mk$
zHF}mAmqISf&x3H5dOb9;z$LJct*nGt9N*x<{8jMnHQY1)#vCixe$Nub`lT?39clm#
zomLPTsN<(q%;qcwf2g&dEOxH;W;HiJA)2auSgszj@bT6xEa+~++WIhyOAP$ej&3U&
z8(*~Erj{BIua4h`p{1N&RGE!Y5_|JyppfujyQ=`1c_#%6eFtfHShVnMhoY%nC)K~@
zCH@%lOrHe3Ocx6w?7{+2{omu=rA3xPe>?JJi|NyC73<D{OzX!SJG>Qqq1x&)%cW}2
z0u!@ogGaZ68w=hJflRdxjO=VaY-4@9;V1^y=qyK#kPIwm8F;JH>xYy^P1Kn?cb@%H
zmzJNEcz184QBgOgscK;P=l7Qd@OLuHNQEBN3w>?5laC)fD;~D%v%mF@KEta|AG%4L
zKBf2lftP&;hxak<Jg8$H3t$ENLJe_P_r3?)H6P|#I_qH}umS_Dx#rtiRKEn2Y;_(T
r(!a%K5$kM#;9rdyOU+IwRj{TiTFg(6+IsTtzr$%3a+*%~-}>rbS{CCG

delta 4627
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
Va;>JACjZIvwsh`*aPDcW{|Co{rTYK?

diff --git a/EvilSatellites/Radar.cs b/EvilSatellites/Radar.cs
index 77edaef..8f87568 100644
--- a/EvilSatellites/Radar.cs
+++ b/EvilSatellites/Radar.cs
@@ -16,15 +16,20 @@ namespace EvilSatellites
         public IGameObject Owner;
         public IGameObject Target;
         public IScreen Screen;
-        public ISoundEffect RadarNoise;
+        public ISoundEffect3D RadarNoise;
         public ObjectType Filter;
+        public Vector3 RadarDirection;
+        public Vector3 RadarPosition;
+        public bool IsPlaying;
+        public Vector3 RadarTarget;
         public Radar(IGameObject owner, IScreen screen)
         {
             Owner = owner;
             Screen = screen;
-            RadarNoise = Screen.Manager.Sound.Load(@"sfx/ui/radar/pingEnemy.wav", false);
+            RadarNoise = Screen.Manager.Sound.Load3D(@"sfx/ui/radar/pingEnemy.wav");
             RadarNoise.Loop = true;
             Filter = ObjectType.Satellite;
+            
             Active = false;
         }
 
@@ -46,7 +51,7 @@ namespace EvilSatellites
             Active = false;
         }
 
-        public void Update(List<IGameObject> objects)
+        public void UpdateX(List<IGameObject> objects)
         {
             if (objects.Count < 1) return;
             float minDistance = 50000000;
@@ -70,5 +75,51 @@ namespace EvilSatellites
             radarTarget.Normalize();
             RadarNoise.Pitch = MathHelper.Clamp(0.1f / Vector3.Distance(Owner.Rotation.Forward, radarTarget) * 3f, 0, 1);
         }
+
+
+        public void Update(List<IGameObject> objects)
+        {
+            if (IsPlaying)
+            {
+                RadarPosition += RadarDirection;
+                RadarNoise.Position = new System.Numerics.Vector3(RadarPosition.X, RadarPosition.Y, RadarPosition.Z);
+                RadarNoise.Pitch = MathHelper.Clamp(0.1f / Vector3.Distance(Owner.Rotation.Forward, RadarTarget) * 3f, 0, 2);
+                if (Vector3.Distance(RadarPosition, Owner.Position) > 20)
+                {
+                    IsPlaying = false;
+                }
+            } else
+            {
+                if (objects.Count < 1) return;
+                float minDistance = 50000000;
+                Target = null;
+                foreach (var obj in objects)
+                {
+                    if (obj.Type != Filter) continue;
+                    float distance = Vector3.Distance(obj.Position, Owner.Position);
+                    if (distance < minDistance)
+                    {
+                        minDistance = distance;
+                        Target = obj;
+                    }
+                }
+                if (Target == null)
+                {
+                    // RadarNoise.Pitch = 0.1;
+                    return;
+                }
+                Vector3 radarTarget = (Target.Position - Owner.Position);
+                radarTarget.Normalize();
+                RadarTarget = radarTarget;
+                RadarPosition = new Vector3(Owner.Position.X+Owner.Dimensions.X/2, Owner.Position.Y+Owner.Dimensions.Y/2, Owner.Position.Z+Owner.Dimensions.Z/2);
+                RadarDirection = new Vector3(radarTarget.X*0.5f, radarTarget.Y*0.5f, radarTarget.Z*0.5f);
+                
+                RadarNoise.Reset();
+                // RadarNoise.Play();
+                IsPlaying = true;
+                // RadarNoise.Pitch = MathHelper.Clamp(0.1f / Vector3.Distance(Owner.Rotation.Forward, radarTarget) * 3f, 0, 1);
+            }
+        }
+
     }
 }