Refactors and sets stage for collision detection (#36)

* Fixes crash

* Adds collision system

* refactors

* refactors names

src/Client/ClientMain.cs

@@ -9,6 +9,8 @@
 using Microsoft.Xna.Framework.Graphics;
 using Microsoft.Xna.Framework.Media;
 using System.Collections.Generic;
+using Client.Components;
+using Client.Systems;
 using Shared.Components;
 using Shared.Systems;
 

src/Shared/Components/Controls.cs → src/Client/Components/Controls.cs

@@ -7,8 +7,9 @@
 using System.IO.IsolatedStorage;
 using System.Runtime.Serialization.Json;
 using System.Threading.Tasks;
+using Shared.Components;
 
-namespace Shared.Components
+namespace Client.Components
 {
     [DataContract(Name = "Controls")]
     public class Controls : Component

src/Client/GameModel.cs

@@ -6,7 +6,7 @@
 using System;
 using System.Collections.Generic;
 using System.Text.RegularExpressions;
-
+using Client.Components;
 using Shared.Components;
 using Shared.Entities;
 
@@ -21,7 +21,7 @@ public class GameModel
     private Systems.KeyboardInput m_systemKeyboardInput;
     private Systems.MouseInput m_systemMouseInput;
     private Systems.Interpolation m_systemInterpolation;
-    private Systems.WormRenderer _mSystemWormRenderer;
+    private Systems.WormRenderer m_systemWormRenderer;
     private Controls m_controls;
     private GraphicsDeviceManager m_graphics;
     private SpriteFont m_font;
@@ -44,7 +44,7 @@ public void update(TimeSpan elapsedTime)
 
     public void render(TimeSpan elapsedTime, SpriteBatch spriteBatch)
     {
-        _mSystemWormRenderer.render(elapsedTime, spriteBatch);
+        m_systemWormRenderer.render(elapsedTime, spriteBatch);
     }
 
     /// <summary>
@@ -59,7 +59,7 @@ public bool initialize(ContentManager contentManager, Controls controls, Graphic
         m_entities = new Dictionary<uint, Entity>();
         m_systemInterpolation = new Systems.Interpolation();
         m_systemCamera = new Systems.Camera(new Vector2(graphics.PreferredBackBufferWidth, graphics.PreferredBackBufferHeight));
-        _mSystemWormRenderer = new Systems.WormRenderer(m_systemCamera, graphics, m_font);
+        m_systemWormRenderer = new Systems.WormRenderer(m_systemCamera, graphics, m_font);
         m_systemNetwork = new Systems.Network();
 
         m_systemNetwork.registerNewEntityHandler(handleNewEntity);
@@ -166,7 +166,7 @@ private void addEntity(Entity entity)
         m_entities[entity.id] = entity;
         m_systemKeyboardInput.add(entity);
         m_systemMouseInput.add(entity);
-        _mSystemWormRenderer.add(entity);
+        m_systemWormRenderer.add(entity);
         m_systemNetwork.add(entity);
         m_systemInterpolation.add(entity);
         m_systemCamera.add(entity);
@@ -183,7 +183,7 @@ private void removeEntity(uint id)
         m_systemKeyboardInput.remove(id);
         m_systemMouseInput.remove(id);
         m_systemNetwork.remove(id);
-        _mSystemWormRenderer.remove(id);
+        m_systemWormRenderer.remove(id);
         m_systemInterpolation.remove(id);
         m_systemCamera.remove(id);
     }

src/Client/Menu/ControlSettingsView.cs

@@ -8,6 +8,8 @@
 using Shared.Components;
 using Shared.Entities;
 using Shared.Systems;
+using Client.Components;
+using Client.Systems;
 
 namespace Client.Menu
 {
@@ -21,7 +23,7 @@ public class ControlSettingsView : GameStateView
         private ControlStateEnum updatingKey = ControlStateEnum.None;
         private bool isUpdatingKey = false;
         private Controls m_controls;
-        private ControlsPersistence _mControlsPersistence = new ControlsPersistence();
+        private ControlsPersistence m_controlsPersistence = new ControlsPersistence();
 
         public enum ControlStateEnum
         {
@@ -81,7 +83,7 @@ public override void update(GameTime gameTime)
                                     break;
                             }
                             // Now we persist any changes
-                            _mControlsPersistence.SaveControls(m_controls);
+                            m_controlsPersistence.SaveControls(m_controls);
                         }
                     }
                 }

src/Client/Menu/GamePlayView.cs

