From b16d82c1f52097ed21db4eed7e42b9d50a4b936f Mon Sep 17 00:00:00 2001 From: SDraw Date: Sun, 23 Mar 2025 16:11:02 +0300 Subject: [PATCH] Fix for recent build --- ml_lme/LeapInput.cs | 4 ++-- ml_lme/Properties/AssemblyInfo.cs | 2 +- ml_lme/ml_lme.csproj | 2 +- ml_pam/ArmMover.cs | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ml_lme/LeapInput.cs b/ml_lme/LeapInput.cs index bf76497..7fa018f 100644 --- a/ml_lme/LeapInput.cs +++ b/ml_lme/LeapInput.cs @@ -39,7 +39,7 @@ namespace ml_lme m_handRayLeft.generalMask = -269; m_handRayLeft.isInteractionRay = true; m_handRayLeft.triggerHoverEvents = false; - m_handRayLeft.holderRoot = m_handRayLeft.gameObject; + //m_handRayLeft.holderRoot = m_handRayLeft.gameObject; m_handRayLeft.attachmentDistance = 0f; m_handRayLeft.uiMask = 32; m_handRayLeft.isDesktopRay = !m_inVR; @@ -61,7 +61,7 @@ namespace ml_lme m_handRayRight.generalMask = -269; m_handRayRight.isInteractionRay = true; m_handRayRight.triggerHoverEvents = false; - m_handRayRight.holderRoot = m_handRayRight.gameObject; + //m_handRayRight.holderRoot = m_handRayRight.gameObject; m_handRayRight.attachmentDistance = 0f; m_handRayRight.uiMask = 32; m_handRayRight.isDesktopRay = !m_inVR; diff --git a/ml_lme/Properties/AssemblyInfo.cs b/ml_lme/Properties/AssemblyInfo.cs index e199a48..3f6ec3d 100644 --- a/ml_lme/Properties/AssemblyInfo.cs +++ b/ml_lme/Properties/AssemblyInfo.cs @@ -1,4 +1,4 @@ -[assembly: MelonLoader.MelonInfo(typeof(ml_lme.LeapMotionExtension), "LeapMotionExtension", "1.6.0-u6", "SDraw", "https://github.com/SDraw/ml_mods_cvr")] +[assembly: MelonLoader.MelonInfo(typeof(ml_lme.LeapMotionExtension), "LeapMotionExtension", "1.6.1-u6", "SDraw", "https://github.com/SDraw/ml_mods_cvr")] [assembly: MelonLoader.MelonGame(null, "ChilloutVR")] [assembly: MelonLoader.MelonOptionalDependencies("ml_pmc")] [assembly: MelonLoader.MelonPlatform(MelonLoader.MelonPlatformAttribute.CompatiblePlatforms.WINDOWS_X64)] diff --git a/ml_lme/ml_lme.csproj b/ml_lme/ml_lme.csproj index c983b40..58a029b 100644 --- a/ml_lme/ml_lme.csproj +++ b/ml_lme/ml_lme.csproj @@ -4,7 +4,7 @@ netstandard2.1 x64 LeapMotionExtension - 1.6.0 + 1.6.1 SDraw SDraw LeapMotionExtension diff --git a/ml_pam/ArmMover.cs b/ml_pam/ArmMover.cs index 6f3d7e8..de26757 100644 --- a/ml_pam/ArmMover.cs +++ b/ml_pam/ArmMover.cs @@ -426,7 +426,7 @@ namespace ml_pam void OnPickupGrab(CVRPickupObject p_pickup, Vector3 p_hit) { - if(p_pickup.IsGrabbedByMe && (p_pickup.ControllerRay == ViewManager.Instance.desktopControllerRay)) + if(p_pickup.IsGrabbedByMe && (p_pickup.ControllerRay == PlayerSetup.Instance.desktopRay)) { m_pickup = p_pickup;