Simplify shapes

src/PolyZone.Tests/Internal/Vector2Assertions.cs

@@ -21,7 +21,7 @@ internal class Vector2Assertions(Vector2 instance) : ReferenceTypeAssertions<Vec
     private readonly Vector2 _instance = instance;
     protected override string Identifier => "directory";
 
-    internal AndConstraint<Vector2Assertions> BeInside(ISpatial2dShape shape, string because = "", params object[] becauseArgs)
+    internal AndConstraint<Vector2Assertions> BeInside(IShape2d shape, string because = "", params object[] becauseArgs)
     {
         Execute.Assertion
             .BecauseOf(because, becauseArgs)
@@ -49,7 +49,7 @@ internal AndConstraint<Vector2Assertions> BeInsideOnlyOneOf(IEnumerable<IPolygon
         return new AndConstraint<Vector2Assertions>(this);
     }
 
-    internal AndConstraint<Vector2Assertions> BeOutside(ISpatial2dShape shape, string because = "", params object[] becauseArgs)
+    internal AndConstraint<Vector2Assertions> BeOutside(IShape2d shape, string because = "", params object[] becauseArgs)
     {
         Execute.Assertion
             .BecauseOf(because, becauseArgs)

src/PolyZone/Extensions/VectorExtensions.cs

@@ -5,12 +5,15 @@ namespace PolyZone.Extensions;
 
 public static class VectorExtensions
 {
-    /// <inheritdoc cref="ISpatial2dShape.Contains"/>
-    public static bool IsInside(this Vector2 vector2, in ISpatial2dShape shape) => shape.Contains(vector2);
+    /// <inheritdoc cref="IShape2d.Contains"/>
+    public static bool IsInside(this Vector2 vector2, in IShape2d shape) => shape.Contains(vector2);
 
-    /// <inheritdoc cref="ISpatial2dShape.DistanceFrom"/>
-    public static float DistanceTo(this Vector2 vector2, in ISpatial2dShape shape) => shape.DistanceFrom(vector2);
+    /// <inheritdoc cref="IShape2d.DistanceFrom"/>
+    public static float DistanceTo(this Vector2 vector2, in IShape2d shape) => shape.DistanceFrom(vector2);
 
-    /// <inheritdoc cref="ISpatial3dShape.Contains"/>
-    public static bool IsInside(this Vector3 vector2, in ISpatial3dShape shape) => shape.Contains(vector2);
+    /// <inheritdoc cref="IShape3d.Contains"/>
+    public static bool IsInside(this Vector3 vector2, in IShape3d shape) => shape.Contains(vector2);
+
+    /// <inheritdoc cref="IShape3d.DistanceFrom"/>
+    public static float DistanceTo(this Vector3 vector3, in IShape3d shape) => shape.DistanceFrom(vector3);
 }

src/PolyZone/Shapes/Circle.cs

@@ -24,7 +24,7 @@ public Circle(float centerX, float centerY, float radius) : this(new Vector2 { X
 
     }
 
-    /// <inheritdoc cref="ISpatial2dShape.Contains"/>
+    /// <inheritdoc />
     public bool Contains(in Vector2 point)
     {
         // Calculate the distance from the center of the circle to the given point
@@ -34,7 +34,7 @@ public bool Contains(in Vector2 point)
         return distance <= Radius;
     }
 
-    /// <inheritdoc cref="ISpatial2dShape.DistanceFrom"/>
+    /// <inheritdoc />
     public float DistanceFrom(in Vector2 point)
     {
         // Calculate the distance from the center of the circle to the given point

src/PolyZone/Shapes/Cuboid.cs

@@ -155,7 +155,7 @@ public Cuboid(in Vector3[] corners)
         Center = new Vector3 { X = (MinX + MaxX) / 2, Y = (MinY + MaxY) / 2, Z = (MinZ + MaxZ) / 2 };
     }
 
-    /// <inheritdoc cref="ISpatial3dShape.Contains"/>
+    /// <inheritdoc />
     public bool Contains(in Vector3 point)
     {
         // Check if the point is within the bounds defined by the corners of the cuboid
@@ -165,6 +165,7 @@ public bool Contains(in Vector3 point)
             point.Z >= MinZ && point.Z <= MaxZ;
     }
 
+    /// <inheritdoc />
     public float DistanceFrom(in Vector3 point)
     {
         if (Contains(point))

src/PolyZone/Shapes/Interfaces/ICircle.cs

@@ -3,4 +3,4 @@
 /// <summary>
 /// A 2d circle
 /// </summary>
-public interface ICircle : ISpatial2dShape;
+public interface ICircle : IShape2d;

src/PolyZone/Shapes/Interfaces/ICuboid.cs

@@ -3,4 +3,4 @@
 /// <summary>
 /// A 3d cuboid shape
 /// </summary>
-public interface ICuboid : ISpatial3dShape;
+public interface ICuboid : IShape3d;

src/PolyZone/Shapes/Interfaces/IPolygon.cs

@@ -5,7 +5,7 @@ namespace PolyZone.Shapes.Interfaces;
 /// <summary>
 /// A 2d polygon
 /// </summary>
-public interface IPolygon : ISpatial2dShape
+public interface IPolygon : IShape2d
 {
     public IReadOnlyList<Vector2> Points { get; }
 }

src/PolyZone/Shapes/Interfaces/IRectangle.cs

@@ -3,4 +3,4 @@
 /// <summary>
 /// A 2d rectangle / box
 /// </summary>
-public interface IRectangle : ISpatial2dShape;
+public interface IRectangle : IShape2d;

src/PolyZone/Shapes/Interfaces/IShape2d.cs

@@ -0,0 +1,20 @@
+using CitizenFX.Core;
+
+namespace PolyZone.Shapes.Interfaces;
+
+public interface IShape2d
+{
+    /// <summary>
+    /// Spatially tests a given <see cref="Vector2"/> position to determine if it lies within the shape
+    /// </summary>
+    /// <param name="point">A <see cref="Vector2"/> position</param>
+    /// <returns>True if the <see cref="Vector2"/> position is inside the shape</returns>
+    bool Contains(in Vector2 point);
+
+    /// <summary>
+    /// Calculates the float-accurate distance from a given <see cref="Vector2"/> position to the shape
+    /// </summary>
+    /// <param name="point">A <see cref="Vector2"/> position</param>
+    /// <returns>The float-accurate distance from a <see cref="Vector2"/> to the shape</returns>
+    float DistanceFrom(in Vector2 point);
+}

src/PolyZone/Shapes/Interfaces/IShape3d.cs

@@ -0,0 +1,20 @@
+using CitizenFX.Core;
+
+namespace PolyZone.Shapes.Interfaces;
+
+public interface IShape3d
+{
+    /// <summary>
+    /// Spatially tests a given <see cref="Vector3"/> position to determine if it lies within the shape
+    /// </summary>
+    /// <param name="point">A <see cref="Vector3"/> position</param>
+    /// <returns>True if the <see cref="Vector3"/> position is inside the shape</returns>
+    bool Contains(in Vector3 point);
+
+    /// <summary>
+    /// Calculates the float-accurate distance from a given <see cref="Vector3"/> position to the shape
+    /// </summary>
+    /// <param name="point">A <see cref="Vector3"/> position</param>
+    /// <returns>The float-accurate distance from a <see cref="Vector3"/> to the shape</returns>
+    float DistanceFrom(in Vector3 point);
+}

src/PolyZone/Shapes/Interfaces/ISphere.cs

@@ -3,4 +3,4 @@
 /// <summary>
 /// A 3d spherical shape
 /// </summary>
-public interface ISphere : ISpatial3dShape;
+public interface ISphere : IShape3d;

src/PolyZone/Shapes/Polygon.cs

@@ -13,7 +13,7 @@ public class Polygon(IReadOnlyList<Vector2> points) : IPolygon
 
     public IReadOnlyList<Vector2> Points { get; } = points;
 
-    /// <inheritdoc cref="ISpatial2dShape.Contains"/>
+    /// <inheritdoc />
     public bool Contains(in Vector2 point)
     {
         if (_boundingBox is null)
@@ -35,7 +35,7 @@ public bool Contains(in Vector2 point)
         return Contains(point, Points, _boundingBox);
     }
 
-    /// <inheritdoc cref="ISpatial2dShape.DistanceFrom"/>
+    /// <inheritdoc />
     public float DistanceFrom(in Vector2 point) => DistanceFrom(point, Points);
 
     // https://web.archive.org/web/20210225074947/http://geomalgorithms.com/a03-_inclusion.html

src/PolyZone/Shapes/Rectangle.cs

@@ -13,14 +13,14 @@ public class Rectangle(in Vector2 upperLeft, in Vector2 bottomRight) : IRectangl
     public Vector2 UpperLeft { get; } = upperLeft;
     public Vector2 BottomRight { get; } = bottomRight;
 
-    /// <inheritdoc cref="ISpatial2dShape.Contains"/>
+    /// <inheritdoc />
     public bool Contains(in Vector2 point)
     {
         return point.X >= UpperLeft.X && point.X <= BottomRight.X &&
                point.Y >= UpperLeft.Y && point.Y <= BottomRight.Y;
     }
 
-    /// <inheritdoc cref="ISpatial2dShape.DistanceFrom"/>
+    /// <inheritdoc />
     public float DistanceFrom(in Vector2 point)
     {
         // Calculate the distance using Euclidean distance formula

src/PolyZone/Shapes/Sphere.cs

@@ -13,7 +13,7 @@ public class Sphere(in Vector3 center, float radius) : ISphere
     public Vector3 Center { get; } = center;
     public float Radius { get; } = radius;
 
-    /// <inheritdoc cref="ISpatial3dShape.Contains"/>
+    /// <inheritdoc />
     public bool Contains(in Vector3 point)
     {
         // Calculate the distance from the center of the sphere to the given point
@@ -22,4 +22,10 @@ public bool Contains(in Vector3 point)
         // Check if the distance is less than or equal to the radius
         return distance <= Radius;
     }
+
+    /// <inheritdoc />
+    public float DistanceFrom(in Vector3 point)
+    {
+        throw new NotImplementedException();
+    }
 }