Add support for input and gestures for hand controllers

XRTK-Core/Assets/XRTK.Generated/_TestProfiles/TestMixedRealityToolkitRootProfile/MixedRealityInputSystemProfile.asset

@@ -164,10 +164,19 @@ MonoBehaviour:
   drawDebugPointingRays: 1
   debugPointingRayColors:
   - {r: 0, g: 1, b: 0, a: 1}
-  handMeshingEnabled: 1
+  renderingMode: 1
   handPhysicsEnabled: 0
   useTriggers: 0
   boundsMode: 0
+  trackedPoses:
+  - {fileID: 11400000, guid: 287ec39181134fc4eaee0a3a5e47ab9f, type: 2}
+  - {fileID: 11400000, guid: d3d67de686d952849b6771a111518e0d, type: 2}
+  - {fileID: 11400000, guid: 5269abf28f233044d9ec71f10b94552d, type: 2}
+  - {fileID: 11400000, guid: 0ece078ec16cbbd44bb7eba974dca862, type: 2}
+  - {fileID: 11400000, guid: 9fba060de129a9d4ea929a0d74fdc3fa, type: 2}
+  - {fileID: 11400000, guid: 1251200226ad995498472e45aaf12178, type: 2}
+  - {fileID: 11400000, guid: 5e6bcc3863bdc634d82a8a59598a070b, type: 2}
+  - {fileID: 11400000, guid: 2f6c29c72cd30c74f9717c932bd87a4a, type: 2}
   inputActionsProfile: {fileID: 11400000, guid: 399335ccc89c4d12b79f3539ca7771db,
     type: 2}
   speechCommandsProfile: {fileID: 11400000, guid: 89759c8b9c98420794a5d650ce3b2f90,

XRTK-Core/Packages/com.xrtk.core/Editor/ControllerPopupWindow.cs

@@ -130,6 +130,7 @@ public static void Show(MixedRealityControllerMappingProfile profile, Serialized
             }
 
             window = (ControllerPopupWindow)CreateInstance(typeof(ControllerPopupWindow));
+            window.currentControllerName = profile.ControllerType.Type.Name;
 
             window.currentControllerName = profile.ControllerType.Type.Name;
             window.titleContent = new GUIContent($"{window.currentControllerName} {handednessTitleText}Input Action Assignment");

XRTK-Core/Packages/com.xrtk.core/Editor/Data/Controllers/Simulation/Hands/SimulatedHandControllerPoseDataInspector.cs → XRTK-Core/Packages/com.xrtk.core/Editor/Data/Controllers/Hands/HandControllerPoseDefinitionInspector.cs

@@ -2,17 +2,18 @@
 // Licensed under the MIT License. See LICENSE in the project root for license information.
 
 using UnityEditor;
-using XRTK.Definitions.Controllers.Simulation.Hands;
+using XRTK.Definitions.Controllers.Hands;
 using XRTK.Editor.Profiles;
 
-namespace XRTK.Editor.Data.Controllers.Simulation.Hands
+namespace XRTK.Editor.Data.Controllers.Hands
 {
-    [CustomEditor(typeof(SimulatedHandControllerPoseData))]
-    public class SimulatedHandControllerPoseDataInspector : BaseMixedRealityProfileInspector
+    [CustomEditor(typeof(HandControllerPoseDefinition))]
+    public class HandControllerPoseDefinitionInspector : BaseMixedRealityProfileInspector
     {
         private SerializedProperty id;
         private SerializedProperty description;
         private SerializedProperty isDefault;
+        private SerializedProperty isSelectionPose;
         private SerializedProperty keyCode;
         private SerializedProperty data;
 
@@ -23,6 +24,7 @@ protected override void OnEnable()
             id = serializedObject.FindProperty(nameof(id));
             description = serializedObject.FindProperty(nameof(description));
             isDefault = serializedObject.FindProperty(nameof(isDefault));
+            isSelectionPose = serializedObject.FindProperty(nameof(isSelectionPose));
             keyCode = serializedObject.FindProperty(nameof(keyCode));
             data = serializedObject.FindProperty(nameof(data));
         }
@@ -36,6 +38,7 @@ public override void OnInspectorGUI()
             EditorGUILayout.PropertyField(id);
             EditorGUILayout.PropertyField(description);
             EditorGUILayout.PropertyField(isDefault);
+            EditorGUILayout.PropertyField(isSelectionPose);
             EditorGUILayout.PropertyField(keyCode);
             EditorGUILayout.PropertyField(data);
 

XRTK-Core/Packages/com.xrtk.core/Editor/Data/EditorWindowOptions.json

@@ -484,32 +484,6 @@
                 true
             ]
         },
-        {
-            "Controller": "MixedRealityHandController",
-            "Handedness": 1,
-            "InputLabelPositions": [
-                {
-                    "x": 413.0,
-                    "y": 125.0
-                }
-            ],
-            "IsLabelFlipped": [
-                false
-            ]
-        },
-        {
-            "Controller": "MixedRealityHandController",
-            "Handedness": 2,
-            "InputLabelPositions": [
-                {
-                    "x": 3.0,
-                    "y": 125.0
-                }
-            ],
-            "IsLabelFlipped": [
-                true
-            ]
-        },
         {
             "Controller": "OculusTouchController",
             "Handedness": 1,
@@ -711,102 +685,6 @@
                 false
             ]
         },
