From c989202d93364f7238cdb8361227cefb059f6f78 Mon Sep 17 00:00:00 2001
From: Talon <talon@iamtalon.me>
Date: Sun, 11 Apr 2021 18:42:22 +0200
Subject: [PATCH] Shooting satellites works

---
 .vs/EvilSatellites/v16/.suo                  | Bin 89600 -> 91136 bytes
 EvilSatellites/Objects/AbstractGameObject.cs |   6 +-
 EvilSatellites/Objects/IGameObject.cs        |   3 +-
 EvilSatellites/Objects/ObjectType.cs         |   4 +-
 EvilSatellites/Objects/Player.cs             |   4 +-
 EvilSatellites/Objects/Projectile.cs         |  56 +++++++++++++++++++
 EvilSatellites/Objects/Satellite.cs          |   5 +-
 EvilSatellites/Radar.cs                      |   4 +-
 EvilSatellites/Screens/GameScreen.cs         |  41 ++++++++++++--
 EvilSatellites/Weapons/LaserMG.cs            |   6 +-
 10 files changed, 116 insertions(+), 13 deletions(-)
 create mode 100644 EvilSatellites/Objects/Projectile.cs

diff --git a/.vs/EvilSatellites/v16/.suo b/.vs/EvilSatellites/v16/.suo
index 4a133c095ef94a95057eb2c1fb31757644bc4ac3..4b9a815110295757a77aab6e5219ac49654997a8 100644
GIT binary patch
delta 2925
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

delta 2602
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

diff --git a/EvilSatellites/Objects/AbstractGameObject.cs b/EvilSatellites/Objects/AbstractGameObject.cs
index 47ef5cc..c787703 100644
--- a/EvilSatellites/Objects/AbstractGameObject.cs
+++ b/EvilSatellites/Objects/AbstractGameObject.cs
@@ -24,7 +24,7 @@ namespace EvilSatellites.Objects
         public Vector3 Movement;
         private Vector3 _Orientation;
         public Vector3 Orientation
-        { 
+        {
             get => _Orientation;
             set => _Orientation = value;
         }
@@ -38,10 +38,14 @@ namespace EvilSatellites.Objects
         public IScreen Screen;
         public ObjectType Type { get; set; }
         public bool IsDynamic { get => true; }
+        public bool ShouldDestroy { get; set; }
+        public bool Active { get; set; }
         public AbstractGameObject(IScreen screen)
         {
             Screen = screen;
             Type = ObjectType.Generic;
+            ShouldDestroy = false;
+            
         }
 
         public void RotateX(float angle)
diff --git a/EvilSatellites/Objects/IGameObject.cs b/EvilSatellites/Objects/IGameObject.cs
index 2081aeb..c972383 100644
--- a/EvilSatellites/Objects/IGameObject.cs
+++ b/EvilSatellites/Objects/IGameObject.cs
@@ -19,6 +19,7 @@ namespace EvilSatellites.Objects
         ObjectType Type { get; set; }
         void Move(Vector3 pose);
         void OnCollision(IGameObject obj);
-        
+        bool ShouldDestroy { get; }
+        bool Active { get; set; }
     }
 }
diff --git a/EvilSatellites/Objects/ObjectType.cs b/EvilSatellites/Objects/ObjectType.cs
index feae8a9..60cdd4b 100644
--- a/EvilSatellites/Objects/ObjectType.cs
+++ b/EvilSatellites/Objects/ObjectType.cs
@@ -7,6 +7,8 @@ namespace EvilSatellites.Objects
     public enum ObjectType
     {
         Generic,
-        Player
+        Player,
+        Satellite,
+        Projectile
     }
 }
diff --git a/EvilSatellites/Objects/Player.cs b/EvilSatellites/Objects/Player.cs
index 90761bb..daa2533 100644
--- a/EvilSatellites/Objects/Player.cs
+++ b/EvilSatellites/Objects/Player.cs
@@ -18,13 +18,15 @@ namespace EvilSatellites.Objects
         public IWeapon CurrentWeapon;
         public Player(IScreen screen): base(screen)
         {
+            ShouldDestroy = false;
+            Active = true;
             Type = ObjectType.Player;
             Position = new Vector3(10, 0, 0);
             Dimensions = new Vector3(5, 5, 5);
             Movement = new Vector3(0, 0, 0);
             Rotation = Matrix.Identity;
             Orientation = Rotation.Forward;
-            CurrentWeapon = new LaserMG(this, Screen);
+            CurrentWeapon = new LaserMG(this, (GameScreen)Screen);
             Activate();
         }
 
