[AlternateIKSystem] Unfuck halfbody support.

This commit is contained in:
NotAKidoS 2023-07-14 02:02:55 -05:00
parent 69b84775ec
commit 4061b815df
2 changed files with 6 additions and 2 deletions

View file

@ -177,7 +177,7 @@ internal static class IKCalibrator
vrik.solver.spine.positionWeight = 1f; vrik.solver.spine.positionWeight = 1f;
vrik.solver.spine.rotationWeight = 1f; vrik.solver.spine.rotationWeight = 1f;
vrik.solver.spine.maxRootAngle = 0f; vrik.solver.spine.maxRootAngle = 25f;
vrik.solver.plantFeet = false; vrik.solver.plantFeet = false;
} }

View file

@ -32,6 +32,7 @@ public class IKManager : MonoBehaviour
// Player Info // Player Info
internal Transform _desktopCamera; internal Transform _desktopCamera;
internal Transform _vrCamera; internal Transform _vrCamera;
internal Transform _vrHeadTarget;
// Controller Info // Controller Info
private Transform _leftController; private Transform _leftController;
@ -75,6 +76,7 @@ public class IKManager : MonoBehaviour
_desktopCamera = PlayerSetup.Instance.desktopCamera.transform; _desktopCamera = PlayerSetup.Instance.desktopCamera.transform;
_vrCamera = PlayerSetup.Instance.vrCamera.transform; _vrCamera = PlayerSetup.Instance.vrCamera.transform;
_vrHeadTarget = PlayerSetup.Instance.vrHeadTracker.transform;
_leftController = PlayerSetup.Instance.vrLeftHandTracker.transform; _leftController = PlayerSetup.Instance.vrLeftHandTracker.transform;
_rightController = PlayerSetup.Instance.vrRightHandTracker.transform; _rightController = PlayerSetup.Instance.vrRightHandTracker.transform;
@ -221,7 +223,7 @@ public class IKManager : MonoBehaviour
IKCalibrator.ConfigureHalfBodyVrIk(_vrik); IKCalibrator.ConfigureHalfBodyVrIk(_vrik);
_ikHandler = new IKHandlerHalfBody(_vrik); _ikHandler = new IKHandlerHalfBody(_vrik);
IKCalibrator.SetupHeadIKTarget(_vrik, _vrCamera); IKCalibrator.SetupHeadIKTarget(_vrik, _vrHeadTarget);
IKCalibrator.SetupHandIKTarget(_vrik, _leftHandTarget, _leftHandRotations, true); IKCalibrator.SetupHandIKTarget(_vrik, _leftHandTarget, _leftHandRotations, true);
IKCalibrator.SetupHandIKTarget(_vrik, _rightHandTarget, _rightHandRotations, false); IKCalibrator.SetupHandIKTarget(_vrik, _rightHandTarget, _rightHandRotations, false);
@ -240,6 +242,8 @@ public class IKManager : MonoBehaviour
{ {
SetAvatarPose(AvatarPose.Default); SetAvatarPose(AvatarPose.Default);
_vrik = IKCalibrator.SetupVrIk(_animator); _vrik = IKCalibrator.SetupVrIk(_animator);
_vrik.transform.position = GetPlayerPosition();
_vrik.transform.rotation = GetPlayerRotation();
} }
private void InitializeIkGeneral() private void InitializeIkGeneral()