Cleanup

src/PolyZone.Debug/PolyZone.Debug.csproj

@@ -14,4 +14,8 @@
     <Folder Include="Drawing\" />
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Include="CitizenFX.Core.Client" Version="1.0.7277" />
+  </ItemGroup>
+
 </Project>

src/PolyZone.Debug/Script.cs

@@ -1,6 +1,8 @@
-namespace PolyZone.Debug;
+using CitizenFX.Core;
 
-public class Script
+namespace PolyZone.Debug;
+
+public class Script : BaseScript
 {
 
-}
+}

src/PolyZone.Tests/Internal/Vector2Assertions.cs

@@ -2,7 +2,7 @@
 using FluentAssertions;
 using FluentAssertions.Execution;
 using FluentAssertions.Primitives;
-using PolyZone.Shapes;
+using PolyZone.Shapes.Interfaces;
 
 namespace PolyZone.Tests.Internal;
 
@@ -16,15 +16,14 @@ public static Vector2Assertions Should(this Vector2 instance)
 
 public class Vector2Assertions(Vector2 instance) : ReferenceTypeAssertions<Vector2, Vector2Assertions>(instance)
 {
-    private readonly Vector2 _instance = instance;
     protected override string Identifier => "directory";
 
-    public AndConstraint<Vector2Assertions> BeInside(Polygon polygon, string because = "", params object[] becauseArgs)
+    public AndConstraint<Vector2Assertions> BeInside(ISpatial2dShape shape, string because = "", params object[] becauseArgs)
     {
         Execute.Assertion
             .BecauseOf(because, becauseArgs)
-            .ForCondition(polygon.Contains(_instance))
-            .FailWith($"Expected point to be inside polygon, point was { _instance.X }, { _instance.Y }");
+            .ForCondition(shape.Contains(instance))
+            .FailWith($"Expected point to be inside polygon, point was { instance.X }, { instance.Y }");
 
         return new AndConstraint<Vector2Assertions>(this);
     }

src/PolyZone.Tests/PolyZone.Tests.csproj

@@ -6,7 +6,7 @@
 
     <IsPackable>false</IsPackable>
     <IsTestProject>true</IsTestProject>
-    <LangVersion>default</LangVersion>
+    <LangVersion>12</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>

src/PolyZone.Tests/Shapes/PolygonTests.cs

@@ -1,25 +1,12 @@
-using System.Collections.Generic;
-using CitizenFX.Core;
+using CitizenFX.Core;
 using FluentAssertions;
-using FluentAssertions.Execution;
-using FluentAssertions.Primitives;
 using PolyZone.Shapes;
 using PolyZone.Tests.Internal;
-using Xunit.Abstractions;
-
-// ReSharper disable ArrangeObjectCreationWhenTypeNotEvident
 
 namespace PolyZone.Tests.Shapes;
 
 public class PolygonTests
 {
-    private readonly ITestOutputHelper _testOutputHelper;
-
-    public PolygonTests(ITestOutputHelper testOutputHelper)
-    {
-        _testOutputHelper = testOutputHelper;
-    }
-
     [Fact]
     public void Polygon_A_IsInside_ShouldPassTest()
     {
@@ -35,17 +22,17 @@ public void Polygon_A_IsInside_ShouldPassTest()
             new Vector2 { X = -2f, Y = -8f }, // O (-3,-8)
             new Vector2 { X = 2.26106f, Y = -9.30121f }, // P (2.26106,-9.30121)
         };
-        
-        List<Vector2> points =
-        [
-            new() { X = 9.12f, Y = 4.2f }, // A (9.12,4.2)
-            new() { X = -3.98f, Y = 3.32f }, // B (-3.98,3.32)
-            new() { X = -4.56966f, Y = -3.5142f }, // C (-4.56966,-3.5142)
-            new() { X = -3.56008f, Y = -9.12483f }, // D (-3.56008,-9.12483)
-            new() { X = 3.75525f, Y = -9.88615f }, // E (3.75525,-9.88615)
-            new() { X = -2.36844f, Y = -2.83563f }, // F (-2.36844,-2.83563)
-            new() { X = -0.5f, Y = 2.06f } // G (-0.5,2.06)
-        ];
+
+        var points = new[]
+        {
+            new Vector2 { X = 9.12f, Y = 4.2f }, // A (9.12,4.2)
+            new Vector2 { X = -3.98f, Y = 3.32f }, // B (-3.98,3.32)
+            new Vector2 { X = -4.56966f, Y = -3.5142f }, // C (-4.56966,-3.5142)
+            new Vector2 { X = -3.56008f, Y = -9.12483f }, // D (-3.56008,-9.12483)
+            new Vector2 { X = 3.75525f, Y = -9.88615f }, // E (3.75525,-9.88615)
+            new Vector2 { X = -2.36844f, Y = -2.83563f }, // F (-2.36844,-2.83563)
+            new Vector2 { X = -0.5f, Y = 2.06f } // G (-0.5,2.06)
+        };
 
         var polygon = new Polygon(points);
 
@@ -54,7 +41,7 @@ public void Polygon_A_IsInside_ShouldPassTest()
             point.Should().BeInside(polygon);
         }
 
-        var distance = polygon.DistanceFrom(new() { X = -1f, Y = 3.6f });
+        var distance = polygon.DistanceFrom(new Vector2 { X = -1f, Y = 3.6f });
 
         distance.Should().BeGreaterThan(0);
     }

src/PolyZone/Extensions/Vector2Extensions.cs

@@ -1,12 +1,10 @@
 using CitizenFX.Core;
-using PolyZone.Shapes;
+using PolyZone.Shapes.Interfaces;
 
 namespace PolyZone.Extensions;
 
 public static class Vector2Extensions
 {
-    /*public static float DistanceFrom(this Vector2 vector2, in Polygon polygon)
-    {
-        return vector2;
-    }*/
+    public static bool IsInside(this Vector2 vector2, in ISpatial2dShape shape) => shape.Contains(vector2);
+    public static float DistanceTo(this Vector2 vector2, in ISpatial2dShape shape) => shape.DistanceFrom(vector2);
 }

src/PolyZone/Shapes/Interfaces/IPolygon.cs

@@ -1,9 +1,3 @@
-using CitizenFX.Core;
+namespace PolyZone.Shapes.Interfaces;
 
-namespace PolyZone.Shapes.Interfaces;
-
-public interface IPolygon
-{ 
-    bool Contains(Vector2 point);
-    float DistanceFrom(in Vector2 point);
-}
+public interface IPolygon : ISpatial2dShape;

src/PolyZone/Shapes/Interfaces/ISpatial2dShape.cs

@@ -0,0 +1,9 @@
+using CitizenFX.Core;
+
+namespace PolyZone.Shapes.Interfaces;
+
+public interface ISpatial2dShape
+{
+    bool Contains(Vector2 point);
+    float DistanceFrom(in Vector2 point);
+}