diff --git a/EvilSatellites/Objects/Projectile.cs b/EvilSatellites/Objects/Projectile.cs
new file mode 100644
index 0000000..5dbaac8
--- /dev/null
+++ b/EvilSatellites/Objects/Projectile.cs
@@ -0,0 +1,56 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using SynthySound;
+using Microsoft.Xna.Framework;
+using EvilSatellites.Screens;
+
+namespace EvilSatellites.Objects
+{
+    public class Projectile : AbstractGameObject
+    {
+        private ISoundEffect3D Sound;
+        private Vector3 Direction;
+        private Vector3 StartPos;
+        private float Range;
+        public Projectile(IScreen screen, Vector3 pos, Vector3 direction) : base(screen)
+        {
+            StartPos = pos;
+            Position = pos;
+            Dimensions = new Vector3(5, 5, 5);
+            Direction = direction;
+            Range = 500;
+            Type = ObjectType.Projectile;
+            Activate();
+        }
+
+        public override void Activate()
+        {
+            ShouldDestroy = false;
+            Active = true;
+        }
+        public override void Destroy()
+        {
+            ShouldDestroy = true;
+            Active = false;
+        }
+
+        override public void Update(GameTime gameTime)
+        {
+            Position += Direction;
+            if (Vector3.Distance(StartPos, Position) > Range)
+            {
+                Destroy();
+            }
+        }
+
+        public override void OnCollision(IGameObject obj)
+        {
+            if (obj.Type == ObjectType.Player) return;
+            Screen.Manager.Sound.PlayOneshot(@"sfx/physics/impacts/bullet/1.wav", new System.Numerics.Vector3(Position.X, Position.Y, Position.Z), Screen.Manager.EnvironmentEffect);
+            Destroy();
+        }
+    }
+}
diff --git a/EvilSatellites/Objects/Satellite.cs b/EvilSatellites/Objects/Satellite.cs
index 162781e..1e2fde3 100644
--- a/EvilSatellites/Objects/Satellite.cs
+++ b/EvilSatellites/Objects/Satellite.cs
@@ -14,6 +14,7 @@ namespace EvilSatellites.Objects
         private ISoundEffect3D Sound;
         public Satellite(IScreen screen, Vector3 pos) : base(screen)
         {
+            Type = ObjectType.Satellite;
             Sound = Screen.Manager.Sound.Load3D(@"sfx/satellite/1/loop.wav");
             Sound.Loop = true;
             Position = pos;
@@ -26,6 +27,8 @@ namespace EvilSatellites.Objects
         public override void Activate()
         {
             Sound.Play();
+            Active = true;
+            ShouldDestroy = false;
         }
         public override void Destroy()
         {
@@ -39,7 +42,7 @@ namespace EvilSatellites.Objects
 
         public override void OnCollision(IGameObject obj)
         {
-            Sound.Stop();
+            // Sound.Stop();
         }
     }
 }
diff --git a/EvilSatellites/Radar.cs b/EvilSatellites/Radar.cs
index 09ad916..343247d 100644
--- a/EvilSatellites/Radar.cs
+++ b/EvilSatellites/Radar.cs
@@ -41,10 +41,11 @@ namespace EvilSatellites
 
         public void Update(List<IGameObject> objects)
         {
+            if (objects.Count < 1) return;
             float minDistance = 1000;
             foreach (var obj in objects)
             {
-                if (obj == Owner) continue;
+                if (obj.Type != ObjectType.Satellite) continue;
                 float distance = Vector3.Distance(obj.Position, Owner.Position);
                 if (distance < minDistance)
                 {
@@ -52,6 +53,7 @@ namespace EvilSatellites
                     Target = obj;
                 }
             }
+            if (Target == null) return;
             Vector3 radarTarget = (Target.Position - Owner.Position);
             radarTarget.Normalize();
             RadarNoise.Pitch = MathHelper.Clamp(0.1f / Vector3.Distance(Owner.Rotation.Forward, radarTarget) * 3f, 0, 1);
diff --git a/EvilSatellites/Screens/GameScreen.cs b/EvilSatellites/Screens/GameScreen.cs
index 7b37420..657334f 100644
--- a/EvilSatellites/Screens/GameScreen.cs
+++ b/EvilSatellites/Screens/GameScreen.cs
@@ -17,6 +17,8 @@ namespace EvilSatellites.Screens
         public ScreenState State { get; set; }
         private InputManager Input = new InputManager();
         public List<IGameObject> Objects = new List<IGameObject>();
+        public List<IGameObject> Removable = new List<IGameObject>();
+        public List<IGameObject> Addable = new List<IGameObject>();
         private Quadtree<IGameObject> objtree = new Quadtree<IGameObject>(new Vector3(10000, 10000, 10000), 10, 20);
         private float Theta = 0;
         private Player _player;
@@ -29,6 +31,7 @@ namespace EvilSatellites.Screens
             _player = player;
             Satellite prop = new Satellite(this, new Vector3(15, 0, 15));
             Objects.Add(prop);
+            if (_player == null) Environment.Exit(1);
             ObjectRadar = new Radar(_player, this);
             return;
         }
