Add support for input and gestures for hand controllers

XRTK.Lumin/Packages/com.xrtk.lumin/Profiles~/Controllers/LuminHandControllerDataProviderProfile.asset

@@ -14,11 +14,12 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   hasSetupDefaults: 1
   controllerMappingProfiles:
-  - {fileID: 11400000, guid: b43ff1b6f37e65946b1abc7e50af105f, type: 2}
-  - {fileID: 11400000, guid: 6c775257f26873e459a492f28125e129, type: 2}
-  handMeshingEnabled: 0
+  - {fileID: 11400000, guid: dd499836e4b82f14da2f414aad1fed8b, type: 2}
+  - {fileID: 11400000, guid: 78bf44d2b6970a74ea2721883b0b22bc, type: 2}
+  renderingMode: 1
   handPhysicsEnabled: 0
   useTriggers: 0
   boundsMode: 0
+  trackedPoses: []
   keyPointFilterLevel: 0
   poseFilterLevel: 0

XRTK.Lumin/Packages/com.xrtk.lumin/Runtime/Profiles/LuminControllerDataProviderProfile.cs

@@ -3,7 +3,7 @@
 
 using XRTK.Definitions.Controllers;
 using XRTK.Definitions.Utilities;
-using XRTK.Lumin.Providers.Controllers;
+using XRTK.Lumin.Providers.InputSystem.Controllers;
 
 namespace XRTK.Lumin.Profiles
 {

XRTK.Lumin/Packages/com.xrtk.lumin/Runtime/Providers/Controllers/LuminController.cs → XRTK.Lumin/Packages/com.xrtk.lumin/Runtime/Providers/InputSystem/Controllers/LuminController.cs

@@ -16,7 +16,7 @@
 
 #endif
 
-namespace XRTK.Lumin.Providers.Controllers
+namespace XRTK.Lumin.Providers.InputSystem.Controllers
 {
     [System.Runtime.InteropServices.Guid("6AC05D69-0E7A-4CFE-91E3-05BC0564458D")]
     public class LuminController : BaseController

XRTK.Lumin/Packages/com.xrtk.lumin/Runtime/Providers/Controllers/LuminControllerDataProvider.cs → XRTK.Lumin/Packages/com.xrtk.lumin/Runtime/Providers/InputSystem/Controllers/LuminControllerDataProvider.cs

@@ -19,7 +19,7 @@
 
 #endif // PLATFORM_LUMIN
 
-namespace XRTK.Lumin.Providers.Controllers
+namespace XRTK.Lumin.Providers.InputSystem.Controllers
 {
     [RuntimePlatform(typeof(LuminPlatform))]
     [System.Runtime.InteropServices.Guid("851006A2-0762-49AA-80A5-A01C9A8DBB58")]

XRTK.Lumin/Packages/com.xrtk.lumin/Runtime/Providers/Controllers/LuminHandControllerDataProvider.cs → XRTK.Lumin/Packages/com.xrtk.lumin/Runtime/Providers/InputSystem/Controllers/LuminHandControllerDataProvider.cs

@@ -13,15 +13,14 @@
 using System;
 using System.Collections.Generic;
 using UnityEngine;
-using UnityEngine.XR.MagicLeap;
 using XRTK.Definitions.Devices;
 using XRTK.Definitions.Utilities;
-using XRTK.Lumin.Utilities;
 using XRTK.Services;
+using XRTK.Definitions.Controllers.Hands;
 
 #endif // PLATFORM_LUMIN
 
-namespace XRTK.Lumin.Providers.Controllers
+namespace XRTK.Lumin.Providers.InputSystem.Controllers
 {
     [RuntimePlatform(typeof(LuminPlatform))]
     [System.Runtime.InteropServices.Guid("9511D571-2E24-41EF-AA7E-DF4432617DE1")]
@@ -34,12 +33,15 @@ public LuminHandControllerDataProvider(string name, uint priority, LuminHandCont
 #if PLATFORM_LUMIN
             keyPointFilterLevel = (MLKeyPointFilterLevel)profile.KeyPointFilterLevel;
             poseFilterLevel = (MLPoseFilterLevel)profile.PoseFilterLevel;
+
+            leftHandConverter = new LuminHandDataConverter(Handedness.Left, TrackedPoses);
+            rightHandConverter = new LuminHandDataConverter(Handedness.Right, TrackedPoses);
         }
 
         private readonly MLPoseFilterLevel poseFilterLevel;
         private readonly MLKeyPointFilterLevel keyPointFilterLevel;
-        private readonly LuminHandDataConverter leftHandConverter = new LuminHandDataConverter(Handedness.Left);
-        private readonly LuminHandDataConverter rightHandConverter = new LuminHandDataConverter(Handedness.Right);
+        private readonly LuminHandDataConverter leftHandConverter;
+        private readonly LuminHandDataConverter rightHandConverter;
         private readonly MLHandKeyPose[] keyPoses = Enum.GetValues(typeof(MLHandKeyPose)).Cast<MLHandKeyPose>().ToArray();
         private readonly Dictionary<Handedness, MixedRealityHandController> activeControllers = new Dictionary<Handedness, MixedRealityHandController>();
 
@@ -75,15 +77,15 @@ public override void Enable()
             {
                 Debug.LogError($"Error: Failed {nameof(MLHands.KeyPoseManager.SetPoseFilterLevel)}.");
             }
-
-            LuminHandDataConverter.HandMeshingEnabled = HandMeshingEnabled;
         }
 
         /// <inheritdoc />
         public override void Update()
         {
             base.Update();
 
+            LuminHandDataConverter.HandMeshingEnabled = RenderingMode == HandRenderingMode.Mesh;
+
             if (isEnabled)
             {
                 GetOrAddController(Handedness.Left).UpdateController(leftHandConverter.GetHandData());

XRTK.Lumin/Packages/com.xrtk.lumin/Runtime/Utilities/LuminHandDataConverter.cs

@@ -1,13 +1,15 @@
 // Copyright (c) XRTK. All rights reserved.
 // Licensed under the MIT License. See LICENSE in the project root for license information.
 
+using XRTK.Definitions.Controllers.Hands;
+using XRTK.Definitions.Utilities;
+
 #if PLATFORM_LUMIN
 
 using System;
 using UnityEngine;
-using UnityEngine.XR.MagicLeap;
-using XRTK.Definitions.Controllers.Hands;
-using XRTK.Definitions.Utilities;
+
+#endif // PLATFORM_LUMIN
 
 namespace XRTK.Lumin.Utilities
 {
@@ -27,6 +29,8 @@ public LuminHandDataConverter(Handedness handedness)
 
         private readonly Handedness handedness;
 
+#if PLATFORM_LUMIN
+
         /// <summary>
         /// Gets or sets whether hand mesh data should be read and converted.
         /// </summary>
@@ -51,6 +55,7 @@ public HandData GetHandData()
                 UpdateHandMesh(hand, updatedHandData.Mesh);
             }
 
+            PostProcess(updatedHandData);
             return updatedHandData;
         }
 
@@ -95,14 +100,14 @@ private static void UpdateHandJoints(MLHand hand, MixedRealityPose[] jointPoses)
                         jointPoses[i] = EstimatePalmPose(wrist.Center, middle.MCP);
                         break;
                     // Finger: Thumb
-                    case TrackedHandJoint.ThumbMetacarpalJoint:
+                    case TrackedHandJoint.ThumbMetacarpal:
                         jointPoses[i] = ComputeJointPose(thumb.MCP);
                         break;
-                    case TrackedHandJoint.ThumbProximalJoint:
+                    case TrackedHandJoint.ThumbProximal:
                         // TODO: Estimate?
                         jointPoses[i] = MixedRealityPose.ZeroIdentity;
                         break;
-                    case TrackedHandJoint.ThumbDistalJoint:
+                    case TrackedHandJoint.ThumbDistal:
                         jointPoses[i] = ComputeJointPose(thumb.IP);
                         break;
                     case TrackedHandJoint.ThumbTip:
@@ -113,13 +118,13 @@ private static void UpdateHandJoints(MLHand hand, MixedRealityPose[] jointPoses)
                         // TODO: Estimate?
                         jointPoses[i] = MixedRealityPose.ZeroIdentity;
                         break;
-                    case TrackedHandJoint.IndexKnuckle:
+                    case TrackedHandJoint.IndexProximal:
                         jointPoses[i] = ComputeJointPose(index.MCP);
                         break;
-                    case TrackedHandJoint.IndexMiddleJoint:
+                    case TrackedHandJoint.IndexIntermediate:
                         jointPoses[i] = ComputeJointPose(index.PIP);
                         break;
-                    case TrackedHandJoint.IndexDistalJoint:
+                    case TrackedHandJoint.IndexDistal:
                         // TODO: Estimate?
                         jointPoses[i] = MixedRealityPose.ZeroIdentity;
                         break;
@@ -131,13 +136,13 @@ private static void UpdateHandJoints(MLHand hand, MixedRealityPose[] jointPoses)
                         // TODO: Estimate?
                         jointPoses[i] = MixedRealityPose.ZeroIdentity;
                         break;
-                    case TrackedHandJoint.MiddleKnuckle:
+                    case TrackedHandJoint.MiddleProximal:
                         jointPoses[i] = ComputeJointPose(middle.MCP);
                         break;
-                    case TrackedHandJoint.MiddleMiddleJoint:
+                    case TrackedHandJoint.MiddleIntermediate:
                         jointPoses[i] = ComputeJointPose(middle.PIP);
                         break;
-                    case TrackedHandJoint.MiddleDistalJoint:
+                    case TrackedHandJoint.MiddleDistal:
                         // TODO: Estimate?
                         jointPoses[i] = MixedRealityPose.ZeroIdentity;
                         break;
@@ -149,37 +154,37 @@ private static void UpdateHandJoints(MLHand hand, MixedRealityPose[] jointPoses)
                         // TODO: Estimate?
                         jointPoses[i] = MixedRealityPose.ZeroIdentity;
                         break;
-                    case TrackedHandJoint.RingKnuckle:
+                    case TrackedHandJoint.RingProximal:
                         jointPoses[i] = ComputeJointPose(ring.MCP);
                         break;
-                    case TrackedHandJoint.RingMiddleJoint:
+                    case TrackedHandJoint.RingIntermediate:
                         // TODO: Estimate?
                         jointPoses[i] = MixedRealityPose.ZeroIdentity;
                         break;
-                    case TrackedHandJoint.RingDistalJoint:
+                    case TrackedHandJoint.RingDistal:
                         // TODO: Estimate?
                         jointPoses[i] = MixedRealityPose.ZeroIdentity;
                         break;
                     case TrackedHandJoint.RingTip:
                         jointPoses[i] = ComputeJointPose(ring.Tip);
                         break;
                     // Finger: Pinky
-                    case TrackedHandJoint.PinkyMetacarpal:
+                    case TrackedHandJoint.LittleMetacarpal:
                         // TODO: Estimate?
                         jointPoses[i] = MixedRealityPose.ZeroIdentity;
                         break;
-                    case TrackedHandJoint.PinkyKnuckle:
+                    case TrackedHandJoint.LittleProximal:
                         jointPoses[i] = ComputeJointPose(pinky.MCP);
                         break;
-                    case TrackedHandJoint.PinkyMiddleJoint:
+                    case TrackedHandJoint.LittleIntermediate:
                         // TODO: Estimate?
                         jointPoses[i] = MixedRealityPose.ZeroIdentity;
                         break;
-                    case TrackedHandJoint.PinkyDistalJoint:
+                    case TrackedHandJoint.LittleDistal:
                         // TODO: Estimate?
                         jointPoses[i] = MixedRealityPose.ZeroIdentity;
                         break;
-                    case TrackedHandJoint.PinkyTip:
+                    case TrackedHandJoint.LittleTip:
                         jointPoses[i] = ComputeJointPose(pinky.Tip);
                         break;
                 }
@@ -215,6 +220,7 @@ private static MixedRealityPose ComputeJointPose(MLKeyPoint keyPoint)
 
             return pose;
         }
+
+#endif // PLATFORM_LUMIN
     }
-}
-#endif // PLATFORM_LUMIN
+}