Clamp01

vrm-c · Oct 7, 2024 · a17aa97 · a17aa97
1 parent d688a15
commit a17aa97
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/Assets/VRM/Runtime/LookAt/CurveMapper.cs b/Assets/VRM/Runtime/LookAt/CurveMapper.cs
@@ -62,7 +62,8 @@ IEnumerable<Keyframe> ToKeys(float[] values)
         public float Map(float src)
         {
             // https://github.com/vrm-c/UniVRM/issues/2452
-            return Curve.Evaluate(Mathf.Clamp(src, 0, 1) / MathF.Max(CurveXRangeDegree, 0.001f)) * CurveYRangeDegree;
+            var t = Mathf.Clamp01(Mathf.Clamp(src, 0, 1) / MathF.Max(CurveXRangeDegree, 0.001f));
+            return Curve.Evaluate(t) * CurveYRangeDegree;
         }
 
         public bool Equals(CurveMapper other)

diff --git a/Assets/VRM10/Runtime/Components/LookAt/CurveMapper.cs b/Assets/VRM10/Runtime/Components/LookAt/CurveMapper.cs
@@ -30,7 +30,8 @@ public void OnValidate()
         public float Map(float src)
         {
             // https://github.com/vrm-c/UniVRM/issues/2452
-            return Mathf.Clamp(src, 0, CurveXRangeDegree) / Mathf.Max(0.001f, CurveXRangeDegree) * CurveYRangeDegree;
+            var t = Mathf.Clamp01(Mathf.Clamp(src, 0, CurveXRangeDegree) / Mathf.Max(0.001f, CurveXRangeDegree));
+            return t * CurveYRangeDegree;
         }
     }
 }