Remove my own primitives and replace them with XNA

DyflissuTeam · May 4, 2019 · 0713e18 · 0713e18
1 parent b526d65
commit 0713e18
Show file tree

Hide file tree

Showing 14 changed files with 28 additions and 101 deletions.
diff --git a/src/Dyflissu.DesktopGL/DyflissuGame.cs b/src/Dyflissu.DesktopGL/DyflissuGame.cs
@@ -17,7 +17,7 @@ public class DyflissuGame : Game
         public DyflissuGame()
         {
             graphics = new GraphicsDeviceManager(this);
-            world = new World(new Primitives.Vector2(0, 1f));
+            world = new World(new Vector2(0, 1f));
             Content.RootDirectory = "Content";
             IsMouseVisible = true;
         }
@@ -28,14 +28,14 @@ protected override void Initialize()
             {
                 Shape = new RectangleShape(10f),
                 Mass = 1f,
-                Position = new Primitives.Vector2(250f, 250f - 20)
+                Position = new Vector2(250f, 250f - 20)
             };
 
             world.AddBody(controlledBody);
             world.AddBody(new Body
             {
                 Mass = 0,
-                Position = new Primitives.Vector2(250f, 250f + 20),
+                Position = new Vector2(250f, 250f + 20),
                 Shape = new RectangleShape(100f, 30f),
             });
 
@@ -63,30 +63,30 @@ protected override void Update(GameTime gameTime)
                 world.AddBody(new Body
                 {
                     Shape = new RectangleShape(10f),
-                    Position = new Primitives.Vector2(currentMouseState.X, currentMouseState.Y)
+                    Position = new Vector2(currentMouseState.X, currentMouseState.Y)
                 });
             }
 
-            Primitives.Vector2 velocity;
+            Vector2 velocity;
             if (Keyboard.GetState().IsKeyDown(Keys.Up))
             {
-                velocity = new Primitives.Vector2(0, 1);
+                velocity = new Vector2(0, 1);
             }
             else if (Keyboard.GetState().IsKeyDown(Keys.Down))
             {
-                velocity = new Primitives.Vector2(0, -1);
+                velocity = new Vector2(0, -1);
             }
             else if (Keyboard.GetState().IsKeyDown(Keys.Left))
             {
-                velocity = new Primitives.Vector2(-1, 0);
+                velocity = new Vector2(-1, 0);
             }
             else if (Keyboard.GetState().IsKeyDown(Keys.Right))
             {
-                velocity = new Primitives.Vector2(1, 0);
+                velocity = new Vector2(1, 0);
             }
             else
             {
-                velocity = new Primitives.Vector2(0);
+                velocity = new Vector2(0);
             }
 
             controlledBody.Velocity = velocity;

diff --git a/src/Dyflissu.DesktopGL/PhysicsExtensions.cs b/src/Dyflissu.DesktopGL/PhysicsExtensions.cs
@@ -3,7 +3,6 @@
 using Dyflissu.Physics.Shapes;
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
-using DyflissuVector2 = Dyflissu.Primitives.Vector2;
 
 namespace Dyflissu.DesktopGL
 {
@@ -16,13 +15,11 @@ public static void Draw(this World world, SpriteBatch spriteBatch)
                 switch (body.Shape)
                 {
                     case RectangleShape rectangleShape:
-                        Vector2 position = (body.Position - body.Shape.Box / 2).ToXna();
-                        spriteBatch.DrawRectangle(position, rectangleShape.Box.ToXna(), Color.Green);
+                        Vector2 position = (body.Position - body.Shape.Box / 2);
+                        spriteBatch.DrawRectangle(position, rectangleShape.Box, Color.Green);
                         break;
                 }
             }
         }
-
-        public static Vector2 ToXna(this DyflissuVector2 v) => new Vector2(v.X, v.Y);
     }
 }
diff --git a/src/Dyflissu.Physics/Body.cs b/src/Dyflissu.Physics/Body.cs
@@ -1,5 +1,6 @@
 using Dyflissu.Physics.Shapes;
-using Dyflissu.Primitives;
+using Microsoft.Xna.Framework;
+
 // Argh. I'm checking exactly with zero, don't bother me, man.
 // ReSharper disable CompareOfFloatsByEqualityOperator
 

diff --git a/src/Dyflissu.Physics/CollisionChecker.cs b/src/Dyflissu.Physics/CollisionChecker.cs
@@ -1,6 +1,5 @@
 using System;
