This commit is contained in:
NotAKidoS 2023-04-25 15:04:09 -05:00
parent dc577c3a2f
commit a468487850
24 changed files with 484 additions and 121 deletions

View file

@ -183,6 +183,7 @@ internal class DesktopVRIKSystem : MonoBehaviour
// Last Movement Parent Info
Vector3 _movementPosition;
Quaternion _movementRotation;
CVRMovementParent _currentParent;
DesktopVRIKSystem()
{
@ -377,14 +378,19 @@ internal class DesktopVRIKSystem : MonoBehaviour
// desktop pivots from playerlocal transform
var platformPivot = transform.position;
// Add platform motion to IK solver
avatarIKSolver.AddPlatformMotion(deltaPosition, deltaRotation, platformPivot);
// Prevent targeting other parent position
if (_currentParent == currentParent)
{
// Add platform motion to IK solver
avatarIKSolver.AddPlatformMotion(deltaPosition, deltaRotation, platformPivot);
ResetDesktopVRIK();
}
// Store for next frame
_currentParent = currentParent;
_movementPosition = currentPosition;
_movementRotation = currentRotation;
ResetDesktopVRIK();
return true;
}

View file

@ -1,6 +1,7 @@
using ABI_RC.Core.Player;
using HarmonyLib;
using UnityEngine;
using ABI.CCK.Components;
/**
@ -64,4 +65,4 @@ class PlayerSetupPatches
{
return !(bool)DesktopVRIKSystem.Instance?.OnPlayerSetupResetIk();
}
}
}

View file

@ -26,6 +26,6 @@ using System.Reflection;
namespace NAK.Melons.DesktopVRIK.Properties;
internal static class AssemblyInfoParams
{
public const string Version = "4.1.7";
public const string Version = "4.1.8";
public const string Author = "NotAKidoS";
}

View file

@ -1,7 +1,7 @@
{
"_id": 117,
"name": "DesktopVRIK",
"modversion": "4.1.7",
"modversion": "4.1.8",
"gameversion": "2022r170",
"loaderversion": "0.5.7",
"modtype": "Mod",
@ -17,8 +17,8 @@
"requirements": [
"BTKUILib"
],
"downloadlink": "https://github.com/NotAKidOnSteam/NAK_CVR_Mods/releases/download/r1/DesktopVRIK.dll",
"downloadlink": "https://github.com/NotAKidOnSteam/NAK_CVR_Mods/releases/download/r2/DesktopVRIK.dll",
"sourcelink": "https://github.com/NotAKidOnSteam/NAK_CVR_Mods/",
"changelog": "- Enable useAnimatedBendNormal when Locomotion tracking is disabled. This fixes some sitting animations that bend at unnatural angles.\n- Fix avatar root offset not being reset when entering/playing emotes.",
"changelog": "- Fixed feet targeting previous movement parent position for a frame.",
"embedcolor": "9b59b6"
}