Merge pull request #1667 from ultraleap/feature/UNITY-1541_Undo_Fingertip_Adjustments_for_Capsule_Hands_And_OpenXR

Undoing capsule hand fingertip adjustments and OpenXR related changes…

Author: MaxPalmer-UH

Packages/Tracking/CHANGELOG.md

@@ -10,12 +10,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 - Added a warning to Physical Buttons when no Physical Hands Manager is in the scene
-- Added a checkbox to enable offsetting fingertip capsules in CapsuleHand
 - Added a checkbox to enable fiducial marker tracking within the LeapC service
 
 ### Changed
 - Non-convex MeshColliders are skipped when processing Physical Hands
-- Adjusted OpenXR fingertip data to match LeapC more closely
 - Removed old conditional support for Unity 2021.3.18 since 2022 is the oldest LTS version we support
 
 ### Fixed

Packages/Tracking/Core/Runtime/Scripts/Hands/CapsuleHand.cs

@@ -73,9 +73,6 @@ public CapsuleHandPreset Preset
         [SerializeField]
         private bool _joinThumbProximal = true;
 
-        [Space, SerializeField, Tooltip("If enabled, this will back-offset the fingertip spheres to better represent actual tips.")]
-        private bool _offsetTipSphere = false;
-
         [Space, SerializeField]
         private bool _castShadows = true;
 
@@ -382,11 +379,6 @@ public override void UpdateHand()
                     else
                     {
                         position = finger.GetBone((Bone.BoneType)j).NextJoint;
-                        if (j == 3 && _offsetTipSphere)
-                        {
-                            // Fingertips need to be adjusted back by a radii to account for sphere drawing.
-                            position -= finger.GetBone((Bone.BoneType)j).Direction * _jointRadius;
-                        }
                     }
 
                     _spherePositions[key] = position;

Packages/Tracking/OpenXR/Runtime/Scripts/OpenXRLeapProvider.cs

@@ -220,23 +220,14 @@ private bool PopulateLeapHandFromOpenXRJoints(HandTracker handTracker, ref Hand
                         continue;
                     }
 
-                    var prevJointPosition = prevJoint.Pose.position;
-                    var nextJointPosition = nextJoint.Pose.position;
-                    
-                    // Adjust the fingertip positions forward by a radius to match LeapC data.
-                    if (boneIndex == 3)
-                    {
-                        nextJointPosition += prevJoint.Pose.forward * nextJoint.Radius;
-                    }
-
                     // Populate the finger bone information
                     var bone = hand.fingers[fingerIndex].bones[boneIndex];
                     bone.Fill(
-                        prevJointPosition,
-                        nextJointPosition,
-                        ((prevJointPosition + nextJointPosition) / 2f),
+                        prevJoint.Pose.position,
+                        nextJoint.Pose.position,
+                        ((prevJoint.Pose.position + nextJoint.Pose.position) / 2f),
                         prevJoint.Pose.forward,
-                        (prevJointPosition - nextJointPosition).magnitude,
+                        (prevJoint.Pose.position - nextJoint.Pose.position).magnitude,
                         prevJoint.Radius * 1.5f, // 1.5 to convert from joint radius to bone width (joints bigger than bones)
                         (Bone.BoneType)boneIndex,
                         prevJoint.Pose.rotation);