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

add faked root angle fix from DesktopVRIK

Browse source
This commit is contained in:
NotAKidoS 2023-04-10 03:01:26 -05:00
parent dc7b9c4860
commit d1abb3b4ef
2 changed files with 37 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

32
IKFixes/HarmonyPatches.cs
View file

@ -11,6 +11,8 @@ namespace NAK.Melons.IKFixes.HarmonyPatches;
internal static class BodySystemPatches
{
static float _ikSimulatedRootAngle = 0f;
[HarmonyPostfix]
[HarmonyPatch(typeof(BodySystem), "SetupOffsets")]
private static void Postfix_BodySystem_SetupOffsets(List<TrackingPoint> trackingPoints)
@ -51,11 +53,6 @@ internal static class BodySystemPatches
{
IKSolverVR solver = IKSystem.vrik.solver;
// Allow avatar to rotate seperatly from Player (Desktop&VR)
// FBT needs avatar root to follow head
// VR default is 25 degrees
solver.spine.maxRootAngle = BodySystem.isCalibratedAsFullBody ? 0f : 25f;
if (BodySystem.TrackingEnabled)
{
IKSystem.vrik.enabled = true;
@ -89,6 +86,31 @@ internal static class BodySystemPatches
SetLegWeight(solver.rightLeg, 0f);
SetPelvisWeight(solver.spine, 0f);
}
if (IKFixesMod.EntryUseFakeRootAngle.Value)
{
// Emulate maxRootAngle because CVR doesn't have the player controller set up ideally for VRIK.
// This is a small small fix, but makes it so the feet dont point in the direction of the head
// when turning. It also means turning with joystick & turning IRL make feet behave the same and follow behind.
float weightedAngleLimit = IKFixesMod.EntryFakeRootAngleLimit.Value * solver.locomotion.weight;
float pivotAngle = MovementSystem.Instance.rotationPivot.eulerAngles.y;
float deltaAngleRoot = Mathf.DeltaAngle(pivotAngle, _ikSimulatedRootAngle);
float absDeltaAngleRoot = Mathf.Abs(deltaAngleRoot);
if (absDeltaAngleRoot > weightedAngleLimit)
{
deltaAngleRoot = Mathf.Sign(deltaAngleRoot) * weightedAngleLimit;
_ikSimulatedRootAngle = Mathf.MoveTowardsAngle(_ikSimulatedRootAngle, pivotAngle, absDeltaAngleRoot - weightedAngleLimit);
}
solver.spine.maxRootAngle = 0f;
solver.spine.rootHeadingOffset = deltaAngleRoot;
}
else
{
// Allow avatar to rotate seperatly from Player (Desktop&VR)
// FBT needs avatar root to follow head
// VR default is 25 degrees
solver.spine.maxRootAngle = BodySystem.isCalibratedAsFullBody ? 0f : 25f;
}
}
int num = 0;

10
IKFixes/Main.cs
View file

@ -4,6 +4,16 @@ namespace NAK.Melons.IKFixes;
public class IKFixesMod : MelonMod
{
internal static MelonLogger.Instance Logger;
public const string SettingsCategory = "IKFixes";
public static readonly MelonPreferences_Category CategoryIKFixes = MelonPreferences.CreateCategory(SettingsCategory);
public static readonly MelonPreferences_Entry<bool> EntryUseFakeRootAngle =
CategoryIKFixes.CreateEntry("Use Fake Root Angle", false, description: "Emulates maxRootAngle. This fixes feet pointing in direction of head when looking around.");
public static readonly MelonPreferences_Entry<float> EntryFakeRootAngleLimit =
CategoryIKFixes.CreateEntry("Fake Root Angle Limit", 25f, description: "Specifies the maximum angle the lower body can have relative to the head when rotating.");
public override void OnInitializeMelon()
{
ApplyPatches(typeof(HarmonyPatches.VRIKPatches));