@@ -6,6 +6,7 @@
 using Microsoft.Xna.Framework.Graphics;
 using Client.IO;
 using System.Runtime.Serialization;
+using Client.Components;
 using Microsoft.Xna.Framework.Input;
 using Shared.Components;
 

src/Client/Menu/MenuKeyboardInput.cs

@@ -8,6 +8,7 @@
 using System.Threading.Tasks;
 using Client.Menu;
 using Shared.Components;
+using Client.Components;
 
 
 namespace Client.IO

src/Shared/Systems/ControlsPersistence.cs → src/Client/Systems/ControlsPersistence.cs

@@ -1,12 +1,16 @@
+using System;
+using System.IO;
 using Microsoft.Xna.Framework.Input;
 using Shared.Components;
 using System.IO.IsolatedStorage;
 using System.Runtime.Serialization.Json;
+using System.Threading.Tasks;
+using Client.Components;
 
 
-namespace Shared.Systems;
+namespace Client.Systems;
 
-public class ControlsPersistence: System
+public class ControlsPersistence: Shared.Systems.System
 {
     // Now we want to make all of these control settings persist across game sessions. We will use the same serialization technique we used for the high scores.
     private bool saving = false;

src/Client/Systems/KeyboardInput.cs

@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using Shared.Components;
+using Client.Components;
 
 namespace Client.Systems
 {

src/Client/Systems/MouseInput.cs

@@ -3,6 +3,7 @@
 using Shared.Entities;
 using System;
 using System.Collections.Generic;
+using Client.Components;
 using Shared.Components;
 
 namespace Client.Systems

src/Client/Systems/WormMovement.cs

@@ -2,9 +2,12 @@
 
 namespace Client.Systems;
 
-public class WormMovement : Shared.Systems.System
+public class WormMovement : Shared.Systems.System 
 {
-    public override void update(TimeSpan elapsedTime)
+    public WormMovement() : base() 
+    {
+    }
+    public override void update(TimeSpan elapsedTime) 
     {
     }
 }

src/Server/Systems/CollisionDetection.cs

@@ -0,0 +1,47 @@
+using Microsoft.Xna.Framework;
+
+namespace Server.Systems;
+
+public class CollisionDetection : Shared.Systems.System
+{
+    public CollisionDetection() :
+        base(
+            typeof(Shared.Components.Collision)
+        )
+    {
+    }
+
+
+    public override void update(TimeSpan elapsedTime)
+    {
+        throw new NotImplementedException();
+    }
+
+    // Reference: https://stackoverflow.com/questions/37224912/circle-line-segment-collision
+    private static bool CircleLineIntersect(Point pt1, Point pt2, float circleRadius, Vector2 circlePosition)
+    {
+        Vector2 v1 = new Vector2((float)(pt2.X - pt1.X), (float)(pt2.X - pt1.X));
+        Vector2 v2 = new Vector2((float) pt1.X - circlePosition.X, (float)(pt1.X - circlePosition.Y));
+        float b = -2 * (v1.X * v2.X + v1.Y * v2.Y);
+        float c = 2 * (v1.X * v1.X + v1.Y * v1.Y);
+        float d = (float)Math.Sqrt(b * b - 2 * c * (v2.X * v2.X + v2.Y * v2.Y - circleRadius * circleRadius));
+        if (float.IsNaN(d)) // no intercept
+        {
+            return false;
+        }
+        // These represent the unit distance of point one and two on the line
+        float u1 = (b - d) / c;
+        float u2 = (b + d) / c;
+        if (u1 <= 1 && u1 >= 0) // If point on the line segment
+        {
+            return true;
+        }
+        if (u2 <= 1 && u2 >= 0) // If point on the line segment
+        {
+            return true;
+        }
+        return false;
+    }
+}
+
+

src/Shared/Entities/Spice.cs

@@ -6,14 +6,17 @@ namespace Shared.Entities;
 
 public class Spice
 {
-    public Entity create(Color color, Vector2 position, float size)
+    private Random random = new Random();
+    public Entity create(Color color, Vector2 position)
     {
+        int power = random.Next(1, 10);
+        float size = 10;
         Entity entity = new Entity();
         entity.add(new Appearance("Textures/spice")); // TODO: Make this a spice texture
         entity.add(new Position(position));
-        entity.add(new Size(new Vector2(size, size)));
+        entity.add(new Size(new Vector2(size * power, size * power)));
         entity.add(new Collision());
-        entity.add(new SpicePower(0));
+        entity.add(new SpicePower(power));
         return entity;
     }
 }