From fc544945fd902669b42ff786f6bdd4a75b156ab2 Mon Sep 17 00:00:00 2001 From: thatcosmonaut Date: Thu, 31 Oct 2019 16:19:30 -0700 Subject: [PATCH] remove monogame dependency --- Bonk/AABB.cs | 3 +-- Bonk/Bonk.csproj | 4 ++-- Bonk/IShape2D.cs | 2 +- Bonk/MinkowskiDifference.cs | 2 +- Bonk/NarrowPhase/EPA2D.cs | 7 +++---- Bonk/NarrowPhase/Edge.cs | 5 +++-- Bonk/NarrowPhase/GJK2D.cs | 4 ++-- Bonk/Shapes/Circle.cs | 2 +- Bonk/Shapes/Line.cs | 2 +- Bonk/Shapes/Polygon.cs | 2 +- Bonk/Shapes/Rectangle.cs | 2 +- Bonk/Shapes/Simplex.cs | 3 +-- Bonk/Vector2Extensions.cs | 2 +- Test/EPA2DTest.cs | 2 +- Test/Equality.cs | 2 +- Test/GJK2DTest.cs | 2 +- Test/SpatialHashTest.cs | 2 +- 17 files changed, 23 insertions(+), 25 deletions(-) diff --git a/Bonk/AABB.cs b/Bonk/AABB.cs index d29f86b..246e1b1 100644 --- a/Bonk/AABB.cs +++ b/Bonk/AABB.cs @@ -1,7 +1,6 @@ -using System; using System.Collections.Generic; using System.Linq; -using Microsoft.Xna.Framework; +using System.Numerics; using MoonTools.Core.Structs; namespace MoonTools.Core.Bonk diff --git a/Bonk/Bonk.csproj b/Bonk/Bonk.csproj index ee91979..22b77c7 100644 --- a/Bonk/Bonk.csproj +++ b/Bonk/Bonk.csproj @@ -1,7 +1,7 @@ 2.1.1 - netstandard2.0 + netstandard2.1 .NET Core Collision Detection for MonoGame MoonTools.Core.Bonk MoonTools.Core.Bonk @@ -15,7 +15,7 @@ https://github.com/MoonsideGames/MoonTools.Core.Bonk - + diff --git a/Bonk/IShape2D.cs b/Bonk/IShape2D.cs index 7a34782..1a5f80e 100644 --- a/Bonk/IShape2D.cs +++ b/Bonk/IShape2D.cs @@ -1,5 +1,5 @@ using System; -using Microsoft.Xna.Framework; +using System.Numerics; using MoonTools.Core.Structs; namespace MoonTools.Core.Bonk diff --git a/Bonk/MinkowskiDifference.cs b/Bonk/MinkowskiDifference.cs index 940cad1..dce2e03 100644 --- a/Bonk/MinkowskiDifference.cs +++ b/Bonk/MinkowskiDifference.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using Microsoft.Xna.Framework; +using System.Numerics; using MoonTools.Core.Structs; namespace MoonTools.Core.Bonk diff --git a/Bonk/NarrowPhase/EPA2D.cs b/Bonk/NarrowPhase/EPA2D.cs index b76c98b..791c9a9 100644 --- a/Bonk/NarrowPhase/EPA2D.cs +++ b/Bonk/NarrowPhase/EPA2D.cs @@ -5,9 +5,9 @@ */ using Collections.Pooled; -using Microsoft.Xna.Framework; using MoonTools.Core.Structs; using System; +using System.Numerics; namespace MoonTools.Core.Bonk { @@ -79,13 +79,12 @@ namespace MoonTools.Core.Bonk Vector2 norm; if (winding == PolygonWinding.Clockwise) { - norm = new Vector2(edge.Y, -edge.X); + norm = Vector2.Normalize(new Vector2(edge.Y, -edge.X)); } else { - norm = new Vector2(-edge.Y, edge.X); + norm = Vector2.Normalize(new Vector2(-edge.Y, edge.X)); } - norm.Normalize(); var dist = Vector2.Dot(norm, simplexVertices[i]); diff --git a/Bonk/NarrowPhase/Edge.cs b/Bonk/NarrowPhase/Edge.cs index 65ccf4e..902a30a 100644 --- a/Bonk/NarrowPhase/Edge.cs +++ b/Bonk/NarrowPhase/Edge.cs @@ -1,4 +1,4 @@ -using Microsoft.Xna.Framework; +using System.Numerics; namespace MoonTools.Core.Bonk { @@ -8,7 +8,8 @@ namespace MoonTools.Core.Bonk public Vector2 normal; public int index; - public Edge(float distance, Vector2 normal, int index) { + public Edge(float distance, Vector2 normal, int index) + { this.distance = distance; this.normal = normal; this.index = index; diff --git a/Bonk/NarrowPhase/GJK2D.cs b/Bonk/NarrowPhase/GJK2D.cs index 9b9776f..e6736b0 100644 --- a/Bonk/NarrowPhase/GJK2D.cs +++ b/Bonk/NarrowPhase/GJK2D.cs @@ -1,6 +1,6 @@ -using Microsoft.Xna.Framework; -using MoonTools.Core.Structs; +using MoonTools.Core.Structs; using MoonTools.Core.Bonk.Extensions; +using System.Numerics; namespace MoonTools.Core.Bonk { diff --git a/Bonk/Shapes/Circle.cs b/Bonk/Shapes/Circle.cs index af93404..465a5f8 100644 --- a/Bonk/Shapes/Circle.cs +++ b/Bonk/Shapes/Circle.cs @@ -1,5 +1,5 @@ using System; -using Microsoft.Xna.Framework; +using System.Numerics; using MoonTools.Core.Structs; namespace MoonTools.Core.Bonk diff --git a/Bonk/Shapes/Line.cs b/Bonk/Shapes/Line.cs index 825c0e2..72f1362 100644 --- a/Bonk/Shapes/Line.cs +++ b/Bonk/Shapes/Line.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using Microsoft.Xna.Framework; +using System.Numerics; using MoonTools.Core.Structs; namespace MoonTools.Core.Bonk diff --git a/Bonk/Shapes/Polygon.cs b/Bonk/Shapes/Polygon.cs index 2cac2d8..44ecf93 100644 --- a/Bonk/Shapes/Polygon.cs +++ b/Bonk/Shapes/Polygon.cs @@ -1,8 +1,8 @@ using System.Linq; using System; using System.Collections.Generic; +using System.Numerics; using Collections.Pooled; -using Microsoft.Xna.Framework; using MoonTools.Core.Structs; using MoreLinq; diff --git a/Bonk/Shapes/Rectangle.cs b/Bonk/Shapes/Rectangle.cs index 069d79c..c1b46c6 100644 --- a/Bonk/Shapes/Rectangle.cs +++ b/Bonk/Shapes/Rectangle.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; using System.Linq; -using Microsoft.Xna.Framework; +using System.Numerics; using MoonTools.Core.Structs; using MoreLinq; diff --git a/Bonk/Shapes/Simplex.cs b/Bonk/Shapes/Simplex.cs index bfd4dc9..f8e6ad5 100644 --- a/Bonk/Shapes/Simplex.cs +++ b/Bonk/Shapes/Simplex.cs @@ -1,8 +1,7 @@ using System.Linq; using System.Collections.Generic; -using Microsoft.Xna.Framework; +using System.Numerics; using MoonTools.Core.Structs; -using MoonTools.Core.Bonk.Extensions; using MoreLinq; namespace MoonTools.Core.Bonk diff --git a/Bonk/Vector2Extensions.cs b/Bonk/Vector2Extensions.cs index 6c4920f..319ac07 100644 --- a/Bonk/Vector2Extensions.cs +++ b/Bonk/Vector2Extensions.cs @@ -1,4 +1,4 @@ -using Microsoft.Xna.Framework; +using System.Numerics; namespace MoonTools.Core.Bonk.Extensions { diff --git a/Test/EPA2DTest.cs b/Test/EPA2DTest.cs index e53baed..cf26e71 100644 --- a/Test/EPA2DTest.cs +++ b/Test/EPA2DTest.cs @@ -1,8 +1,8 @@ using NUnit.Framework; using FluentAssertions; -using Microsoft.Xna.Framework; using System; +using System.Numerics; using MoonTools.Core.Structs; using MoonTools.Core.Bonk; diff --git a/Test/Equality.cs b/Test/Equality.cs index 2bce8b9..fc6b6ef 100644 --- a/Test/Equality.cs +++ b/Test/Equality.cs @@ -3,7 +3,7 @@ using FluentAssertions; using MoonTools.Core.Bonk; using MoonTools.Core.Structs; -using Microsoft.Xna.Framework; +using System.Numerics; namespace Tests { diff --git a/Test/GJK2DTest.cs b/Test/GJK2DTest.cs index a663ac4..6d15f4b 100644 --- a/Test/GJK2DTest.cs +++ b/Test/GJK2DTest.cs @@ -1,7 +1,7 @@ using NUnit.Framework; using MoonTools.Core.Bonk; using MoonTools.Core.Structs; -using Microsoft.Xna.Framework; +using System.Numerics; using FluentAssertions; namespace Tests diff --git a/Test/SpatialHashTest.cs b/Test/SpatialHashTest.cs index 6da09e0..a608dc6 100644 --- a/Test/SpatialHashTest.cs +++ b/Test/SpatialHashTest.cs @@ -1,8 +1,8 @@ using FluentAssertions; -using Microsoft.Xna.Framework; using NUnit.Framework; using MoonTools.Core.Structs; using MoonTools.Core.Bonk; +using System.Numerics; namespace Tests {