Updated vector distance method

technologists-team · Aug 29, 2024 · a6e4571 · a6e4571
1 parent 52cd8d3
commit a6e4571
Show file tree

Hide file tree

Showing 5 changed files with 299 additions and 26 deletions.
diff --git a/Hypercube.Mathematics/Vectors/Vector2.cs b/Hypercube.Mathematics/Vectors/Vector2.cs
@@ -189,13 +189,13 @@ public Vector2 WithY(float value)
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     public float DistanceSquared(Vector2 value)
     {
-        return (this - value).LengthSquared;
+        return DistanceSquared(this, value);
     }
 
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     public float Distance(Vector2 value)
     {
-        return MathF.Sqrt(DistanceSquared(value));
+        return Distance(this, value);
     }
 
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
@@ -495,7 +495,7 @@ public static float DistanceSquared(Vector2 valueA, Vector2 valueB)
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     public static float Distance(Vector2 valueA, Vector2 valueB)
     {
-        return MathF.Sqrt(DistanceSquared(valueA, valueB));
+        return (valueA - valueB).Length;
     }
 
     [MethodImpl(MethodImplOptions.AggressiveInlining)]

diff --git a/Hypercube.Mathematics/Vectors/Vector2i.cs b/Hypercube.Mathematics/Vectors/Vector2i.cs
@@ -142,13 +142,13 @@ public Vector2i WithY(int value)
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     public float DistanceSquared(Vector2i value)
     {
-        return (this - value).LengthSquared;
+        return DistanceSquared(this, value);
     }
 
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     public float Distance(Vector2i value)
     {
-        return MathF.Sqrt(DistanceSquared(this, value));
+        return Distance(this, value);
     }
 
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
@@ -388,7 +388,7 @@ public static float DistanceSquared(Vector2i valueA, Vector2i valueB)
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     public static float Distance(Vector2i valueA, Vector2i valueB)
     {
-        return MathF.Sqrt(DistanceSquared(valueA, valueB));
+        return (valueA - valueB).Length;
     }
 
     [MethodImpl(MethodImplOptions.AggressiveInlining)]

diff --git a/Hypercube.Mathematics/Vectors/Vector3.cs b/Hypercube.Mathematics/Vectors/Vector3.cs
@@ -216,13 +216,13 @@ public Vector3 WithZ(float value)
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     public float DistanceSquared(Vector3 value)
     {
-        return (this - value).LengthSquared;
+        return DistanceSquared(this, value);
     }
 
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     public float Distance(Vector3 value)
     {
-        return MathF.Sqrt(DistanceSquared(value));
+        return Distance(this, value);
     }
 
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
@@ -379,6 +379,12 @@ public override string ToString()
         return new Vector3(a.X + b, a.Y + b, a.Z + b);
     }
 
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public static Vector3 operator +(float a, Vector3 b)
+    {
+        return new Vector3(a + b.X, a + b.Y, a + b.Z);
+    }
+
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     public static Vector3 operator -(Vector3 a)
     {
@@ -403,6 +409,12 @@ public override string ToString()
         return new Vector3(a.X - b, a.Y - b, a.Z - b);
     }
 
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public static Vector3 operator -(float a, Vector3 b)
+    {
+        return new Vector3(a - b.X, a - b.Y, a - b.Z);
+    }
+
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     public static Vector3 operator *(Vector3 a, Vector3 b)
     {
@@ -472,7 +484,7 @@ public static float DistanceSquared(Vector2 valueA, Vector2 valueB)
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     public static float Distance(Vector2 valueA, Vector2 valueB)
     {
-        return MathF.Sqrt(DistanceSquared(valueA, valueB));
+        return (valueA - valueB).Length;
     }
 
     [MethodImpl(MethodImplOptions.AggressiveInlining)]

diff --git a/Hypercube.Mathematics/Vectors/Vector3i.cs b/Hypercube.Mathematics/Vectors/Vector3i.cs
@@ -176,13 +176,13 @@ public Vector3i WithZ(int value)
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     public float DistanceSquared(Vector3i value)
     {
-        return (this - value).LengthSquared;
+        return DistanceSquared(this, value);
     }
 
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     public float Distance(Vector3i value)
     {
-        return MathF.Sqrt(DistanceSquared(value));
+        return Distance(this, value);
     }
 
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
@@ -400,15 +400,15 @@ public override string ToString()
     }
 
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    public static float DistanceSquared(Vector2 valueA, Vector2 valueB)
+    public static float DistanceSquared(Vector3i valueA, Vector3i valueB)
     {
         return (valueA - valueB).LengthSquared;
     }
 
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    public static float Distance(Vector2 valueA, Vector2 valueB)
+    public static float Distance(Vector3i valueA, Vector3i valueB)
     {
-        return MathF.Sqrt(DistanceSquared(valueA, valueB));
+        return (valueA - valueB).Length;
     }
 
     [MethodImpl(MethodImplOptions.AggressiveInlining)]