LookRotationSafe now handles NaN input

Unity-Technologies · Oct 1, 2018 · 4408031 · 4408031
1 parent 5ba2595
commit 4408031
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/Unity.Mathematics/matrix.cs b/src/Unity.Mathematics/matrix.cs
@@ -409,7 +409,7 @@ public static float3x3 LookRotationSafe(float3 forward, float3 up)
             float mn = min(min(forwardLengthSq, upLengthSq), tLengthSq);
             float mx = max(max(forwardLengthSq, upLengthSq), tLengthSq);
 
-            bool accept = mn > 1e-35f && mx < 1e35f;
+            bool accept = mn > 1e-35f && mx < 1e35f && isfinite(forwardLengthSq) && isfinite(upLengthSq) && isfinite(tLengthSq);
             return float3x3(
                 select(float3(1,0,0), t, accept),
                 select(float3(0,1,0), cross(forward, t), accept),

diff --git a/src/Unity.Mathematics/quaternion.cs b/src/Unity.Mathematics/quaternion.cs
@@ -387,7 +387,7 @@ public static quaternion LookRotationSafe(float3 forward, float3 up)
             float mn = min(min(forwardLengthSq, upLengthSq), tLengthSq);
             float mx = max(max(forwardLengthSq, upLengthSq), tLengthSq);
 
-            bool accept = mn > 1e-35f && mx < 1e35f;
+            bool accept = mn > 1e-35f && mx < 1e35f && isfinite(forwardLengthSq) && isfinite(upLengthSq) && isfinite(tLengthSq);
             return quaternion(select(float4(0.0f, 0.0f, 0.0f, 1.0f), quaternion(float3x3(t, cross(forward, t),forward)).value, accept));
         }