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

Refactoring

Browse Source
This commit is contained in:
Masataka SUMI
2023-10-11 18:38:50 +09:00
parent 21c457a868
commit a4dea7d279
1 changed files with 29 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
Assets/VRM10/Runtime/Components/LookAt/LookAtEyeDirectionApplicableToBone.cs
View File

@@ -42,34 +42,7 @@ namespace UniVRM10
public void Apply(LookAtEyeDirection eyeDirection, Dictionary<ExpressionKey, float> actualWeights)
{
// FIXME
var yaw = eyeDirection.Yaw;
var pitch = eyeDirection.Pitch;
// horizontal
float leftYaw, rightYaw;
if (yaw < 0)
{
leftYaw = -_horizontalOuter.Map(-yaw);
rightYaw = -_horizontalInner.Map(-yaw);
}
else
{
rightYaw = _horizontalOuter.Map(yaw);
leftYaw = _horizontalInner.Map(yaw);
}
// vertical
if (pitch < 0)
{
pitch = -_verticalDown.Map(-pitch);
}
else
{
pitch = _verticalUp.Map(pitch);
}
SetYawPitchToBones(new LookAtEyeDirection(leftYaw, pitch));
SetYawPitchToBones(eyeDirection);
}
public void Restore()
@@ -79,13 +52,38 @@ namespace UniVRM10
private void SetYawPitchToBones(LookAtEyeDirection eyeDirection)
{
if (_leftEye != null && _rightEye != null)
float leftYaw, rightYaw;
if (eyeDirection.Yaw < 0)
{
leftYaw = -_horizontalOuter.Map(-eyeDirection.Yaw);
rightYaw = -_horizontalInner.Map(-eyeDirection.Yaw);
}
else
{
rightYaw = _horizontalOuter.Map(eyeDirection.Yaw);
leftYaw = _horizontalInner.Map(eyeDirection.Yaw);
}
float pitch;
if (eyeDirection.Pitch < 0)
{
pitch = _verticalDown.Map(-eyeDirection.Pitch);
}
else
{
pitch = -_verticalUp.Map(eyeDirection.Pitch);
}
if (_leftEye != null)
{
_leftEye.localRotation = _leftEyePreMultiplyRotation *
Quaternion.Euler(-eyeDirection.Pitch, eyeDirection.Yaw, 0) *
Quaternion.Euler(pitch, leftYaw, 0) *
_leftEyePostMultiplyRotation;
}
if (_rightEye != null)
{
_rightEye.localRotation = _rightEyePreMultiplyRotation *
Quaternion.Euler(-eyeDirection.Pitch, eyeDirection.Yaw, 0) *
Quaternion.Euler(pitch, leftYaw, 0) *
_rightEyePostMultiplyRotation;
}
}