Skip to content

Change vrm1 eyetracking to use SpecifiedTransform instead of SetYawPitch #380

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
PAMEH-2045 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Change vrm1 eyetracking to use SpecifiedTransform instead of SetYawPitch #380

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 16 additions & 15 deletions Assets/MATE ENGINE - Scripts/AvatarHandlers/AvatarMouseTracking.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ void InitEye()
vrmLookAtTarget = new GameObject("VRMLookAtTarget").transform;
vrmLookAtTarget.SetParent(transform, false);
vrm10.LookAtTarget = vrmLookAtTarget;
vrm10.LookAtTargetType = VRM10ObjectLookAt.LookAtTargetTypes.YawPitchValue;
vrm10.LookAtTargetType = VRM10ObjectLookAt.LookAtTargetTypes.SpecifiedTransform;
}
if (!leftEyeBone || !rightEyeBone)
{
Expand Down Expand Up @@ -176,27 +176,28 @@ void DoEye()
{
var mouse = Input.mousePosition;
var world = mainCam.ScreenToWorldPoint(new Vector3(mouse.x, mouse.y, mainCam.nearClipPlane));
if (vrm10 && vrmLookAtTarget)
{
vrmLookAtTarget.position = world;
var par = vrmLookAtTarget.parent ?? transform;
Matrix4x4 mtx = Matrix4x4.TRS(par.position, par.rotation, Vector3.one);
var (rawYaw, rawPitch) = mtx.CalcYawPitch(world);
float yaw = Mathf.Clamp(-rawYaw, -eyeYawLimit, eyeYawLimit);
float pitch = Mathf.Clamp(rawPitch, -eyePitchLimit, eyePitchLimit);
var currFwd = vrmLookAtTarget.forward;
var tgtFwd = Quaternion.Euler(-pitch, yaw, 0f) * Vector3.forward;
var smooth = Vector3.Slerp(currFwd, tgtFwd, Time.deltaTime * eyeSmoothness);
vrmLookAtTarget.rotation = Quaternion.LookRotation(smooth);
return;
}
if (!leftEyeBone || !rightEyeBone || !eyeCenter) return;
eyeCenter.position = (leftEyeBone.position + rightEyeBone.position) * 0.5f;
var dir = (world - eyeCenter.position).normalized;
var localDir = eyeCenter.parent.InverseTransformDirection(dir);
float eyeYaw = Mathf.Clamp(Mathf.Atan2(localDir.x, localDir.z) * Mathf.Rad2Deg, -eyeYawLimit, eyeYawLimit);
float eyePitch = Mathf.Clamp(Mathf.Asin(localDir.y) * Mathf.Rad2Deg, -eyePitchLimit, eyePitchLimit);
var eyeRot = Quaternion.Euler(-eyePitch, eyeYaw, 0f);

if (vrm10 && vrmLookAtTarget)
{
var eyeFwd = (eyeRot * Vector3.forward).normalized;
var worldDirToTarget = eyeCenter.TransformDirection(eyeFwd);

Plane mainCamPlane = new Plane(mainCam.transform.forward, world);
Ray rayToTarget = new Ray(eyeCenter.position, worldDirToTarget);
mainCamPlane.Raycast(rayToTarget, out float enter);
var newTargetPoint = rayToTarget.GetPoint(enter);

vrmLookAtTarget.position = Vector3.Lerp(vrmLookAtTarget.position, newTargetPoint, Time.deltaTime * eyeSmoothness);
return;
}

leftEyeDriver.localRotation = Quaternion.Slerp(leftEyeDriver.localRotation, eyeRot, Time.deltaTime * eyeSmoothness);
rightEyeDriver.localRotation = Quaternion.Slerp(rightEyeDriver.localRotation, eyeRot, Time.deltaTime * eyeSmoothness);
leftEyeBone.localRotation = Quaternion.Slerp(leftEyeBone.localRotation, leftEyeDriver.localRotation, eyeBlend);
Expand Down