[DesktopVRIK] Cleanup

This commit is contained in:
NotAKidoS 2023-09-25 14:26:03 -05:00
parent 497b0b0e7a
commit 32456e0055
5 changed files with 17 additions and 17 deletions

View file

@ -107,13 +107,14 @@ internal class PlayerSetupPatches
try
{
__runOriginal = true;
if (IKManager.Instance == null)
if (IKManager.Instance == null || !IKManager.Instance.IsAvatarInitialized())
return;
CVRMovementParent currentParent = __instance._movementSystem._currentParent;
__runOriginal = (currentParent != null && currentParent._referencePoint != null)
? IKManager.Instance.OnPlayerHandleMovementParent(currentParent)
: IKManager.Instance.OnPlayerTeleported();
if (currentParent != null && currentParent._referencePoint != null)
IKManager.Instance.OnPlayerHandleMovementParent(currentParent);
else
IKManager.Instance.OnPlayerTeleported();
}
catch (Exception e)
{

View file

@ -142,6 +142,7 @@ internal abstract class IKHandler
public virtual void Reset()
{
_ikSimulatedRootAngle = _vrik.transform.eulerAngles.y;
if(ModSettings.EntryResetFootstepsOnIdle.Value)
VRIKUtils.ResetToInitialFootsteps(_vrik, _locomotionData, _scaleDifference);

View file

@ -115,14 +115,10 @@ internal class IKHandlerDesktop : IKHandler
private void ResetSolverIfNeeded()
{
if (_wasTrackingLocomotion == BodySystem.TrackingLocomotionEnabled)
return;
if (_wasTrackingLocomotion == BodySystem.TrackingLocomotionEnabled) return;
_wasTrackingLocomotion = BodySystem.TrackingLocomotionEnabled;
if (ModSettings.EntryResetFootstepsOnIdle.Value)
VRIKUtils.ResetToInitialFootsteps(_vrik, _locomotionData, _scaleDifference);
_solver.Reset();
Reset();
}
#endregion

View file

@ -61,10 +61,7 @@ public class IKManager : MonoBehaviour
private void Update()
{
if (_ikHandler == null)
return;
_ikHandler.UpdateWeights();
_ikHandler?.UpdateWeights();
}
#endregion
@ -214,6 +211,11 @@ public class IKManager : MonoBehaviour
#region Public Methods
public bool IsAvatarInitialized()
{
return _isAvatarInitialized;
}
public Vector3 GetPlayerPosition()
{
if (!MetaPort.Instance.isUsingVr)

View file

@ -1,7 +1,7 @@
{
"_id": 117,
"name": "DesktopVRIK",
"modversion": "4.2.6",
"modversion": "4.2.7",
"gameversion": "2023r172",
"loaderversion": "0.6.1",
"modtype": "Mod",
@ -17,8 +17,8 @@
"requirements": [
"BTKUILib"
],
"downloadlink": "https://github.com/NotAKidOnSteam/NAK_CVR_Mods/releases/download/r21/DesktopVRIK.dll",
"downloadlink": "https://github.com/NotAKidOnSteam/NAK_CVR_Mods/releases/download/r22/DesktopVRIK.dll",
"sourcelink": "https://github.com/NotAKidOnSteam/NAK_CVR_Mods/tree/main/DesktopVRIK/",
"changelog": "- Movement Parent IK handling now respects new orientation mode.\n- Changed avatar initialization patch location to resolve a potential mod conflict.",
"changelog": "- Fixed Prone Thrusting option ignoring set Body Leaning weight.\n- Potential fix for avatars feet randomly targeting far away while stutter-stepping.",
"embedcolor": "#9b59b6"
}