kneesox/NAK_CVR_Mods
1
0
Fork 0
mirror of https://github.com/NotAKidoS/NAK_CVR_Mods.git synced 2025-09-02 06:19:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

touchups

Browse source
This commit is contained in:
NotAKidoS 2023-03-30 18:02:05 -05:00
parent 34df5c667c
commit 7454efdb2f
1 changed files with 114 additions and 109 deletions
Download patch file Download diff file Expand all files Collapse all files

181
DesktopVRIK/DesktopVRIKSystem.cs
View file

@ -151,34 +151,34 @@ internal class DesktopVRIKSystem : MonoBehaviour
// Calibration Objects // Calibration Objects
HumanPose _humanPose; HumanPose _humanPose;
HumanPose _initialHumanPose; HumanPose _humanPoseInitial;
HumanPoseHandler _humanPoseHandler; HumanPoseHandler _humanPoseHandler;
// Animator Info // Animator Info
int _locomotionLayer = -1; int _animLocomotionLayer = -1;
int _customIKPoseLayer = -1; int _animIKPoseLayer = -1;
bool _requireFixTransforms = false;
// VRIK Calibration Info // VRIK Calibration Info
Vector3 _leftKneeNormal; Vector3 _vrikKneeNormalLeft;
Vector3 _rightKneeNormal; Vector3 _vrikKneeNormalRight;
Vector3 _initialFootStepLeft; Vector3 _vrikInitialFootStepLeft;
Vector3 _initialFootStepRight; Vector3 _vrikInitialFootStepRight;
float _initialFootDistance; float _vrikInitialFootDistance;
float _initialStepThreshold; float _vrikInitialStepThreshold;
float _initialStepHeight; float _vrikInitialStepHeight;
bool _vrikFixTransformsRequired;
// Player Info // Player Info
Transform _cameraTransform = null; Transform _cameraTransform = null;
bool _isEmotePlaying = false; bool _ikEmotePlaying = false;
float _simulatedRootAngle = 0f; float _ikSimulatedRootAngle = 0f;
float _locomotionWeight = 1f; float _locomotionWeight = 1f;
float _locomotionWeightLerp = 1f; float _locomotionWeightLerp = 1f;
float _locomotionLerpSpeed = 10f; float _locomotionLerpSpeed = 10f;
// Last Movement Parent Info // Last Movement Parent Info
Vector3 _previousPosition; Vector3 _movementPosition;
Quaternion _previousRotation; Quaternion _movementRotation;
DesktopVRIKSystem() DesktopVRIKSystem()
{ {
@ -214,29 +214,15 @@ internal class DesktopVRIKSystem : MonoBehaviour
bool isProne = movementSystem.prone; bool isProne = movementSystem.prone;
bool isFlying = movementSystem.flying; bool isFlying = movementSystem.flying;
// Why do it myself if VRIK already does the maths bool shouldTrackLocomotion = !(isMoving || isCrouching || isProne || isFlying || !isGrounded);
Vector3 headLocalPos = avatarTransform.TransformPoint(avatarIKSolver.spine.headPosition);
float upright = 1f + (avatarIKSolver.spine.headHeight - headLocalPos.y);
if (isMoving || isCrouching || isProne || isFlying || !isGrounded) if (shouldTrackLocomotion != BodySystem.TrackingLocomotionEnabled)
{ {
if (BodySystem.TrackingLocomotionEnabled) BodySystem.TrackingLocomotionEnabled = shouldTrackLocomotion;
{
BodySystem.TrackingLocomotionEnabled = false;
avatarIKSolver.Reset(); avatarIKSolver.Reset();
ResetDesktopVRIK(); ResetDesktopVRIK();
} }
} }
else
{
if (!BodySystem.TrackingLocomotionEnabled && upright > 0.8f)
{
BodySystem.TrackingLocomotionEnabled = true;
avatarIKSolver.Reset();
ResetDesktopVRIK();
}
}
}
void LerpLocomotionWeight() void LerpLocomotionWeight()
{ {
@ -297,9 +283,9 @@ internal class DesktopVRIKSystem : MonoBehaviour
VRIKUtils.ApplyScaleToVRIK VRIKUtils.ApplyScaleToVRIK
( (
avatarVRIK, avatarVRIK,
_initialFootDistance, _vrikInitialFootDistance,
_initialStepThreshold, _vrikInitialStepThreshold,
_initialStepHeight, _vrikInitialStepHeight,
scaleDifference scaleDifference
); );
@ -312,9 +298,9 @@ internal class DesktopVRIKSystem : MonoBehaviour
{ {
if (avatarVRIK == null) return; if (avatarVRIK == null) return;
if (isEmotePlaying == _isEmotePlaying) return; if (isEmotePlaying == _ikEmotePlaying) return;
_isEmotePlaying = isEmotePlaying; _ikEmotePlaying = isEmotePlaying;
if (avatarLookAtIK != null) if (avatarLookAtIK != null)
avatarLookAtIK.enabled = !isEmotePlaying; avatarLookAtIK.enabled = !isEmotePlaying;
@ -329,26 +315,27 @@ internal class DesktopVRIKSystem : MonoBehaviour
{ {
if (avatarVRIK == null) return false; if (avatarVRIK == null) return false;
// Check if PlayerSetup.ResetIk() was called for movement parent
CVRMovementParent currentParent = movementSystem._currentParent; CVRMovementParent currentParent = movementSystem._currentParent;
if (currentParent == null) return false; if (currentParent == null || currentParent._referencePoint == null) return false;
Transform referencePoint = currentParent._referencePoint; // Get current position
if (referencePoint == null) return false; var currentPosition = currentParent._referencePoint.position;
var currentRotation = Quaternion.Euler(0f, currentParent.transform.rotation.eulerAngles.y, 0f);
var currentPosition = referencePoint.position; // Convert to delta position (how much changed since last frame)
var currentRotation = currentParent.transform.rotation; var deltaPosition = currentPosition - _movementPosition;
var deltaRotation = Quaternion.Inverse(_movementRotation) * currentRotation;
// Keep only the Y-axis rotation
currentRotation = Quaternion.Euler(0f, currentRotation.eulerAngles.y, 0f);
var deltaPosition = currentPosition - _previousPosition;
var deltaRotation = Quaternion.Inverse(_previousRotation) * currentRotation;
// desktop pivots from playerlocal transform
var platformPivot = transform.position; var platformPivot = transform.position;
// Add platform motion to IK solver
avatarIKSolver.AddPlatformMotion(deltaPosition, deltaRotation, platformPivot); avatarIKSolver.AddPlatformMotion(deltaPosition, deltaRotation, platformPivot);
_previousPosition = currentPosition; // Store for next frame
_previousRotation = currentRotation; _movementPosition = currentPosition;
_movementRotation = currentRotation;
ResetDesktopVRIK(); ResetDesktopVRIK();
return true; return true;
@ -360,20 +347,31 @@ internal class DesktopVRIKSystem : MonoBehaviour
avatarTransform.localPosition = Vector3.zero; avatarTransform.localPosition = Vector3.zero;
avatarTransform.localRotation = Quaternion.identity; avatarTransform.localRotation = Quaternion.identity;
if (_isEmotePlaying) return; // Don't run during emotes
if (_ikEmotePlaying) return;
// Constantly reset footsteps until fully idle
if (_locomotionWeightLerp < 0.99f)
{
ResetFootsteps();
}
// Set plant feet // Set plant feet
avatarIKSolver.plantFeet = Setting_PlantFeet; avatarIKSolver.plantFeet = Setting_PlantFeet;
// Emulate old VRChat hip movementSystem // Apply custom VRIK solving effects
if (Setting_BodyLeanWeight > 0) if (_locomotionWeightLerp > 0)
{ {
IKBodyLeaningOffset();
IKBodyHeadingOffset();
}
// Reset footsteps while transitioning
if (_locomotionWeightLerp < 0.99f)
{
IKResetFootsteps();
}
}
void IKBodyLeaningOffset()
{
// Emulate old VRChat hip movement
if (Setting_BodyLeanWeight <= 0) return;
float weightedAngle = Setting_BodyLeanWeight * _locomotionWeightLerp; float weightedAngle = Setting_BodyLeanWeight * _locomotionWeightLerp;
float angle = _cameraTransform.localEulerAngles.x; float angle = _cameraTransform.localEulerAngles.x;
angle = angle > 180 ? angle - 360 : angle; angle = angle > 180 ? angle - 360 : angle;
@ -381,48 +379,55 @@ internal class DesktopVRIKSystem : MonoBehaviour
avatarIKSolver.spine.headRotationOffset *= rotation; avatarIKSolver.spine.headRotationOffset *= rotation;
} }
// Make root heading follow within a set limit void IKBodyHeadingOffset()
if (Setting_BodyHeadingLimit > 0)
{ {
// Make root heading follow within a set limit
if (Setting_BodyHeadingLimit <= 0) return;
float weightedAngleLimit = Setting_BodyHeadingLimit * _locomotionWeightLerp; float weightedAngleLimit = Setting_BodyHeadingLimit * _locomotionWeightLerp;
float deltaAngleRoot = Mathf.DeltaAngle(transform.eulerAngles.y, _simulatedRootAngle); float deltaAngleRoot = Mathf.DeltaAngle(transform.eulerAngles.y, _ikSimulatedRootAngle);
float absDeltaAngleRoot = Mathf.Abs(deltaAngleRoot); float absDeltaAngleRoot = Mathf.Abs(deltaAngleRoot);
if (absDeltaAngleRoot > weightedAngleLimit) if (absDeltaAngleRoot > weightedAngleLimit)
{ {
deltaAngleRoot = Mathf.Sign(deltaAngleRoot) * weightedAngleLimit; deltaAngleRoot = Mathf.Sign(deltaAngleRoot) * weightedAngleLimit;
_simulatedRootAngle = Mathf.MoveTowardsAngle(_simulatedRootAngle, transform.eulerAngles.y, absDeltaAngleRoot - weightedAngleLimit); _ikSimulatedRootAngle = Mathf.MoveTowardsAngle(_ikSimulatedRootAngle, transform.eulerAngles.y, absDeltaAngleRoot - weightedAngleLimit);
} }
avatarIKSolver.spine.rootHeadingOffset = deltaAngleRoot; avatarIKSolver.spine.rootHeadingOffset = deltaAngleRoot;
if (Setting_PelvisHeadingWeight > 0) if (Setting_PelvisHeadingWeight > 0)
{ {
avatarIKSolver.spine.pelvisRotationOffset *= Quaternion.Euler(0f, deltaAngleRoot * Setting_PelvisHeadingWeight, 0f); avatarIKSolver.spine.pelvisRotationOffset *= Quaternion.Euler(0f, deltaAngleRoot * Setting_PelvisHeadingWeight, 0f);
avatarIKSolver.spine.chestRotationOffset *= Quaternion.Euler(0f, -deltaAngleRoot * Setting_PelvisHeadingWeight, 0f); avatarIKSolver.spine.chestRotationOffset *= Quaternion.Euler(0f, -deltaAngleRoot * Setting_PelvisHeadingWeight, 0f);
} }
if (Setting_ChestHeadingWeight > 0) if (Setting_ChestHeadingWeight > 0)
{ {
avatarIKSolver.spine.chestRotationOffset *= Quaternion.Euler(0f, deltaAngleRoot * Setting_ChestHeadingWeight, 0f); avatarIKSolver.spine.chestRotationOffset *= Quaternion.Euler(0f, deltaAngleRoot * Setting_ChestHeadingWeight, 0f);
} }
} }
}
void ResetDesktopVRIK() void IKResetFootsteps()
{
_simulatedRootAngle = transform.eulerAngles.y;
}
void ResetFootsteps()
{ {
// Attempt to skip footstep transition
if (!Setting_ResetFootsteps) return; if (!Setting_ResetFootsteps) return;
IKSolverVR.Footstep footstepLeft = avatarIKSolver.locomotion.footsteps[0]; IKSolverVR.Footstep footstepLeft = avatarIKSolver.locomotion.footsteps[0];
IKSolverVR.Footstep footstepRight = avatarIKSolver.locomotion.footsteps[1]; IKSolverVR.Footstep footstepRight = avatarIKSolver.locomotion.footsteps[1];
Vector3 globalLeft = movementSystem.transform.TransformPoint(_initialFootStepLeft); Vector3 globalLeft = movementSystem.transform.TransformPoint(_vrikInitialFootStepLeft);
Vector3 globalRight = movementSystem.transform.TransformPoint(_initialFootStepRight); Vector3 globalRight = movementSystem.transform.TransformPoint(_vrikInitialFootStepRight);
footstepLeft.Reset(avatarTransform.rotation, globalLeft, footstepLeft.stepToRot); footstepLeft.Reset(avatarTransform.rotation, globalLeft, footstepLeft.stepToRot);
footstepRight.Reset(avatarTransform.rotation, globalRight, footstepRight.stepToRot); footstepRight.Reset(avatarTransform.rotation, globalRight, footstepRight.stepToRot);
//footstepRight.StepTo(globalRight, avatarTransform.rotation, 100f); //footstepRight.StepTo(globalRight, avatarTransform.rotation, 100f);
//footstepLeft.StepTo(globalLeft, avatarTransform.rotation, 100f); //footstepLeft.StepTo(globalLeft, avatarTransform.rotation, 100f);
} }
void ResetDesktopVRIK()
{
_ikSimulatedRootAngle = transform.eulerAngles.y;
}
void CalibrateDesktopVRIK() void CalibrateDesktopVRIK()
{ {
ScanAvatar(); ScanAvatar();
@ -440,8 +445,8 @@ internal class DesktopVRIKSystem : MonoBehaviour
avatarLookAtIK = playerSetup.lookIK; avatarLookAtIK = playerSetup.lookIK;
// Get animator layer inticies // Get animator layer inticies
_locomotionLayer = avatarAnimator.GetLayerIndex("IKPose"); _animIKPoseLayer = avatarAnimator.GetLayerIndex("IKPose");
_customIKPoseLayer = avatarAnimator.GetLayerIndex("Locomotion/Emotes"); _animLocomotionLayer = avatarAnimator.GetLayerIndex("Locomotion/Emotes");
// Dispose and create new _humanPoseHandler // Dispose and create new _humanPoseHandler
_humanPoseHandler?.Dispose(); _humanPoseHandler?.Dispose();
@ -449,10 +454,10 @@ internal class DesktopVRIKSystem : MonoBehaviour
// Get initial human poses // Get initial human poses
_humanPoseHandler.GetHumanPose(ref _humanPose); _humanPoseHandler.GetHumanPose(ref _humanPose);
_humanPoseHandler.GetHumanPose(ref _initialHumanPose); _humanPoseHandler.GetHumanPose(ref _humanPoseInitial);
// Dumb fix for rare upload issue // Dumb fix for rare upload issue
_requireFixTransforms = !avatarAnimator.enabled; _vrikFixTransformsRequired = !avatarAnimator.enabled;
// Find available HumanoidBodyBones // Find available HumanoidBodyBones
BoneExists.Clear(); BoneExists.Clear();
@ -475,7 +480,7 @@ internal class DesktopVRIKSystem : MonoBehaviour
VRIKUtils.ConfigureVRIKReferences(avatarVRIK, Setting_UseVRIKToes, Setting_FindUnmappedToes, out bool foundUnmappedToes); VRIKUtils.ConfigureVRIKReferences(avatarVRIK, Setting_UseVRIKToes, Setting_FindUnmappedToes, out bool foundUnmappedToes);
// Fix animator issue or non-human mapped toes // Fix animator issue or non-human mapped toes
avatarVRIK.fixTransforms = _requireFixTransforms || foundUnmappedToes; avatarVRIK.fixTransforms = _vrikFixTransformsRequired || foundUnmappedToes;
// Default solver settings // Default solver settings
avatarIKSolver.locomotion.weight = 0f; avatarIKSolver.locomotion.weight = 0f;
@ -529,15 +534,15 @@ internal class DesktopVRIKSystem : MonoBehaviour
SetAvatarPose(AvatarPose.Default); SetAvatarPose(AvatarPose.Default);
// Calculate bend normals with motorcycle pose // Calculate bend normals with motorcycle pose
VRIKUtils.CalculateKneeBendNormals(avatarVRIK, out _leftKneeNormal, out _rightKneeNormal); VRIKUtils.CalculateKneeBendNormals(avatarVRIK, out _vrikKneeNormalLeft, out _vrikKneeNormalRight);
SetAvatarPose(AvatarPose.IKPose); SetAvatarPose(AvatarPose.IKPose);
// Calculate initial IK scaling values with IKPose // Calculate initial IK scaling values with IKPose
VRIKUtils.CalculateInitialIKScaling(avatarVRIK, out _initialFootDistance, out _initialStepThreshold, out _initialStepHeight); VRIKUtils.CalculateInitialIKScaling(avatarVRIK, out _vrikInitialFootDistance, out _vrikInitialStepThreshold, out _vrikInitialStepHeight);
// Calculate initial Footstep positions // Calculate initial Footstep positions
VRIKUtils.CalculateInitialFootsteps(avatarVRIK, out _initialFootStepLeft, out _initialFootStepRight); VRIKUtils.CalculateInitialFootsteps(avatarVRIK, out _vrikInitialFootStepLeft, out _vrikInitialFootStepRight);
// Setup HeadIKTarget // Setup HeadIKTarget
VRIKUtils.SetupHeadIKTarget(avatarVRIK); VRIKUtils.SetupHeadIKTarget(avatarVRIK);
@ -553,12 +558,12 @@ internal class DesktopVRIKSystem : MonoBehaviour
VRIKUtils.ApplyScaleToVRIK VRIKUtils.ApplyScaleToVRIK
( (
avatarVRIK, avatarVRIK,
_initialFootDistance, _vrikInitialFootDistance,
_initialStepThreshold, _vrikInitialStepThreshold,
_initialStepHeight, _vrikInitialStepHeight,
1f 1f
); );
VRIKUtils.ApplyKneeBendNormals(avatarVRIK, _leftKneeNormal, _rightKneeNormal); VRIKUtils.ApplyKneeBendNormals(avatarVRIK, _vrikKneeNormalLeft, _vrikKneeNormalRight);
avatarVRIK.onPreSolverUpdate.AddListener(new UnityAction(DesktopVRIKSystem.Instance.OnPreSolverUpdate)); avatarVRIK.onPreSolverUpdate.AddListener(new UnityAction(DesktopVRIKSystem.Instance.OnPreSolverUpdate));
} }
@ -575,7 +580,7 @@ internal class DesktopVRIKSystem : MonoBehaviour
SetMusclesToValue(0f); SetMusclesToValue(0f);
break; break;
case AvatarPose.Initial: case AvatarPose.Initial:
_humanPoseHandler.SetHumanPose(ref _initialHumanPose); _humanPoseHandler.SetHumanPose(ref _humanPoseInitial);
break; break;
case AvatarPose.IKPose: case AvatarPose.IKPose:
if (HasCustomIKPose()) if (HasCustomIKPose())
@ -595,13 +600,13 @@ internal class DesktopVRIKSystem : MonoBehaviour
bool HasCustomIKPose() bool HasCustomIKPose()
{ {
return _locomotionLayer != -1 && _customIKPoseLayer != -1; return _animLocomotionLayer != -1 && _animIKPoseLayer != -1;
} }
void SetCustomLayersWeights(float customIKPoseLayerWeight, float locomotionLayerWeight) void SetCustomLayersWeights(float customIKPoseLayerWeight, float locomotionLayerWeight)
{ {
avatarAnimator.SetLayerWeight(_customIKPoseLayer, customIKPoseLayerWeight); avatarAnimator.SetLayerWeight(_animIKPoseLayer, customIKPoseLayerWeight);
avatarAnimator.SetLayerWeight(_locomotionLayer, locomotionLayerWeight); avatarAnimator.SetLayerWeight(_animLocomotionLayer, locomotionLayerWeight);
avatarAnimator.Update(0f); avatarAnimator.Update(0f);
} }