From 25c4eaad51f1682bf1db5f9f7863171c11f49287 Mon Sep 17 00:00:00 2001 From: SDraw Date: Sat, 3 Dec 2022 19:12:35 +0300 Subject: [PATCH] Build 2022r170ex3 code changes --- README.md | 6 +- ml_amt/MotionTweaker.cs | 44 +++---- ml_amt/Properties/AssemblyInfo.cs | 6 +- ml_amt/Utils.cs | 4 + ml_amt/ml_amt.csproj | 2 +- ml_amt/ml_amt.csproj.user | 2 +- ml_fpt/README.md | 1 + ml_lme/GestureMatcher.cs | 65 +++-------- ml_lme/LeapTracked.cs | 188 +++++++++++++++++++++--------- ml_lme/Main.cs | 37 +++--- ml_lme/Properties/AssemblyInfo.cs | 6 +- ml_lme/Utils.cs | 4 +- ml_lme/ml_lme.csproj | 2 +- ml_lme/ml_lme.csproj.user | 2 +- 14 files changed, 202 insertions(+), 167 deletions(-) diff --git a/README.md b/README.md index ddac16e..8be421b 100644 --- a/README.md +++ b/README.md @@ -4,9 +4,9 @@ Merged set of MelonLoader mods for ChilloutVR. | Full name | Short name | Latest version | Available in [CVRMA](https://github.com/knah/CVRMelonAssistant) | Current Status | Notes | |-----------|------------|----------------|-----------------------------------------------------------------|----------------|-------| | Avatar Change Info | ml_aci | 1.0.3 | Yes | Working | -| Avatar Motion Tweaker | ml_amt | 1.1.8 | Yes | Working | +| Avatar Motion Tweaker | ml_amt | 1.1.9-experimental | Yes | Working | | Desktop Head Tracking | ml_dht | 1.1.1 | Yes, pending update | Working | | Desktop Reticle Switch | ml_drs | 1.0.0 | Yes | Working | -| Four Point Tracking | ml_fpt | 1.0.9 | Yes | Working | -| Leap Motion Extension | ml_lme | 1.2.7 | Yes | Working | +| Four Point Tracking | ml_fpt | 1.0.9 | Yes | Deprecated | In-game feature | +| Leap Motion Extension | ml_lme | 1.2.8-experimental | Yes | Working | | Server Connection Info | ml_sci | 1.0.2 | Yes | Working | diff --git a/ml_amt/MotionTweaker.cs b/ml_amt/MotionTweaker.cs index 45ac987..2afdce3 100644 --- a/ml_amt/MotionTweaker.cs +++ b/ml_amt/MotionTweaker.cs @@ -51,6 +51,8 @@ namespace ml_amt float m_locomotionWeight = 1f; // Original weight float m_avatarScale = 1f; // Instantiated scale Transform m_avatarHips = null; + float m_viewPointHeight = 1f; + bool m_isInVR = false; bool m_avatarReady = false; bool m_compatibleAvatar = false; @@ -91,6 +93,8 @@ namespace ml_amt void Start() { + m_isInVR = Utils.IsInVR(); + Settings.IKOverrideCrouchChange += this.SetIKOverrideCrouch; Settings.CrouchLimitChange += this.SetCrouchLimit; Settings.IKOverrideProneChange += this.SetIKOverrideProne; @@ -126,10 +130,10 @@ namespace ml_amt m_moving = !Mathf.Approximately(MovementSystem.Instance.movementVector.magnitude, 0f); // Update upright - Matrix4x4 l_hmdMatrix = PlayerSetup.Instance.transform.GetMatrix().inverse * (PlayerSetup.Instance._inVr ? PlayerSetup.Instance.vrHeadTracker.transform.GetMatrix() : PlayerSetup.Instance.desktopCameraRig.transform.GetMatrix()); + Matrix4x4 l_hmdMatrix = PlayerSetup.Instance.transform.GetMatrix().inverse * (m_isInVR ? PlayerSetup.Instance.vrHeadTracker.transform.GetMatrix() : PlayerSetup.Instance.desktopCameraRig.transform.GetMatrix()); float l_currentHeight = Mathf.Clamp((l_hmdMatrix * ms_pointVector).y, 0f, float.MaxValue); float l_avatarScale = (m_avatarScale > 0f) ? (PlayerSetup.Instance._avatar.transform.localScale.y / m_avatarScale) : 0f; - float l_avatarViewHeight = Mathf.Clamp(PlayerSetup.Instance.GetViewPointHeight() * l_avatarScale, 0f, float.MaxValue); + float l_avatarViewHeight = Mathf.Clamp(m_viewPointHeight * l_avatarScale, 0f, float.MaxValue); m_upright = Mathf.Clamp(((l_avatarViewHeight > 0f) ? (l_currentHeight / l_avatarViewHeight) : 0f), 0f, 1f); PoseState l_poseState = (m_upright <= m_proneLimit) ? PoseState.Proning : ((m_upright <= m_crouchLimit) ? PoseState.Crouching : PoseState.Standing); @@ -139,7 +143,7 @@ namespace ml_amt m_hipsToPlayer.Set(l_hipsToPlayer.x, 0f, l_hipsToPlayer.z); } - if(PlayerSetup.Instance._inVr && (m_vrIk != null) && m_vrIk.enabled) + if(m_isInVR && (m_vrIk != null) && m_vrIk.enabled) { if(m_poseState != l_poseState) { @@ -164,8 +168,8 @@ namespace ml_amt if(m_poseTransitions) { - PlayerSetup.Instance.animatorManager.SetAnimatorParameterBool("Crouching", (l_poseState == PoseState.Crouching) && !m_compatibleAvatar && !PlayerSetup.Instance.fullBodyActive); - PlayerSetup.Instance.animatorManager.SetAnimatorParameterBool("Prone", (l_poseState == PoseState.Proning) && !m_compatibleAvatar && !PlayerSetup.Instance.fullBodyActive); + PlayerSetup.Instance.animatorManager.SetAnimatorParameterBool("Crouching", (l_poseState == PoseState.Crouching) && !m_compatibleAvatar && !Utils.IsInFullbody()); + PlayerSetup.Instance.animatorManager.SetAnimatorParameterBool("Prone", (l_poseState == PoseState.Proning) && !m_compatibleAvatar && !Utils.IsInFullbody()); } } @@ -249,6 +253,7 @@ namespace ml_amt m_moving = false; m_hipsToPlayer = Vector3.zero; m_avatarHips = null; + m_viewPointHeight = 1f; m_parameters.Clear(); } @@ -257,6 +262,7 @@ namespace ml_amt m_vrIk = PlayerSetup.Instance._avatar.GetComponent(); m_locomotionLayer = PlayerSetup.Instance._animator.GetLayerIndex("Locomotion/Emotes"); m_avatarHips = PlayerSetup.Instance._animator.GetBoneTransform(HumanBodyBones.Hips); + m_viewPointHeight = PlayerSetup.Instance._avatar.GetComponent().viewPosition.y; // Parse animator parameters AnimatorControllerParameter[] l_params = PlayerSetup.Instance._animator.parameters; @@ -321,22 +327,18 @@ namespace ml_amt if(m_detectEmotes && m_emoteActive) m_vrIk.solver.IKPositionWeight = 0f; - // Game manages VRIK for desktop itself - if(PlayerSetup.Instance._inVr) + // Game doesn't manages VRIK for desktop itself anymore + if((m_ikOverrideCrouch && (m_poseState != PoseState.Standing)) || (m_ikOverrideProne && (m_poseState == PoseState.Proning))) { - if((m_ikOverrideCrouch && (m_poseState != PoseState.Standing)) || (m_ikOverrideProne && (m_poseState == PoseState.Proning))) - { - m_vrIk.solver.locomotion.weight = 0f; - l_legsOverride = true; - } - if(m_ikOverrideFly && MovementSystem.Instance.flying) - { - m_vrIk.solver.locomotion.weight = 0f; - l_legsOverride = true; - } + m_vrIk.solver.locomotion.weight = 0f; + l_legsOverride = true; + } + if(m_ikOverrideFly && MovementSystem.Instance.flying) + { + m_vrIk.solver.locomotion.weight = 0f; + l_legsOverride = true; } - // But not this if(m_ikOverrideJump && !m_grounded && !MovementSystem.Instance.flying) { m_vrIk.solver.locomotion.weight = 0f; @@ -345,7 +347,7 @@ namespace ml_amt bool l_solverActive = !Mathf.Approximately(m_vrIk.solver.IKPositionWeight, 0f); - if(l_legsOverride && l_solverActive && m_followHips && !m_moving && PlayerSetup.Instance._inVr) + if(l_legsOverride && l_solverActive && m_followHips && (!m_moving || m_poseState == PoseState.Proning) && m_isInVR) PlayerSetup.Instance._avatar.transform.localPosition = m_hipsToPlayer; } @@ -377,7 +379,7 @@ namespace ml_amt { m_poseTransitions = p_state; - if(!m_poseTransitions && m_avatarReady && PlayerSetup.Instance._inVr) + if(!m_poseTransitions && m_avatarReady && m_isInVR) { PlayerSetup.Instance.animatorManager.SetAnimatorParameterBool("Crouching", false); PlayerSetup.Instance.animatorManager.SetAnimatorParameterBool("Prone", false); @@ -387,7 +389,7 @@ namespace ml_amt { m_adjustedMovement = p_state; - if(!m_adjustedMovement && m_avatarReady && PlayerSetup.Instance._inVr) + if(!m_adjustedMovement && m_avatarReady && m_isInVR) { MovementSystem.Instance.ChangeCrouch(false); MovementSystem.Instance.ChangeProne(false); diff --git a/ml_amt/Properties/AssemblyInfo.cs b/ml_amt/Properties/AssemblyInfo.cs index a157c8d..8d2d09b 100644 --- a/ml_amt/Properties/AssemblyInfo.cs +++ b/ml_amt/Properties/AssemblyInfo.cs @@ -1,10 +1,10 @@ using System.Reflection; [assembly: AssemblyTitle("AvatarMotionTweaker")] -[assembly: AssemblyVersion("1.1.8")] -[assembly: AssemblyFileVersion("1.1.8")] +[assembly: AssemblyVersion("1.1.9")] +[assembly: AssemblyFileVersion("1.1.9")] -[assembly: MelonLoader.MelonInfo(typeof(ml_amt.AvatarMotionTweaker), "AvatarMotionTweaker", "1.1.8", "SDraw", "https://github.com/SDraw/ml_mods_cvr")] +[assembly: MelonLoader.MelonInfo(typeof(ml_amt.AvatarMotionTweaker), "AvatarMotionTweaker", "1.1.9-experimental", "SDraw", "https://github.com/SDraw/ml_mods_cvr")] [assembly: MelonLoader.MelonGame(null, "ChilloutVR")] [assembly: MelonLoader.MelonPlatform(MelonLoader.MelonPlatformAttribute.CompatiblePlatforms.WINDOWS_X64)] [assembly: MelonLoader.MelonPlatformDomain(MelonLoader.MelonPlatformDomainAttribute.CompatibleDomains.MONO)] \ No newline at end of file diff --git a/ml_amt/Utils.cs b/ml_amt/Utils.cs index 1a82c71..58ec538 100644 --- a/ml_amt/Utils.cs +++ b/ml_amt/Utils.cs @@ -1,9 +1,13 @@ using UnityEngine; +using ABI_RC.Systems.IK; namespace ml_amt { static class Utils { + public static bool IsInVR() => ((ABI_RC.Core.Savior.CheckVR.Instance != null) && ABI_RC.Core.Savior.CheckVR.Instance.hasVrDeviceLoaded); + public static bool IsInFullbody() => ((IKSystem.Instance != null) && IKSystem.Instance.BodySystem.FBTAvailable()); + // Extensions public static Matrix4x4 GetMatrix(this Transform p_transform, bool p_pos = true, bool p_rot = true, bool p_scl = false) { diff --git a/ml_amt/ml_amt.csproj b/ml_amt/ml_amt.csproj index 777a58a..7d2798e 100644 --- a/ml_amt/ml_amt.csproj +++ b/ml_amt/ml_amt.csproj @@ -82,6 +82,6 @@ - copy /y "$(TargetPath)" "C:\Games\Steam\common\ChilloutVR\Mods\" + copy /y "$(TargetPath)" "D:\Games\Steam\steamapps\common\ChilloutVR\Mods\" \ No newline at end of file diff --git a/ml_amt/ml_amt.csproj.user b/ml_amt/ml_amt.csproj.user index 2539084..04df561 100644 --- a/ml_amt/ml_amt.csproj.user +++ b/ml_amt/ml_amt.csproj.user @@ -1,6 +1,6 @@  - C:\Games\Steam\common\ChilloutVR\MelonLoader\;C:\Games\Steam\common\ChilloutVR\ChilloutVR_Data\Managed\ + D:\Games\Steam\steamapps\common\ChilloutVR\MelonLoader\;D:\Games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\ \ No newline at end of file diff --git a/ml_fpt/README.md b/ml_fpt/README.md index c0df127..8eaeeb7 100644 --- a/ml_fpt/README.md +++ b/ml_fpt/README.md @@ -13,5 +13,6 @@ This mod adds ability to use 4-point tracking. * Press trigger on both controllers # Notes +* Will be deprecated soon * Calibration is saved per avatar for game session. * AAS parameters are restored after calibration. diff --git a/ml_lme/GestureMatcher.cs b/ml_lme/GestureMatcher.cs index 75bcdb7..dbaa640 100644 --- a/ml_lme/GestureMatcher.cs +++ b/ml_lme/GestureMatcher.cs @@ -7,11 +7,11 @@ namespace ml_lme readonly static Vector2[] ms_fingerLimits = { - new Vector2(0f, 15f), - new Vector2(-20f, 20f), - new Vector2(-50f, 50f), - new Vector2(-7.5f, 7.5f), - new Vector2(-20f, 20f) + new Vector2(-50f, 0f), + new Vector2(-20f, 30f), + new Vector2(-15f, 15f), + new Vector2(-10f, 20f), + new Vector2(-10f, 25f) }; public class GesturesData @@ -156,57 +156,18 @@ namespace ml_lme l_angle -= 360f; // Pain - switch(l_finger.Type) - { - case Leap.Finger.FingerType.TYPE_THUMB: - { - if(p_hand.IsRight) - l_angle *= -1f; - l_angle += ms_fingerLimits[(int)Leap.Finger.FingerType.TYPE_INDEX].y * 2f; - l_angle *= 0.5f; - } - break; + if(p_hand.IsRight) + l_angle *= -1f; - case Leap.Finger.FingerType.TYPE_INDEX: - { - if(p_hand.IsLeft) - l_angle *= -1f; - l_angle += ms_fingerLimits[(int)Leap.Finger.FingerType.TYPE_INDEX].y; - l_angle *= 0.5f; - } - break; - - case Leap.Finger.FingerType.TYPE_MIDDLE: - { - l_angle += (ms_fingerLimits[(int)Leap.Finger.FingerType.TYPE_MIDDLE].y * (p_hand.IsRight ? 0.125f : -0.125f)); - l_angle *= (p_hand.IsLeft ? -4f : 4f); - } - break; - - case Leap.Finger.FingerType.TYPE_RING: - { - if(p_hand.IsRight) - l_angle *= -1f; - l_angle += ms_fingerLimits[(int)Leap.Finger.FingerType.TYPE_RING].y; - l_angle *= 0.5f; - } - break; - - case Leap.Finger.FingerType.TYPE_PINKY: - { - l_angle += (p_hand.IsRight ? ms_fingerLimits[(int)Leap.Finger.FingerType.TYPE_PINKY].x : ms_fingerLimits[(int)Leap.Finger.FingerType.TYPE_PINKY].y); - l_angle *= (p_hand.IsRight ? -0.5f : 0.5f); - } - break; - - } - - p_spreads[(int)l_finger.Type] = Mathf.InverseLerp(ms_fingerLimits[(int)l_finger.Type].x, ms_fingerLimits[(int)l_finger.Type].y, l_angle); if(l_finger.Type != Leap.Finger.FingerType.TYPE_THUMB) { - p_spreads[(int)l_finger.Type] *= 2f; - p_spreads[(int)l_finger.Type] -= 1f; + if(l_angle < 0f) + p_spreads[(int)l_finger.Type] = 0.5f * Mathf.InverseLerp(ms_fingerLimits[(int)l_finger.Type].x, 0f, l_angle); + else + p_spreads[(int)l_finger.Type] = 0.5f + 0.5f * Mathf.InverseLerp(0f, ms_fingerLimits[(int)l_finger.Type].y, l_angle); } + else + p_spreads[(int)l_finger.Type] = Mathf.InverseLerp(ms_fingerLimits[(int)l_finger.Type].x, ms_fingerLimits[(int)l_finger.Type].y, l_angle); } } } diff --git a/ml_lme/LeapTracked.cs b/ml_lme/LeapTracked.cs index 174cce7..de5be73 100644 --- a/ml_lme/LeapTracked.cs +++ b/ml_lme/LeapTracked.cs @@ -11,6 +11,7 @@ namespace ml_lme class LeapTracked : MonoBehaviour { static readonly float[] ms_tposeMuscles = typeof(ABI_RC.Systems.IK.SubSystems.BodySystem).GetField("TPoseMuscles", BindingFlags.Static | BindingFlags.NonPublic).GetValue(null) as float[]; + static readonly FieldInfo ms_ikSystemPoseHandler = typeof(IKSystem).GetField("_poseHandler", BindingFlags.Instance | BindingFlags.NonPublic); static readonly FieldInfo ms_indexGestureToggle = typeof(InputModuleSteamVR).GetField("_steamVrIndexGestureToggleValue", BindingFlags.Instance | BindingFlags.NonPublic); static readonly Quaternion ms_offsetLeft = Quaternion.Euler(0f, 0f, 270f); static readonly Quaternion ms_offsetRight = Quaternion.Euler(0f, 0f, 90f); @@ -18,9 +19,9 @@ namespace ml_lme static readonly Quaternion ms_offsetRightDesktop = Quaternion.Euler(0f, 270f, 0f); InputModuleSteamVR m_steamVrModule = null; - IndexIK m_indexIK = null; VRIK m_vrIK = null; Vector2 m_armsWeights = Vector2.zero; + bool m_isInVR = false; bool m_enabled = true; bool m_fingersOnly = false; @@ -28,6 +29,8 @@ namespace ml_lme ArmIK m_leftIK = null; ArmIK m_rightIK = null; + HumanPoseHandler m_poseHandler = null; + HumanPose m_pose; Transform m_leftHand = null; Transform m_rightHand = null; Transform m_leftHandTarget = null; @@ -39,8 +42,8 @@ namespace ml_lme void Start() { - m_indexIK = this.GetComponent(); m_steamVrModule = CVRInputManager.Instance.GetComponent(); + m_isInVR = Utils.IsInVR(); if(m_leftHand != null) { @@ -116,31 +119,29 @@ namespace ml_lme m_rightElbow = p_rightElbow; } - public void UpdateTracking(GestureMatcher.GesturesData p_gesturesData) + public void UpdateTracking(GestureMatcher.GesturesData p_data) { if(m_enabled) { if((m_leftIK != null) && (m_rightIK != null)) { - m_leftIK.solver.IKPositionWeight = Mathf.Lerp(m_leftIK.solver.IKPositionWeight, (p_gesturesData.m_handsPresenses[0] && !m_fingersOnly) ? 1f : 0f, 0.25f); - m_leftIK.solver.IKRotationWeight = Mathf.Lerp(m_leftIK.solver.IKRotationWeight, (p_gesturesData.m_handsPresenses[0] && !m_fingersOnly) ? 1f : 0f, 0.25f); - m_rightIK.solver.IKPositionWeight = Mathf.Lerp(m_rightIK.solver.IKPositionWeight, (p_gesturesData.m_handsPresenses[1] && !m_fingersOnly) ? 1f : 0f, 0.25f); - m_rightIK.solver.IKRotationWeight = Mathf.Lerp(m_rightIK.solver.IKRotationWeight, (p_gesturesData.m_handsPresenses[1] && !m_fingersOnly) ? 1f : 0f, 0.25f); - } + m_leftIK.solver.IKPositionWeight = Mathf.Lerp(m_leftIK.solver.IKPositionWeight, (p_data.m_handsPresenses[0] && !m_fingersOnly) ? 1f : 0f, 0.25f); + m_leftIK.solver.IKRotationWeight = Mathf.Lerp(m_leftIK.solver.IKRotationWeight, (p_data.m_handsPresenses[0] && !m_fingersOnly) ? 1f : 0f, 0.25f); - if(!Utils.AreKnucklesInUse()) - UpdateFingers(p_gesturesData); + m_rightIK.solver.IKPositionWeight = Mathf.Lerp(m_rightIK.solver.IKPositionWeight, (p_data.m_handsPresenses[1] && !m_fingersOnly) ? 1f : 0f, 0.25f); + m_rightIK.solver.IKRotationWeight = Mathf.Lerp(m_rightIK.solver.IKRotationWeight, (p_data.m_handsPresenses[1] && !m_fingersOnly) ? 1f : 0f, 0.25f); + } if((m_vrIK != null) && !m_fingersOnly) { - if(p_gesturesData.m_handsPresenses[0] && !m_leftTargetActive) + if(p_data.m_handsPresenses[0] && !m_leftTargetActive) { m_vrIK.solver.leftArm.target = m_leftHandTarget; m_vrIK.solver.leftArm.bendGoal = m_leftElbow; m_vrIK.solver.leftArm.bendGoalWeight = (m_trackElbows ? 1f : 0f); m_leftTargetActive = true; } - if(!p_gesturesData.m_handsPresenses[0] && m_leftTargetActive) + if(!p_data.m_handsPresenses[0] && m_leftTargetActive) { m_vrIK.solver.leftArm.target = IKSystem.Instance.leftHandAnchor; m_vrIK.solver.leftArm.bendGoal = null; @@ -148,14 +149,14 @@ namespace ml_lme m_leftTargetActive = false; } - if(p_gesturesData.m_handsPresenses[1] && !m_rightTargetActive) + if(p_data.m_handsPresenses[1] && !m_rightTargetActive) { m_vrIK.solver.rightArm.target = m_rightHandTarget; m_vrIK.solver.rightArm.bendGoal = m_rightElbow; m_vrIK.solver.rightArm.bendGoalWeight = (m_trackElbows ? 1f : 0f); m_rightTargetActive = true; } - if(!p_gesturesData.m_handsPresenses[1] && m_rightTargetActive) + if(!p_data.m_handsPresenses[1] && m_rightTargetActive) { m_vrIK.solver.rightArm.target = IKSystem.Instance.rightHandAnchor; m_vrIK.solver.rightArm.bendGoal = null; @@ -163,41 +164,115 @@ namespace ml_lme m_rightTargetActive = false; } } - } - } - - public void UpdateFingers(GestureMatcher.GesturesData p_data) - { - if(m_enabled && (m_indexIK != null) && (CVRInputManager.Instance != null)) - { - CVRInputManager.Instance.individualFingerTracking = true; if(p_data.m_handsPresenses[0]) { - m_indexIK.leftThumbCurl = p_data.m_leftFingersBends[0]; - m_indexIK.leftIndexCurl = p_data.m_leftFingersBends[1]; - m_indexIK.leftMiddleCurl = p_data.m_leftFingersBends[2]; - m_indexIK.leftRingCurl = p_data.m_leftFingersBends[3]; - m_indexIK.leftPinkyCurl = p_data.m_leftFingersBends[4]; + CVRInputManager.Instance.individualFingerTracking = true; CVRInputManager.Instance.fingerCurlLeftThumb = p_data.m_leftFingersBends[0]; CVRInputManager.Instance.fingerCurlLeftIndex = p_data.m_leftFingersBends[1]; CVRInputManager.Instance.fingerCurlLeftMiddle = p_data.m_leftFingersBends[2]; CVRInputManager.Instance.fingerCurlLeftRing = p_data.m_leftFingersBends[3]; CVRInputManager.Instance.fingerCurlLeftPinky = p_data.m_leftFingersBends[4]; + + if(m_isInVR) + { + IKSystem.Instance.FingerSystem.leftThumbCurl = p_data.m_leftFingersBends[0]; + IKSystem.Instance.FingerSystem.leftIndexCurl = p_data.m_leftFingersBends[1]; + IKSystem.Instance.FingerSystem.leftMiddleCurl = p_data.m_leftFingersBends[2]; + IKSystem.Instance.FingerSystem.leftRingCurl = p_data.m_leftFingersBends[3]; + IKSystem.Instance.FingerSystem.leftPinkyCurl = p_data.m_leftFingersBends[4]; + } } if(p_data.m_handsPresenses[1]) { - m_indexIK.rightThumbCurl = p_data.m_rightFingersBends[0]; - m_indexIK.rightIndexCurl = p_data.m_rightFingersBends[1]; - m_indexIK.rightMiddleCurl = p_data.m_rightFingersBends[2]; - m_indexIK.rightRingCurl = p_data.m_rightFingersBends[3]; - m_indexIK.rightPinkyCurl = p_data.m_rightFingersBends[4]; + CVRInputManager.Instance.individualFingerTracking = true; CVRInputManager.Instance.fingerCurlRightThumb = p_data.m_rightFingersBends[0]; CVRInputManager.Instance.fingerCurlRightIndex = p_data.m_rightFingersBends[1]; CVRInputManager.Instance.fingerCurlRightMiddle = p_data.m_rightFingersBends[2]; CVRInputManager.Instance.fingerCurlRightRing = p_data.m_rightFingersBends[3]; CVRInputManager.Instance.fingerCurlRightPinky = p_data.m_rightFingersBends[4]; + + if(m_isInVR) + { + IKSystem.Instance.FingerSystem.rightThumbCurl = p_data.m_rightFingersBends[0]; + IKSystem.Instance.FingerSystem.rightIndexCurl = p_data.m_rightFingersBends[1]; + IKSystem.Instance.FingerSystem.rightMiddleCurl = p_data.m_rightFingersBends[2]; + IKSystem.Instance.FingerSystem.rightRingCurl = p_data.m_rightFingersBends[3]; + IKSystem.Instance.FingerSystem.rightPinkyCurl = p_data.m_rightFingersBends[4]; + } + } + } + } + + public void UpdateTrackingLate(GestureMatcher.GesturesData p_data) + { + if(m_enabled && !m_isInVR && (m_poseHandler != null)) + { + m_poseHandler.GetHumanPose(ref m_pose); + UpdateFingers(p_data); + m_poseHandler.SetHumanPose(ref m_pose); + } + } + + void UpdateFingers(GestureMatcher.GesturesData p_data) + { + if(m_enabled && (CVRInputManager.Instance != null) && (IKSystem.Instance != null)) + { + if(p_data.m_handsPresenses[0]) + { + UpdatePoseMuscle(ref m_pose, (int)MuscleIndex.LeftThumb1Stretched, Mathf.Lerp(0.85f, -0.85f, p_data.m_leftFingersBends[0])); + UpdatePoseMuscle(ref m_pose, (int)MuscleIndex.LeftThumb2Stretched, Mathf.Lerp(0.85f, -0.85f, p_data.m_leftFingersBends[0])); + UpdatePoseMuscle(ref m_pose, (int)MuscleIndex.LeftThumb3Stretched, Mathf.Lerp(0.85f, -0.85f, p_data.m_leftFingersBends[0])); + UpdatePoseMuscle(ref m_pose, (int)MuscleIndex.LeftThumbSpread, Mathf.Lerp(-1.5f, 1.0f, p_data.m_leftFingersSpreads[0])); // Ok + + UpdatePoseMuscle(ref m_pose, (int)MuscleIndex.LeftIndex1Stretched, Mathf.Lerp(0.7f, -1f, p_data.m_leftFingersBends[1])); + UpdatePoseMuscle(ref m_pose, (int)MuscleIndex.LeftIndex2Stretched, Mathf.Lerp(0.7f, -1f, p_data.m_leftFingersBends[1])); + UpdatePoseMuscle(ref m_pose, (int)MuscleIndex.LeftIndex3Stretched, Mathf.Lerp(0.7f, -1f, p_data.m_leftFingersBends[1])); + UpdatePoseMuscle(ref m_pose, (int)MuscleIndex.LeftIndexSpread, Mathf.Lerp(1f, -1f, p_data.m_leftFingersSpreads[1])); // Ok + + UpdatePoseMuscle(ref m_pose, (int)MuscleIndex.LeftMiddle1Stretched, Mathf.Lerp(0.7f, -1f, p_data.m_leftFingersBends[2])); + UpdatePoseMuscle(ref m_pose, (int)MuscleIndex.LeftMiddle2Stretched, Mathf.Lerp(0.7f, -1f, p_data.m_leftFingersBends[2])); + UpdatePoseMuscle(ref m_pose, (int)MuscleIndex.LeftMiddle3Stretched, Mathf.Lerp(0.7f, -1f, p_data.m_leftFingersBends[2])); + UpdatePoseMuscle(ref m_pose, (int)MuscleIndex.LeftMiddleSpread, Mathf.Lerp(2f, -2f, p_data.m_leftFingersSpreads[2])); + + UpdatePoseMuscle(ref m_pose, (int)MuscleIndex.LeftRing1Stretched, Mathf.Lerp(0.7f, -1f, p_data.m_leftFingersBends[3])); + UpdatePoseMuscle(ref m_pose, (int)MuscleIndex.LeftRing2Stretched, Mathf.Lerp(0.7f, -1f, p_data.m_leftFingersBends[3])); + UpdatePoseMuscle(ref m_pose, (int)MuscleIndex.LeftRing3Stretched, Mathf.Lerp(0.7f, -1f, p_data.m_leftFingersBends[3])); + UpdatePoseMuscle(ref m_pose, (int)MuscleIndex.LeftRingSpread, Mathf.Lerp(-2f, 2f, p_data.m_leftFingersSpreads[3])); + + UpdatePoseMuscle(ref m_pose, (int)MuscleIndex.LeftLittle1Stretched, Mathf.Lerp(0.7f, -1f, p_data.m_leftFingersBends[4])); + UpdatePoseMuscle(ref m_pose, (int)MuscleIndex.LeftLittle2Stretched, Mathf.Lerp(0.7f, -1f, p_data.m_leftFingersBends[4])); + UpdatePoseMuscle(ref m_pose, (int)MuscleIndex.LeftLittle3Stretched, Mathf.Lerp(0.7f, -1f, p_data.m_leftFingersBends[4])); + UpdatePoseMuscle(ref m_pose, (int)MuscleIndex.LeftLittleSpread, Mathf.Lerp(-0.5f, 1f, p_data.m_leftFingersSpreads[4])); + } + + if(p_data.m_handsPresenses[1]) + { + UpdatePoseMuscle(ref m_pose, (int)MuscleIndex.RightThumb1Stretched, Mathf.Lerp(0.85f, -0.85f, p_data.m_rightFingersBends[0])); + UpdatePoseMuscle(ref m_pose, (int)MuscleIndex.RightThumb2Stretched, Mathf.Lerp(0.85f, -0.85f, p_data.m_rightFingersBends[0])); + UpdatePoseMuscle(ref m_pose, (int)MuscleIndex.RightThumb3Stretched, Mathf.Lerp(0.85f, -0.85f, p_data.m_rightFingersBends[0])); + UpdatePoseMuscle(ref m_pose, (int)MuscleIndex.RightThumbSpread, Mathf.Lerp(-1.5f, 1.0f, p_data.m_rightFingersSpreads[0])); // Ok + + UpdatePoseMuscle(ref m_pose, (int)MuscleIndex.RightIndex1Stretched, Mathf.Lerp(0.7f, -1f, p_data.m_rightFingersBends[1])); + UpdatePoseMuscle(ref m_pose, (int)MuscleIndex.RightIndex2Stretched, Mathf.Lerp(0.7f, -1f, p_data.m_rightFingersBends[1])); + UpdatePoseMuscle(ref m_pose, (int)MuscleIndex.RightIndex3Stretched, Mathf.Lerp(0.7f, -1f, p_data.m_rightFingersBends[1])); + UpdatePoseMuscle(ref m_pose, (int)MuscleIndex.RightIndexSpread, Mathf.Lerp(1f, -1f, p_data.m_rightFingersSpreads[1])); // Ok + + UpdatePoseMuscle(ref m_pose, (int)MuscleIndex.RightMiddle1Stretched, Mathf.Lerp(0.7f, -1f, p_data.m_rightFingersBends[2])); + UpdatePoseMuscle(ref m_pose, (int)MuscleIndex.RightMiddle2Stretched, Mathf.Lerp(0.7f, -1f, p_data.m_rightFingersBends[2])); + UpdatePoseMuscle(ref m_pose, (int)MuscleIndex.RightMiddle3Stretched, Mathf.Lerp(0.7f, -1f, p_data.m_rightFingersBends[2])); + UpdatePoseMuscle(ref m_pose, (int)MuscleIndex.RightMiddleSpread, Mathf.Lerp(2f, -2f, p_data.m_rightFingersSpreads[2])); + + UpdatePoseMuscle(ref m_pose, (int)MuscleIndex.RightRing1Stretched, Mathf.Lerp(0.7f, -1f, p_data.m_rightFingersBends[3])); + UpdatePoseMuscle(ref m_pose, (int)MuscleIndex.RightRing2Stretched, Mathf.Lerp(0.7f, -1f, p_data.m_rightFingersBends[3])); + UpdatePoseMuscle(ref m_pose, (int)MuscleIndex.RightRing3Stretched, Mathf.Lerp(0.7f, -1f, p_data.m_rightFingersBends[3])); + UpdatePoseMuscle(ref m_pose, (int)MuscleIndex.RightRingSpread, Mathf.Lerp(-2f, 2f, p_data.m_rightFingersSpreads[3])); + + UpdatePoseMuscle(ref m_pose, (int)MuscleIndex.RightLittle1Stretched, Mathf.Lerp(0.7f, -1f, p_data.m_rightFingersBends[4])); + UpdatePoseMuscle(ref m_pose, (int)MuscleIndex.RightLittle2Stretched, Mathf.Lerp(0.7f, -1f, p_data.m_rightFingersBends[4])); + UpdatePoseMuscle(ref m_pose, (int)MuscleIndex.RightLittle3Stretched, Mathf.Lerp(0.7f, -1f, p_data.m_rightFingersBends[4])); + UpdatePoseMuscle(ref m_pose, (int)MuscleIndex.RightLittleSpread, Mathf.Lerp(-0.5f, 1f, p_data.m_rightFingersSpreads[4])); } } } @@ -211,6 +286,10 @@ namespace ml_lme m_leftTargetActive = false; m_rightTargetActive = false; + if(!m_isInVR) + m_poseHandler?.Dispose(); + m_poseHandler = null; + m_leftHandTarget.localPosition = Vector3.zero; m_leftHandTarget.localRotation = Quaternion.identity; m_rightHandTarget.localPosition = Vector3.zero; @@ -221,31 +300,23 @@ namespace ml_lme { m_vrIK = PlayerSetup.Instance._animator.GetComponent(); - if(m_indexIK != null) - { - m_indexIK.avatarAnimator = PlayerSetup.Instance._animator; - RefreshFingersTracking(); - } + RefreshFingersTracking(); if(PlayerSetup.Instance._animator.isHuman) { - HumanPoseHandler l_poseHandler = null; - HumanPose l_initPose = new HumanPose(); - - // Force desktop non-VRIK avatar into T-Pose - if(m_vrIK == null) + if(!m_isInVR) { - l_poseHandler = new HumanPoseHandler(PlayerSetup.Instance._animator.avatar, PlayerSetup.Instance._avatar.transform); - l_poseHandler.GetHumanPose(ref l_initPose); + // Force desktop avatar into T-Pose + m_poseHandler = new HumanPoseHandler(PlayerSetup.Instance._animator.avatar, PlayerSetup.Instance._avatar.transform); + m_poseHandler.GetHumanPose(ref m_pose); HumanPose l_tPose = new HumanPose(); - l_tPose.bodyPosition = l_initPose.bodyPosition; - l_tPose.bodyRotation = l_initPose.bodyRotation; - l_tPose.muscles = new float[l_initPose.muscles.Length]; + l_tPose.bodyPosition = m_pose.bodyPosition; + l_tPose.bodyRotation = m_pose.bodyRotation; + l_tPose.muscles = new float[m_pose.muscles.Length]; for(int i = 0; i < l_tPose.muscles.Length; i++) l_tPose.muscles[i] = ms_tposeMuscles[i]; - - l_poseHandler.SetHumanPose(ref l_tPose); + m_poseHandler.SetHumanPose(ref l_tPose); } Transform l_hand = PlayerSetup.Instance._animator.GetBoneTransform(HumanBodyBones.LeftHand); @@ -294,15 +365,13 @@ namespace ml_lme m_rightIK.solver.arm.bendGoalWeight = (m_trackElbows ? 1f : 0f); m_rightIK.enabled = (m_enabled && !m_fingersOnly); - l_poseHandler.SetHumanPose(ref l_initPose); + m_poseHandler?.SetHumanPose(ref m_pose); } else { m_vrIK.solver.OnPreUpdate += this.OnIKPreUpdate; m_vrIK.solver.OnPostUpdate += this.OnIKPostUpdate; } - - l_poseHandler?.Dispose(); } } @@ -362,11 +431,16 @@ namespace ml_lme void RefreshFingersTracking() { - if(m_indexIK != null) - { - m_indexIK.activeControl = (m_enabled || (PlayerSetup.Instance._inVr && Utils.AreKnucklesInUse())); - CVRInputManager.Instance.individualFingerTracking = (m_enabled || (PlayerSetup.Instance._inVr && Utils.AreKnucklesInUse() && !(bool)ms_indexGestureToggle.GetValue(m_steamVrModule))); - } + CVRInputManager.Instance.individualFingerTracking = (m_enabled || (m_isInVR && Utils.AreKnucklesInUse() && !(bool)ms_indexGestureToggle.GetValue(m_steamVrModule))); + + if(m_isInVR) + IKSystem.Instance.FingerSystem.controlActive = CVRInputManager.Instance.individualFingerTracking; + } + + static void UpdatePoseMuscle(ref HumanPose p_pose, int p_index, float p_value) + { + if(p_pose.muscles.Length > p_index) + p_pose.muscles[p_index] = p_value; } } } diff --git a/ml_lme/Main.cs b/ml_lme/Main.cs index eb5874c..167c110 100644 --- a/ml_lme/Main.cs +++ b/ml_lme/Main.cs @@ -19,6 +19,8 @@ namespace ml_lme GameObject m_leapControllerModel = null; LeapTracked m_leapTracked = null; + bool m_isInVR = false; + public override void OnInitializeMelon() { if(ms_instance == null) @@ -57,11 +59,6 @@ namespace ml_lme null, new HarmonyLib.HarmonyMethod(typeof(LeapMotionExtension).GetMethod(nameof(OnSetupAvatar_Postfix), BindingFlags.Static | BindingFlags.NonPublic)) ); - HarmonyInstance.Patch( - typeof(PlayerSetup).GetMethod("GetGesturesFromControllers", BindingFlags.Instance | BindingFlags.NonPublic), - null, - new HarmonyLib.HarmonyMethod(typeof(LeapMotionExtension).GetMethod(nameof(OnGetGesturesFromControllers_Postfix), BindingFlags.Static | BindingFlags.NonPublic)) - ); MelonLoader.MelonCoroutines.Start(CreateTrackingObjects()); } @@ -81,6 +78,8 @@ namespace ml_lme while(PlayerSetup.Instance.vrCamera == null) yield return null; + m_isInVR = Utils.IsInVR(); + m_leapTrackingRoot = new GameObject("[LeapRoot]"); for(int i = 0; i < GestureMatcher.GesturesData.ms_handsCount; i++) @@ -167,6 +166,12 @@ namespace ml_lme } } + public override void OnLateUpdate() + { + if(Settings.Enabled && !m_isInVR && (m_leapTracked != null)) + m_leapTracked.UpdateTrackingLate(m_gesturesData); + } + // Settings changes void OnEnableChange(bool p_state) { @@ -183,7 +188,7 @@ namespace ml_lme { if((m_leapTrackingRoot != null) && !Settings.HeadAttach) { - if(!PlayerSetup.Instance._inVr) + if(!m_isInVR) m_leapTrackingRoot.transform.localPosition = p_offset * PlayerSetup.Instance.vrCameraRig.transform.localScale.x; else m_leapTrackingRoot.transform.localPosition = p_offset; @@ -230,7 +235,7 @@ namespace ml_lme { if(p_state) { - if(!PlayerSetup.Instance._inVr) + if(!m_isInVR) { m_leapTrackingRoot.transform.parent = PlayerSetup.Instance.desktopCamera.transform; m_leapTrackingRoot.transform.localPosition = Settings.HeadOffset * PlayerSetup.Instance.vrCameraRig.transform.localScale.x; @@ -245,7 +250,7 @@ namespace ml_lme } else { - if(!PlayerSetup.Instance._inVr) + if(!m_isInVR) { m_leapTrackingRoot.transform.parent = PlayerSetup.Instance.desktopCameraRig.transform; m_leapTrackingRoot.transform.localPosition = Settings.DesktopOffset * PlayerSetup.Instance.vrCameraRig.transform.localScale.x; @@ -267,7 +272,7 @@ namespace ml_lme { if((m_leapTrackingRoot != null) && Settings.HeadAttach) { - if(!PlayerSetup.Instance._inVr) + if(!m_isInVR) m_leapTrackingRoot.transform.localPosition = p_offset * PlayerSetup.Instance.vrCameraRig.transform.localScale.x; else m_leapTrackingRoot.transform.localPosition = p_offset; @@ -360,19 +365,5 @@ namespace ml_lme MelonLoader.MelonLogger.Error(e); } } - - static void OnGetGesturesFromControllers_Postfix() => ms_instance?.OnGetGesturesFromControllers(); - void OnGetGesturesFromControllers() - { - try - { - if(Settings.Enabled && Utils.AreKnucklesInUse() && (m_leapTracked != null)) - m_leapTracked.UpdateFingers(m_gesturesData); - } - catch(System.Exception e) - { - MelonLoader.MelonLogger.Error(e); - } - } } } diff --git a/ml_lme/Properties/AssemblyInfo.cs b/ml_lme/Properties/AssemblyInfo.cs index 446d348..851954a 100644 --- a/ml_lme/Properties/AssemblyInfo.cs +++ b/ml_lme/Properties/AssemblyInfo.cs @@ -1,10 +1,10 @@ using System.Reflection; [assembly: AssemblyTitle("LeapMotionExtension")] -[assembly: AssemblyVersion("1.2.7")] -[assembly: AssemblyFileVersion("1.2.7")] +[assembly: AssemblyVersion("1.2.8")] +[assembly: AssemblyFileVersion("1.2.8")] -[assembly: MelonLoader.MelonInfo(typeof(ml_lme.LeapMotionExtension), "LeapMotionExtension", "1.2.7", "SDraw", "https://github.com/SDraw/ml_mods_cvr")] +[assembly: MelonLoader.MelonInfo(typeof(ml_lme.LeapMotionExtension), "LeapMotionExtension", "1.2.8-experimental", "SDraw", "https://github.com/SDraw/ml_mods_cvr")] [assembly: MelonLoader.MelonGame(null, "ChilloutVR")] [assembly: MelonLoader.MelonPlatform(MelonLoader.MelonPlatformAttribute.CompatiblePlatforms.WINDOWS_X64)] [assembly: MelonLoader.MelonPlatformDomain(MelonLoader.MelonPlatformDomainAttribute.CompatibleDomains.MONO)] diff --git a/ml_lme/Utils.cs b/ml_lme/Utils.cs index 7813d3e..bf493a4 100644 --- a/ml_lme/Utils.cs +++ b/ml_lme/Utils.cs @@ -10,7 +10,9 @@ namespace ml_lme static readonly Quaternion ms_screentopRotationFix = new Quaternion(0f, 0f, -1f, 0f); public static bool AreKnucklesInUse() => PlayerSetup.Instance._trackerManager.trackerNames.Contains("knuckles"); - + + public static bool IsInVR() => ((ABI_RC.Core.Savior.CheckVR.Instance != null) && ABI_RC.Core.Savior.CheckVR.Instance.hasVrDeviceLoaded); + public static Matrix4x4 GetMatrix(this Transform p_transform, bool p_pos = true, bool p_rot = true, bool p_scl = false) { return Matrix4x4.TRS(p_pos ? p_transform.position : Vector3.zero, p_rot ? p_transform.rotation : Quaternion.identity, p_scl ? p_transform.lossyScale : Vector3.one); diff --git a/ml_lme/ml_lme.csproj b/ml_lme/ml_lme.csproj index 8094eec..d1fba4a 100644 --- a/ml_lme/ml_lme.csproj +++ b/ml_lme/ml_lme.csproj @@ -136,6 +136,6 @@ - copy /y "$(TargetPath)" "C:\Games\Steam\common\ChilloutVR\Mods\" + copy /y "$(TargetPath)" "D:\Games\Steam\steamapps\common\ChilloutVR\Mods\" \ No newline at end of file diff --git a/ml_lme/ml_lme.csproj.user b/ml_lme/ml_lme.csproj.user index 2539084..04df561 100644 --- a/ml_lme/ml_lme.csproj.user +++ b/ml_lme/ml_lme.csproj.user @@ -1,6 +1,6 @@  - C:\Games\Steam\common\ChilloutVR\MelonLoader\;C:\Games\Steam\common\ChilloutVR\ChilloutVR_Data\Managed\ + D:\Games\Steam\steamapps\common\ChilloutVR\MelonLoader\;D:\Games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\ \ No newline at end of file