update XRHandsInputActionUpdater and XRHandsUtils

Author: MattGrayUL

Diff for: Packages/Tracking/Core/Runtime/Scripts/XRHandsSubsystem/XRHandsInputActionUpdater.cs

@@ -185,10 +185,10 @@ private static void SendMetaAimStateUpdate(LeapHandState state, XRHand hand)
                 InputSystem.QueueDeltaStateEvent(metaAimHand.trackingState, UnityEngine.XR.InputTrackingState.Position | UnityEngine.XR.InputTrackingState.Rotation);
                 InputSystem.QueueDeltaStateEvent(metaAimHand.isTracked, true);
 
-                InputSystem.QueueDeltaStateEvent(metaAimHand.indexPressed, hand.CalculatePinchStrength(XRHandJointID.IndexTip) > 0.5f ? true : false);
-                InputSystem.QueueDeltaStateEvent(metaAimHand.middlePressed, hand.CalculatePinchStrength(XRHandJointID.MiddleTip) > 0.5f ? true : false);
-                InputSystem.QueueDeltaStateEvent(metaAimHand.ringPressed, hand.CalculatePinchStrength(XRHandJointID.RingTip) > 0.5f ? true : false);
-                InputSystem.QueueDeltaStateEvent(metaAimHand.littlePressed, hand.CalculatePinchStrength(XRHandJointID.LittleTip) > 0.5f ? true : false);
+                InputSystem.QueueDeltaStateEvent(metaAimHand.indexPressed, hand.CalculatePinchDistance(XRHandJointID.IndexTip) < 0.02f ? true : false);
+                InputSystem.QueueDeltaStateEvent(metaAimHand.middlePressed, hand.CalculatePinchDistance(XRHandJointID.MiddleTip) < 0.02f ? true : false);
+                InputSystem.QueueDeltaStateEvent(metaAimHand.ringPressed, hand.CalculatePinchDistance(XRHandJointID.RingTip) < 0.02f ? true : false);
+                InputSystem.QueueDeltaStateEvent(metaAimHand.littlePressed, hand.CalculatePinchDistance(XRHandJointID.LittleTip) < 0.02f ? true : false);
 
                 InputSystem.QueueDeltaStateEvent(metaAimHand.pinchStrengthIndex, hand.CalculatePinchStrength(XRHandJointID.IndexTip));
                 InputSystem.QueueDeltaStateEvent(metaAimHand.pinchStrengthMiddle, hand.CalculatePinchStrength(XRHandJointID.MiddleTip));
@@ -245,7 +245,7 @@ static float GetSelecting(XRHand hand)
 
         static float GetActvating(XRHand hand)
         {
-            return hand.CalculatePinchStrength() > 0.8 ? 1 : 0;
+            return hand.CalculatePinchDistance() < 0.02f ? 1 : 0;
         }
 
         static Vector3 GetPalmPosition(XRHand hand)

Diff for: Packages/Tracking/Core/Runtime/Scripts/XRHandsSubsystem/XRHandsUtils.cs

@@ -6,10 +6,11 @@
  * between Ultraleap and you, your company or other organization.             *
  ******************************************************************************/
 
+using Leap.Unity;
 using UnityEngine;
 using UnityEngine.XR.Hands;
 
-namespace Leap.Unity
+namespace Leap
 {
     public static class XRHandsUtils
     {
@@ -114,6 +115,22 @@ public static float CalculatePinchStrength(this XRHand hand, XRHandJointID joint
             return 0;
         }
 
+        public static float CalculatePinchDistance(this XRHand hand, XRHandJointID jointToCompare = XRHandJointID.IndexTip)
+        {
+            // Get the thumb position.
+            Vector3 thumbTip = Vector3.zero;
+            if (hand.GetJoint(XRHandJointID.ThumbTip).TryGetPose(out Pose thumbTipPose)) thumbTip = thumbTipPose.position;
+
+            // Compute the distance midpoints between the thumb and thejointToCompare.
+            if (hand.GetJoint(jointToCompare).TryGetPose(out var fingerTipPose))
+            {
+                float distance = (fingerTipPose.position - thumbTip).magnitude;
+                return distance;
+            }
+
+            return 0;
+        }
+
         public static Vector3 GetStablePinchPosition(this XRHand hand)
         {
             Vector3 indexTip = Vector3.zero;