@@ -41,11 +44,24 @@ namespace EvilSatellites.Screens
 
         public void Update(GameTime gameTime)
         {
+            foreach (var obj in Removable)
+            {
+                Objects.Remove(obj);
+            }
+            if (Addable.Count > 0)
+            {
+                foreach (var obj in Addable)
+                {
+                    Objects.Add(obj);
+                }
+                Addable.Clear();
+            }
+            Removable.Clear();
             objtree.Clear();
-            foreach (var obj in Objects)
+            foreach (var obj            in Objects)
             {
-                objtree.Add(obj);
                 obj.Update(gameTime);
+                objtree.Add(obj);
                 if (obj.Type == ObjectType.Player)
                 {
                     Manager.Sound.ListenerPosition = new System.Numerics.Vector3(obj.Position.X, obj.Position.Y, obj.Position.Z);
@@ -55,16 +71,21 @@ namespace EvilSatellites.Screens
                     Manager.Listener.Forward = obj.Rotation.Forward;
                     Manager.Listener.Up = obj.Rotation.Up;
                 }
+                if (obj.ShouldDestroy)
+                {
+                    Removable.Add(obj);
+                }
             }
             UpdateRadar();
             CheckCollisions();
+
             return;
         }
 
         private void UpdateRadar()
         {
-            var candidates = objtree.Find(_player.Position, _player.Dimensions);
-            ObjectRadar.Update(Objects);
+            var candidates = objtree.Find(_player.Position, new Vector3(1000, 1000, 1000));
+            ObjectRadar.Update(candidates);
         }
 
         public void HandleInput(GameTime gameTime, KeyboardState inputs)
@@ -130,16 +151,21 @@ namespace EvilSatellites.Screens
                     ObjectRadar.Start();
                 }
             }
+            if (Input.IsJustPressed(Keys.O))
+            {
+                Tolk.Speak(Objects.Count.ToString());
+            }
         }
 
         private void CheckCollisions()
         {
             foreach (var obj in Objects)
             {
+                if (!obj.Active) continue;
                 var candidates = objtree.Find(obj.Position, obj.Dimensions);
                 foreach (var target in candidates)
                 {
-                    if (obj == target) continue;
+                    if (obj == target || !target.Active) continue;
                     if (Intersects(obj, target))
                     {
                         obj.OnCollision(target);
@@ -153,5 +179,10 @@ namespace EvilSatellites.Screens
         {
             return (obj1.Position.X <= (obj2.Position.X + obj2.Dimensions.X) && (obj1.Position.X + obj1.Dimensions.X) >= obj2.Position.X) && (obj1.Position.Y <= (obj2.Position.Y + obj2.Dimensions.Y) && (obj1.Position.Y + obj1.Dimensions.Y) >= obj2.Position.Y) && (obj1.Position.Z <= (obj2.Position.Z + obj2.Dimensions.Z) && (obj1.Position.Z + obj1.Dimensions.Z) >= obj2.Position.Z);
         }
+
+        public void AddObject(IGameObject obj)
+        {
+            Addable.Add(obj);
+        }
     }
 }
diff --git a/EvilSatellites/Weapons/LaserMG.cs b/EvilSatellites/Weapons/LaserMG.cs
index 22eb0d2..4095c51 100644
--- a/EvilSatellites/Weapons/LaserMG.cs
+++ b/EvilSatellites/Weapons/LaserMG.cs
@@ -17,8 +17,8 @@ namespace EvilSatellites.Weapons
         public ISoundEffect sfxSpindown;
         public ISoundEffect sfxSpinup;
         public ISoundEffect sfxSpinning;
-        public IScreen Screen;
-        public LaserMG(IGameObject wielder, IScreen screen)
+        public GameScreen Screen;
+        public LaserMG(IGameObject wielder, GameScreen screen)
         {
             _wielder = wielder;
             Screen = screen;
@@ -76,6 +76,8 @@ namespace EvilSatellites.Weapons
                 {
                     sfxShoot.Play();
                     TimerStart = TimerEnd;
+                    Projectile proj = new Projectile(Screen, _wielder.Position, _wielder.Rotation.Forward);
+                    Screen.AddObject(proj);
                 }
             }
             base.Update(time);