-        {
-            "Controller": "SimulatedMixedRealityHandController",
-            "Handedness": 1,
-            "InputLabelPositions": [
-                {
-                    "x": 480.0,
-                    "y": 80.0
-                },
-                {
-                    "x": 480.0,
-                    "y": 100.0
-                },
-                {
-                    "x": 480.0,
-                    "y": 120.0
-                },
-                {
-                    "x": 480.0,
-                    "y": 140.0
-                },
-                {
-                    "x": 480.0,
-                    "y": 160.0
-                },
-                {
-                    "x": 480.0,
-                    "y": 180.0
-                },
-                {
-                    "x": 480.0,
-                    "y": 200.0
-                },
-                {
-                    "x": 480.0,
-                    "y": 220.0
-                }
-            ],
-            "IsLabelFlipped": [
-                false,
-                false,
-                false,
-                false,
-                false,
-                false,
-                false,
-                false
-            ]
-        },
-        {
-            "Controller": "SimulatedMixedRealityHandController",
-            "Handedness": 2,
-            "InputLabelPositions": [
-                {
-                    "x": -55.0,
-                    "y": 80.0
-                },
-                {
-                    "x": -55.0,
-                    "y": 100.0
-                },
-                {
-                    "x": -55.0,
-                    "y": 120.0
-                },
-                {
-                    "x": -55.0,
-                    "y": 140.0
-                },
-                {
-                    "x": -55.0,
-                    "y": 160.0
-                },
-                {
-                    "x": -55.0,
-                    "y": 180.0
-                },
-                {
-                    "x": -55.0,
-                    "y": 200.0
-                },
-                {
-                    "x": -55.0,
-                    "y": 220.0
-                }
-            ],
-            "IsLabelFlipped": [
-                true,
-                true,
-                true,
-                true,
-                true,
-                true,
-                true,
-                true
-            ]
-        },
         {
             "Controller": "OculusTouchOpenVRController",
             "Handedness": 2,
@@ -1370,6 +1248,44 @@
                 false,
                 false
             ]
+        },
+        {
+            "Controller": "MixedRealityHandController",
+            "Handedness": 1,
+            "InputLabelPositions": [
+                {
+                    "x": 483.0,
+                    "y": 205.0
+                },
+                {
+                    "x": -170.0,
+                    "y": 99.0
+                },
+                {
+                    "x": 437.0,
+                    "y": 58.0
+                },
+                {
+                    "x": 336.0,
+                    "y": 323.0
+                },
+                {
+                    "x": 433.0,
+                    "y": 80.0
+                },
+                {
+                    "x": 336.0,
+                    "y": 349.0
+                }
+            ],
+            "IsLabelFlipped": [
+                false,
+                true,
+                false,
+                false,
+                false,
+                false
+            ]
         }
     ]
 }

XRTK-Core/Packages/com.xrtk.core/Editor/Profiles/InputSystem/Controllers/Hands/BaseMixedRealityHandControllerDataProviderProfileInspector.cs

@@ -11,10 +11,11 @@ namespace XRTK.Editor.Profiles.InputSystem.Controllers
     [CustomEditor(typeof(BaseHandControllerDataProviderProfile), true, isFallback = true)]
     public class BaseMixedRealityHandControllerDataProviderProfileInspector : BaseMixedRealityControllerDataProviderProfileInspector
     {
-        private SerializedProperty handMeshingEnabled;
+        private SerializedProperty renderingMode;
         private SerializedProperty handPhysicsEnabled;
         private SerializedProperty useTriggers;
         private SerializedProperty boundsMode;
+        private SerializedProperty trackedPoses;
 
         private bool showHandTrackingSettings = true;
         private static readonly GUIContent handTrackingSettingsFoldoutHeader = new GUIContent("Hand Tracking Settings");
@@ -23,10 +24,11 @@ protected override void OnEnable()
         {
             base.OnEnable();
 
-            handMeshingEnabled = serializedObject.FindProperty(nameof(handMeshingEnabled));
+            renderingMode = serializedObject.FindProperty(nameof(renderingMode));
             handPhysicsEnabled = serializedObject.FindProperty(nameof(handPhysicsEnabled));
             useTriggers = serializedObject.FindProperty(nameof(useTriggers));
             boundsMode = serializedObject.FindProperty(nameof(boundsMode));
+            trackedPoses = serializedObject.FindProperty(nameof(trackedPoses));
         }
 
         public override void OnInspectorGUI()
@@ -39,18 +41,27 @@ public override void OnInspectorGUI()
             if (showHandTrackingSettings)
             {
                 EditorGUI.indentLevel++;
+
                 EditorGUILayout.LabelField("Hand Rendering Settings");
                 EditorGUI.indentLevel++;
-                EditorGUILayout.PropertyField(handMeshingEnabled);
-                EditorGUI.indentLevel--;
+                EditorGUILayout.PropertyField(renderingMode);
                 EditorGUILayout.Space();
+                EditorGUI.indentLevel--;
+
                 EditorGUILayout.LabelField("Hand Physics Settings");
                 EditorGUI.indentLevel++;
                 EditorGUILayout.PropertyField(handPhysicsEnabled);
                 EditorGUILayout.PropertyField(useTriggers);
                 EditorGUILayout.PropertyField(boundsMode);
                 EditorGUILayout.Space();
                 EditorGUI.indentLevel--;
+
+                EditorGUILayout.LabelField("Tracked Hand Poses");
+                EditorGUI.indentLevel++;
+                EditorGUILayout.PropertyField(trackedPoses, true);
+                EditorGUILayout.Space();
+                EditorGUI.indentLevel--;
+
                 EditorGUI.indentLevel--;
             }