Merge pull request #10206 from jonathoncobb/jonathoncobb/fingertip-pointer

Add option to move grasp point to fingertip

Author: keveleigh

Assets/MRTK/SDK/Features/UX/Scripts/Pointers/SpherePointer.cs

@@ -11,6 +11,12 @@ namespace Microsoft.MixedReality.Toolkit.Input
     [AddComponentMenu("Scripts/MRTK/SDK/SpherePointer")]
     public class SpherePointer : BaseControllerPointer, IMixedRealityNearPointer
     {
+        private enum GraspPointPlacement
+        {
+            BetweenIndexFingerAndThumb,
+            IndexFingertip,
+        }
+
         private SceneQueryType raycastMode = SceneQueryType.SphereOverlap;
 
         /// <inheritdoc />
@@ -146,10 +152,14 @@ public float NearObjectSmoothingFactor
         [Tooltip("Whether to ignore colliders that may be near the pointer, but not actually in the visual FOV. This can prevent accidental grabs, and will allow hand rays to turn on when you may be near a grabbable but cannot see it. Visual FOV is defined by cone centered about display center, radius equal to half display height.")]
         private bool ignoreCollidersNotInFOV = true;
 
+        [SerializeField]
+        [Tooltip("Location on the hand where a grasp is triggered (apllies to IMixedRealityHand only)")]
+        private GraspPointPlacement graspPointPlacement = GraspPointPlacement.BetweenIndexFingerAndThumb;
+
         /// <summary>
         /// Whether to ignore colliders that may be near the pointer, but not actually in the visual FOV.
-        /// This can prevent accidental grabs, and will allow hand rays to turn on when you may be near 
-        /// a grabbable but cannot see it. Visual FOV is defined by cone centered about display center, 
+        /// This can prevent accidental grabs, and will allow hand rays to turn on when you may be near
+        /// a grabbable but cannot see it. Visual FOV is defined by cone centered about display center,
         /// radius equal to half display height.
         /// </summary>
         public bool IgnoreCollidersNotInFOV
@@ -227,7 +237,7 @@ public override void OnPreSceneQuery()
 
         /// <summary>
         /// Gets the position of where grasp happens
-        /// For IMixedRealityHand it's the average of index and thumb.
+        /// For IMixedRealityHand it's determined by <see cref="graspPointPlacement"/> (either the average of index and thumb or the fingertip).
         /// For any other IMixedRealityController, return just the pointer origin
         /// </summary>
         public bool TryGetNearGraspPoint(out Vector3 result)
@@ -241,10 +251,19 @@ public bool TryGetNearGraspPoint(out Vector3 result)
                     {
                         if (hand.TryGetJoint(TrackedHandJoint.IndexTip, out MixedRealityPose index) && index != null)
                         {
-                            if (hand.TryGetJoint(TrackedHandJoint.ThumbTip, out MixedRealityPose thumb) && thumb != null)
+                            switch (graspPointPlacement)
                             {
-                                result = 0.5f * (index.Position + thumb.Position);
-                                return true;
+                                case GraspPointPlacement.BetweenIndexFingerAndThumb:
+                                    if (hand.TryGetJoint(TrackedHandJoint.ThumbTip, out MixedRealityPose thumb) && thumb != null)
+                                    {
+                                        result = 0.5f * (index.Position + thumb.Position);
+                                        return true;
+                                    }
+                                    break;
+
+                                case GraspPointPlacement.IndexFingertip:
+                                    result = index.Position;
+                                    return true;
                             }
                         }
                     }
@@ -267,7 +286,7 @@ public bool TryGetNearGraspPoint(out Vector3 result)
 
         /// <summary>
         /// Because pointers shouldn't be able to interact with objects that are "behind" it, it is necessary to determine the forward axis of the pointer when making interaction checks.
-        /// 
+        ///
         /// For example, a grab pointer's axis should is the result of Vector3.Lerp(palm forward axis, palm to index finger axis).
         ///
         /// This method provides a mechanism to get this normalized forward axis.
@@ -347,7 +366,7 @@ public bool TryGetNormalToNearestSurface(out Vector3 normal)
         private class SpherePointerQueryInfo
         {
             /// <summary>
-            /// How many colliders are near the point from the latest call to TryUpdateQueryBufferForLayerMask 
+            /// How many colliders are near the point from the latest call to TryUpdateQueryBufferForLayerMask.
             /// </summary>
             private int numColliders;
 
@@ -382,7 +401,7 @@ private class SpherePointerQueryInfo
             public bool ignoreBoundsHandlesForQuery = false;
 
             /// <summary>
-            /// The grabbable near the QueryRadius. 
+            /// The grabbable near the QueryRadius.
             /// </summary>
             private NearInteractionGrabbable grabbable;