Leahnaya/UniVRM
1
0
Fork 0
mirror of https://github.com/vrm-c/UniVRM.git synced 2026-08-25 12:05:08 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #2455 from ousttrue/fix/inputMaxValue

Browse Source 
[lookat] inputMaxValue == 0 の例外処理
This commit is contained in:
ousttrue
2024-10-11 17:55:46 +09:00
committed by GitHub
parent 62b657226b a3067ef7cc
commit 4055adcebc
2 changed files with 7 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Assets/VRM/Runtime/LookAt/CurveMapper.cs
View File

@@ -61,15 +61,9 @@ namespace VRM
public float Map(float src)
{
if (src < 0)
{
src = 0;
}
else if (src > CurveXRangeDegree)
{
src = CurveXRangeDegree;
}
return Curve.Evaluate(src / CurveXRangeDegree) * CurveYRangeDegree;
// https://github.com/vrm-c/UniVRM/issues/2452
var t = Mathf.Clamp01(src / MathF.Max(CurveXRangeDegree, 0.001f));
return Curve.Evaluate(t) * CurveYRangeDegree;
}
public bool Equals(CurveMapper other)

18
Assets/VRM10/Runtime/Components/LookAt/CurveMapper.cs
View File

@@ -1,6 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using UnityEngine;
@@ -9,8 +7,6 @@ namespace UniVRM10
[Serializable]
public class CurveMapper
{
private AnimationCurve _curve = AnimationCurve.Linear(0, 0, 1.0f, 1.0f);
[Range(20.0f, 90.0f)]
public float CurveXRangeDegree;
@@ -33,15 +29,9 @@ namespace UniVRM10
public float Map(float src)
{
if (src < 0)
{
src = 0;
}
else if (src > CurveXRangeDegree)
{
src = CurveXRangeDegree;
}
return _curve.Evaluate(src / CurveXRangeDegree) * CurveYRangeDegree;
// https://github.com/vrm-c/UniVRM/issues/2452
var t = Mathf.Clamp01(src / Mathf.Max(0.001f, CurveXRangeDegree));
return t * CurveYRangeDegree;
}
}
}
}