diff --git a/Scripts/LookAt/CurveMapper.cs b/Scripts/LookAt/CurveMapper.cs index a3ea04107..2695b51da 100644 --- a/Scripts/LookAt/CurveMapper.cs +++ b/Scripts/LookAt/CurveMapper.cs @@ -12,10 +12,22 @@ namespace VRM public AnimationCurve Curve = AnimationCurve.Linear(0, 0, 1.0f, 1.0f); [Range(20.0f, 90.0f)] - public float CurveXRangeDegree = 90.0f; + public float CurveXRangeDegree; [Range(0, 90.0f)] - public float CurveYRangeDegree = 10.0f; + public float CurveYRangeDegree; + + /* + public CurveMapper() : this(90.0f, 10.0f) + { + } + */ + + public CurveMapper(float xRange, float yRange) + { + CurveXRangeDegree = xRange; + CurveYRangeDegree = yRange; + } public void OnValidate() { diff --git a/Scripts/LookAt/VRMLookAt.cs b/Scripts/LookAt/VRMLookAt.cs index 79cf6b6fa..8b8bda230 100644 --- a/Scripts/LookAt/VRMLookAt.cs +++ b/Scripts/LookAt/VRMLookAt.cs @@ -28,16 +28,16 @@ namespace VRM public OffsetOnTransform Head; [SerializeField, Header("Degree Mapping")] - public CurveMapper HorizontalOuter = new CurveMapper(); + public CurveMapper HorizontalOuter = new CurveMapper(90.0f, 10.0f); [SerializeField] - public CurveMapper HorizontalInner = new CurveMapper(); + public CurveMapper HorizontalInner = new CurveMapper(90.0f, 10.0f); [SerializeField] - public CurveMapper VerticalDown = new CurveMapper(); + public CurveMapper VerticalDown = new CurveMapper(90.0f, 10.0f); [SerializeField] - public CurveMapper VerticalUp = new CurveMapper(); + public CurveMapper VerticalUp = new CurveMapper(90.0f, 10.0f); public Texture2D CreateThumbnail() { diff --git a/Scripts/LookAt/VRMLookAtBlendShapeApplyer.cs b/Scripts/LookAt/VRMLookAtBlendShapeApplyer.cs index afcef38b8..be90dba13 100644 --- a/Scripts/LookAt/VRMLookAtBlendShapeApplyer.cs +++ b/Scripts/LookAt/VRMLookAtBlendShapeApplyer.cs @@ -9,13 +9,13 @@ namespace VRM public bool DrawGizmo = true; [SerializeField, Header("Degree Mapping")] - public CurveMapper Horizontal = new CurveMapper(); + public CurveMapper Horizontal = new CurveMapper(90.0f, 1.0f); [SerializeField] - public CurveMapper VerticalDown = new CurveMapper(); + public CurveMapper VerticalDown = new CurveMapper(90.0f, 1.0f); [SerializeField] - public CurveMapper VerticalUp = new CurveMapper(); + public CurveMapper VerticalUp = new CurveMapper(90.0f, 1.0f); VRMLookAtHead m_head; VRMBlendShapeProxy m_propxy; diff --git a/Scripts/LookAt/VRMLookAtBoneApplyer.cs b/Scripts/LookAt/VRMLookAtBoneApplyer.cs index 152e648db..b34f5eb5d 100644 --- a/Scripts/LookAt/VRMLookAtBoneApplyer.cs +++ b/Scripts/LookAt/VRMLookAtBoneApplyer.cs @@ -16,16 +16,16 @@ namespace VRM public OffsetOnTransform RightEye; [SerializeField, Header("Degree Mapping")] - public CurveMapper HorizontalOuter = new CurveMapper(); + public CurveMapper HorizontalOuter = new CurveMapper(90.0f, 10.0f); [SerializeField] - public CurveMapper HorizontalInner = new CurveMapper(); + public CurveMapper HorizontalInner = new CurveMapper(90.0f, 10.0f); [SerializeField] - public CurveMapper VerticalDown = new CurveMapper(); + public CurveMapper VerticalDown = new CurveMapper(90.0f, 10.0f); [SerializeField] - public CurveMapper VerticalUp = new CurveMapper(); + public CurveMapper VerticalUp = new CurveMapper(90.0f, 10.0f); private void Reset() {