Fixed Recursivity of float3.movetowards()

ltmx · Aug 27, 2023 · b979ff2 · b979ff2
1 parent 75295ec
commit b979ff2
Showing 1 changed file with 6 additions and 15 deletions.
diff --git a/Runtime/mathx.Mathf.translations.movetowards.cs b/Runtime/mathx.Mathf.translations.movetowards.cs
@@ -4,8 +4,6 @@
 // **    Repository : https://github.com/LTMX/Unity.mathx
 #endregion
 
-using UnityEngine;
-
 namespace Unity.Mathematics
 {
     public partial class mathx
@@ -21,27 +19,20 @@ public static float4 movetowards(this float4 current, float4 target, float4 maxD
         public static float4 movetowards(this float4 current, float4 target, float maxDistanceDelta)
         {
             var delta = target - current;
-            var deltaLength = delta.length();
-            return math.mad(min(deltaLength,maxDistanceDelta),sign(delta),current);
+            return math.mad(min(abs(delta),maxDistanceDelta),sign(delta),current);
         }
         /// <inheritdoc cref="movetowards(Mathematics.float4,Mathematics.float4,float)"/>
         public static float3 movetowards(this float3 current, float3 target, float3 maxDistanceDelta)
         {
             var delta = target - current;
-            return math.mad(min(abs(delta),maxDistanceDelta),sign(delta),current);
+            return math.mad(min(abs(delta), maxDistanceDelta), sign(delta),current);
         }
         /// <inheritdoc cref="movetowards(Mathematics.float4,Mathematics.float4,float)"/>
         public static float3 movetowards(this float3 current, float3 target, float maxDistanceDelta)
         {
-            return movetowards(current, target, maxDistanceDelta);
+            var delta = target - current;
+            return math.mad(min(abs(delta), maxDistanceDelta),sign(delta),current);
         }
-        // /// <inheritdoc cref="movetowards(Mathematics.float4,Mathematics.float4,float)"/>
-        // public static float2 movetowards(this float2 current, float2 target, float2 maxDistanceDelta)
-        // {
-        //     var delta = target - current;
-        //     var deltaLength = delta.length();
-        //     return math.mad(min(deltaLength,maxDistanceDelta),sign(delta),current);
-        // }
         /// <inheritdoc cref="movetowards(Mathematics.float4,Mathematics.float4,float)"/>
         public static float2 movetowards(this float2 current, float2 target, float2 maxDistanceDelta)
         {
@@ -52,8 +43,7 @@ public static float2 movetowards(this float2 current, float2 target, float2 maxD
         public static float2 movetowards(this float2 current, float2 target, float maxDistanceDelta)
         {
             var delta = target - current;
-            var deltaLength = delta.length();
-            return math.mad(min(deltaLength,maxDistanceDelta),sign(delta),current);
+            return math.mad(min(abs(delta),maxDistanceDelta),sign(delta),current);
         }
         /// <inheritdoc cref="movetowards(Mathematics.float4,Mathematics.float4,float)"/>
         public static float movetowards(this float current, float target, float maxDistanceDelta)
@@ -62,6 +52,7 @@ public static float movetowards(this float current, float target, float maxDista
             return math.mad(min(abs(delta),maxDistanceDelta),sign(delta),current);
         }
 
+        // For Reference
         // float3 MoveTowards(float3 current, float3 target, float maxDistanceDelta)
         // {
         //     float3 delta = target - current;