-using Dyflissu.Physics.Shapes;
-using Dyflissu.Primitives;
+using Microsoft.Xna.Framework;
 
 namespace Dyflissu.Physics
 {

diff --git a/src/Dyflissu.Physics/Dyflissu.Physics.csproj b/src/Dyflissu.Physics/Dyflissu.Physics.csproj
@@ -5,7 +5,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <ProjectReference Include="..\Dyflissu.Primitives\Dyflissu.Primitives.csproj" />
+      <PackageReference Include="MonoGame.Framework.Portable" Version="3.7.1.189" />
     </ItemGroup>
 
 </Project>
diff --git a/src/Dyflissu.Physics/Manifold.cs b/src/Dyflissu.Physics/Manifold.cs
@@ -1,5 +1,5 @@
 using System;
-using Dyflissu.Primitives;
+using Microsoft.Xna.Framework;
 
 namespace Dyflissu.Physics
 {
@@ -27,23 +27,23 @@ public Manifold(Body a, Body b)
             A = a;
             B = b;
 
-            E = Math.Abs((b.Velocity - a.Velocity).SquareLength) < 1e-10 
+            E = Math.Abs((b.Velocity - a.Velocity).LengthSquared()) < 1e-10 
                 ? 0 
                 : MathF.Min(a.Restitution, b.Restitution);
         }
 
         public bool Solve()
         {
             Vector2 normal = A.Position - B.Position;
-            float aHalfSizeX = A.Shape.Box.X / 2;
-            float bHalfSizeX = B.Shape.Box.X / 2;
+            float aHalfSizeX = A.Shape.Box.X / 2f;
+            float bHalfSizeX = B.Shape.Box.X / 2f;
 
             float xOverlap = aHalfSizeX + bHalfSizeX - MathF.Abs(normal.X);
 
             if (xOverlap <= 0) return false;
 
-            float aHalfSizeY = A.Shape.Box.Y / 2;
-            float bHalfSizeY = B.Shape.Box.Y / 2;
+            float aHalfSizeY = A.Shape.Box.Y / 2f;
+            float bHalfSizeY = B.Shape.Box.Y / 2f;
 
             float yOverlap = aHalfSizeY + bHalfSizeY - MathF.Abs(normal.Y);
 
@@ -70,7 +70,7 @@ public bool Solve()
 
         public void Resolve()
         {
-            E = Math.Abs((B.Velocity - A.Velocity).SquareLength) < 1e-10 
+            E = Math.Abs((B.Velocity - A.Velocity).LengthSquared()) < 1e-10 
                 ? 0 
                 : MathF.Min(A.Restitution, B.Restitution);
 

diff --git a/src/Dyflissu.Physics/PhysicsMath.cs b/src/Dyflissu.Physics/PhysicsMath.cs
@@ -1,4 +1,4 @@
-using Dyflissu.Primitives;
+using Microsoft.Xna.Framework;
 
 namespace Dyflissu.Physics
 {

diff --git a/src/Dyflissu.Physics/Shapes/RectangleShape.cs b/src/Dyflissu.Physics/Shapes/RectangleShape.cs
@@ -1,4 +1,4 @@
-using Dyflissu.Primitives;
+using Microsoft.Xna.Framework;
 
 namespace Dyflissu.Physics.Shapes
 {

diff --git a/src/Dyflissu.Physics/Shapes/Shape.cs b/src/Dyflissu.Physics/Shapes/Shape.cs
@@ -1,5 +1,4 @@
-using System;
-using Dyflissu.Primitives;
+using Microsoft.Xna.Framework;
 
 namespace Dyflissu.Physics.Shapes
 {

diff --git a/src/Dyflissu.Physics/World.cs b/src/Dyflissu.Physics/World.cs
@@ -1,7 +1,6 @@
-using System;
 using System.Collections.Generic;
 using System.Linq;
-using Dyflissu.Primitives;
+using Microsoft.Xna.Framework;
 
 namespace Dyflissu.Physics
 {

diff --git a/src/Dyflissu.Primitives/Dyflissu.Primitives.csproj b/src/Dyflissu.Primitives/Dyflissu.Primitives.csproj
diff --git a/src/Dyflissu.Primitives/Vector2.cs b/src/Dyflissu.Primitives/Vector2.cs
diff --git a/src/Dyflissu.Shared/GameWorld.cs b/src/Dyflissu.Shared/GameWorld.cs
@@ -1,5 +1,5 @@
 using Dyflissu.Physics;
-using Dyflissu.Primitives;
+using Microsoft.Xna.Framework;
 
 namespace Dyflissu.Shared
 {

diff --git a/src/Dyflissu.sln b/src/Dyflissu.sln
@@ -8,8 +8,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Dyflissu.Backend", "Dyfliss
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Dyflissu.Physics", "Dyflissu.Physics\Dyflissu.Physics.csproj", "{D0161D6B-B987-4D22-AC82-E136874EBBB0}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Dyflissu.Primitives", "Dyflissu.Primitives\Dyflissu.Primitives.csproj", "{A62F8FC9-133F-4710-BFCC-899F49EE422B}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lidgren.Network.MultiTarget", "..\submodules\lidgren-network-gen3\Lidgren.Network.MultiTarget\Lidgren.Network.MultiTarget.csproj", "{3F46F990-29F4-4DFC-AB52-AF9586773907}"
 EndProject
 Global
@@ -34,10 +32,6 @@ Global
 		{D0161D6B-B987-4D22-AC82-E136874EBBB0}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D0161D6B-B987-4D22-AC82-E136874EBBB0}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D0161D6B-B987-4D22-AC82-E136874EBBB0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A62F8FC9-133F-4710-BFCC-899F49EE422B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A62F8FC9-133F-4710-BFCC-899F49EE422B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A62F8FC9-133F-4710-BFCC-899F49EE422B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A62F8FC9-133F-4710-BFCC-899F49EE422B}.Release|Any CPU.Build.0 = Release|Any CPU
 		{3F46F990-29F4-4DFC-AB52-AF9586773907}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{3F46F990-29F4-4DFC-AB52-AF9586773907}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{3F46F990-29F4-4DFC-AB52-AF9586773907}.Release|Any CPU.ActiveCfg = Release|Any CPU