diff --git a/Assets/VRM/Runtime/LookAt/CurveMapper.cs b/Assets/VRM/Runtime/LookAt/CurveMapper.cs index d64586a49..49a38b30b 100644 --- a/Assets/VRM/Runtime/LookAt/CurveMapper.cs +++ b/Assets/VRM/Runtime/LookAt/CurveMapper.cs @@ -67,19 +67,20 @@ namespace VRM if (CurveXRangeDegree < MIMIMUM_INPUT_MAX_VALUE) { // https://github.com/vrm-c/UniVRM/issues/2452 - return 0; - // or CurveYRangeDegree ? + return src <= 0 ? 0 : CurveYRangeDegree; } - - if (src < 0) + else { - src = 0; + if (src < 0) + { + src = 0; + } + else if (src > CurveXRangeDegree) + { + src = CurveXRangeDegree; + } + return Curve.Evaluate(src / CurveXRangeDegree) * CurveYRangeDegree; } - else if (src > CurveXRangeDegree) - { - src = CurveXRangeDegree; - } - return Curve.Evaluate(src / CurveXRangeDegree) * CurveYRangeDegree; } public bool Equals(CurveMapper other) diff --git a/Assets/VRM10/Runtime/Components/LookAt/CurveMapper.cs b/Assets/VRM10/Runtime/Components/LookAt/CurveMapper.cs index f451c291e..174b3a02a 100644 --- a/Assets/VRM10/Runtime/Components/LookAt/CurveMapper.cs +++ b/Assets/VRM10/Runtime/Components/LookAt/CurveMapper.cs @@ -39,19 +39,20 @@ namespace UniVRM10 if (CurveXRangeDegree < MIMIMUM_INPUT_MAX_VALUE) { // https://github.com/vrm-c/UniVRM/issues/2452 - return 0; - // or CurveYRangeDegree ? + return src <= 0 ? 0 : CurveXRangeDegree; } - - if (src < 0) + else { - src = 0; + if (src < 0) + { + src = 0; + } + else if (src > CurveXRangeDegree) + { + src = CurveXRangeDegree; + } + return _curve.Evaluate(src / CurveXRangeDegree) * CurveYRangeDegree; } - else if (src > CurveXRangeDegree) - { - src = CurveXRangeDegree; - } - return _curve.Evaluate(src / CurveXRangeDegree) * CurveYRangeDegree; } } }