Oculus Quest OpenVR support

XRTK-Core/Packages/com.xrtk.core/Definitions/Controllers/OpenVR/OculusQuestControllerMappingProfile.cs

@@ -0,0 +1,33 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See LICENSE in the project root for license information.
+
+using UnityEngine;
+using XRTK.Definitions.Devices;
+using XRTK.Definitions.Utilities;
+
+namespace XRTK.Providers.Controllers.OpenVR
+{
+    [CreateAssetMenu(menuName = "Mixed Reality Toolkit/Input System/Controller Mappings/Oculus Quest Controller Mapping Profile", fileName = "OculusQuestControllerMappingProfile")]
+    public class OculusQuestControllerMappingProfile : BaseMixedRealityControllerMappingProfile
+    {
+        /// <inheritdoc />
+        public override SupportedControllerType ControllerType => SupportedControllerType.OculusQuest;
+
+        /// <inheritdoc />
+        public override string TexturePath => $"{base.TexturePath}OculusControllersTouch";
+
+        protected override void Awake()
+        {
+            if (!HasSetupDefaults)
+            {
+                ControllerMappings = new[]
+                {
+                    new MixedRealityControllerMapping("Oculus Quest Controller Left", typeof(OculusQuestController), Handedness.Left),
+                    new MixedRealityControllerMapping("Oculus Quest Controller Right", typeof(OculusQuestController), Handedness.Right),
+                };
+            }
+
+            base.Awake();
+        }
+    }
+}

XRTK-Core/Packages/com.xrtk.core/Inspectors/Profiles/DataProviders/Controllers/OpenVR/OculusQuestControllerMappingProfileInspector.cs

@@ -0,0 +1,11 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See LICENSE in the project root for license information.
+
+using UnityEditor;
+using XRTK.Inspectors.Profiles;
+
+namespace XRTK.Providers.Controllers.OpenVR.Inspectors.Profiles
+{
+    [CustomEditor(typeof(OculusQuestControllerMappingProfile))]
+    public class OculusQuestControllerMappingProfileInspector : BaseMixedRealityControllerMappingProfileInspector { }
+}

XRTK-Core/Packages/com.xrtk.core/Providers/Controllers/OpenVR/OculusQuestController.cs

@@ -0,0 +1,72 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See LICENSE in the project root for license information.
+
+using UnityEngine;
+using XRTK.Definitions.Devices;
+using XRTK.Definitions.InputSystem;
+using XRTK.Definitions.Utilities;
+using XRTK.Interfaces.InputSystem;
+
+namespace XRTK.Providers.Controllers.OpenVR
+{
+    public class OculusQuestController : GenericOpenVRController
+    {
+        /// <summary>
+        /// Constructor.
+        /// </summary>
+        /// <param name="trackingState"></param>
+        /// <param name="controllerHandedness"></param>
+        /// <param name="inputSource"></param>
+        /// <param name="interactions"></param>
+        public OculusQuestController(TrackingState trackingState, Handedness controllerHandedness,
+            IMixedRealityInputSource inputSource = null, MixedRealityInteractionMapping[] interactions = null)
+            : base(trackingState, controllerHandedness, inputSource, interactions)
+        {
+        }
+
+        /// <inheritdoc />
+        public override MixedRealityInteractionMapping[] DefaultLeftHandedInteractions => new[]
+        {
+            new MixedRealityInteractionMapping(0, "Spatial Pointer", AxisType.SixDof, DeviceInputType.SpatialPointer, MixedRealityInputAction.None),
+            new MixedRealityInteractionMapping(1, "Spatial Grip", AxisType.SixDof, DeviceInputType.SpatialGrip, MixedRealityInputAction.None),
+            new MixedRealityInteractionMapping(2, "Axis1D.PrimaryIndexTrigger", AxisType.SingleAxis, DeviceInputType.Trigger, ControllerMappingLibrary.AXIS_9),
+            new MixedRealityInteractionMapping(3, "Axis1D.PrimaryIndexTrigger Touch", AxisType.Digital, DeviceInputType.TriggerTouch, KeyCode.JoystickButton14),
+            new MixedRealityInteractionMapping(4, "Axis1D.PrimaryIndexTrigger Near Touch", AxisType.Digital, DeviceInputType.TriggerNearTouch, ControllerMappingLibrary.AXIS_13),
+            new MixedRealityInteractionMapping(5, "Axis1D.PrimaryIndexTrigger Press", AxisType.Digital, DeviceInputType.TriggerPress, ControllerMappingLibrary.AXIS_9),
+            new MixedRealityInteractionMapping(6, "Axis1D.PrimaryHandTrigger", AxisType.Digital, DeviceInputType.Trigger, KeyCode.JoystickButton4),
+            new MixedRealityInteractionMapping(7, "Axis1D.PrimaryHandTrigger Press", AxisType.SingleAxis, DeviceInputType.Trigger, ControllerMappingLibrary.AXIS_11),
+            new MixedRealityInteractionMapping(8, "Axis2D.PrimaryThumbstick", AxisType.DualAxis, DeviceInputType.ThumbStick, ControllerMappingLibrary.AXIS_1, ControllerMappingLibrary.AXIS_2),
+            new MixedRealityInteractionMapping(9, "Button.PrimaryThumbstick Press", AxisType.Digital, DeviceInputType.ThumbStickPress, KeyCode.JoystickButton16),
+            new MixedRealityInteractionMapping(10, "Button.Three Press", AxisType.Digital, DeviceInputType.ButtonPress, KeyCode.JoystickButton12),
+            new MixedRealityInteractionMapping(11, "Button.Four Press", AxisType.Digital, DeviceInputType.ButtonPress, KeyCode.JoystickButton13),
+            new MixedRealityInteractionMapping(12, "Button.Start Press", AxisType.Digital, DeviceInputType.ButtonPress, KeyCode.JoystickButton7),
+            new MixedRealityInteractionMapping(13, "Thumb Touch", AxisType.SingleAxis, DeviceInputType.Trigger, ControllerMappingLibrary.AXIS_15),
+            new MixedRealityInteractionMapping(14, "Menu Button", AxisType.Digital, DeviceInputType.ButtonPress,  KeyCode.JoystickButton6)
+        };
+
+        /// <inheritdoc />
+        public override MixedRealityInteractionMapping[] DefaultRightHandedInteractions => new[]
+        {
+            new MixedRealityInteractionMapping(0, "Spatial Pointer", AxisType.SixDof, DeviceInputType.SpatialPointer, MixedRealityInputAction.None),
+            new MixedRealityInteractionMapping(1, "Spatial Grip", AxisType.SixDof, DeviceInputType.SpatialGrip, MixedRealityInputAction.None),
+            new MixedRealityInteractionMapping(2, "Axis1D.PrimaryIndexTrigger", AxisType.SingleAxis, DeviceInputType.Trigger, ControllerMappingLibrary.AXIS_10),
+            new MixedRealityInteractionMapping(3, "Axis1D.PrimaryIndexTrigger Touch", AxisType.Digital, DeviceInputType.TriggerTouch, KeyCode.JoystickButton15),
+            new MixedRealityInteractionMapping(4, "Axis1D.PrimaryIndexTrigger Near Touch", AxisType.Digital, DeviceInputType.TriggerNearTouch, ControllerMappingLibrary.AXIS_14),
+            new MixedRealityInteractionMapping(5, "Axis1D.PrimaryIndexTrigger Press", AxisType.Digital, DeviceInputType.TriggerPress, ControllerMappingLibrary.AXIS_10),
+            new MixedRealityInteractionMapping(6, "Axis1D.PrimaryHandTrigger", AxisType.Digital, DeviceInputType.Trigger, KeyCode.JoystickButton5),
+            new MixedRealityInteractionMapping(7, "Axis1D.PrimaryHandTrigger Press", AxisType.SingleAxis, DeviceInputType.Trigger, ControllerMappingLibrary.AXIS_11),
+            new MixedRealityInteractionMapping(8, "Axis2D.PrimaryThumbstick", AxisType.DualAxis, DeviceInputType.ThumbStick, ControllerMappingLibrary.AXIS_4, ControllerMappingLibrary.AXIS_5),
+            new MixedRealityInteractionMapping(9, "Button.PrimaryThumbstick Press", AxisType.Digital, DeviceInputType.ThumbStickPress, KeyCode.JoystickButton17),
+            new MixedRealityInteractionMapping(10, "Button.Three Press", AxisType.Digital, DeviceInputType.ButtonPress, KeyCode.JoystickButton10),
+            new MixedRealityInteractionMapping(11, "Button.Four Press", AxisType.Digital, DeviceInputType.ButtonPress, KeyCode.JoystickButton11),
+            new MixedRealityInteractionMapping(12, "Button.Start Press", AxisType.Digital, DeviceInputType.ButtonPress, KeyCode.JoystickButton7),
+            new MixedRealityInteractionMapping(13, "Thumb Touch", AxisType.SingleAxis, DeviceInputType.Trigger, ControllerMappingLibrary.AXIS_17)
+        };
+
+        /// <inheritdoc />
+        public override void SetupDefaultInteractions(Handedness controllerHandedness)
+        {
+            AssignControllerMappings(controllerHandedness == Handedness.Left ? DefaultLeftHandedInteractions : DefaultRightHandedInteractions);
+        }
+    }
+}

XRTK-Core/Packages/com.xrtk.core/Providers/Controllers/OpenVR/OpenVRDataProvider.cs

@@ -77,6 +77,9 @@ protected override GenericJoystickController GetOrAddController(string joystickN
                 case SupportedControllerType.OculusGo:
                     controllerType = typeof(OculusGoOpenVRController);
                     break;
+                case SupportedControllerType.OculusQuest:
+                    controllerType = typeof(OculusQuestController);
+                    break;
                 case SupportedControllerType.WindowsMixedReality:
                     controllerType = typeof(WindowsMixedRealityOpenVRMotionController);
                     break;
@@ -131,6 +134,11 @@ protected override SupportedControllerType GetCurrentControllerType(string joyst
                 return SupportedControllerType.OculusGo;
             }
 
+            if (joystickName.Contains("Oculus Quest"))
+            {
+                return SupportedControllerType.OculusQuest;
+            }
+
             if (joystickName.Contains("Oculus remote"))
             {
                 return SupportedControllerType.OculusRemote;

XRTK-Core/Packages/com.xrtk.core/Providers/Controllers/UnityInput/GenericJoystickController.cs

@@ -150,6 +150,7 @@ protected void UpdateSingleAxisData(MixedRealityInteractionMapping interactionMa
                     // If our value was updated, raise it.
                     if (interactionMapping.Updated)
                     {
+                        Debug.LogError($"Interaction updated {interactionMapping.Description} - Value [{interactionMapping.FloatData}]");
                         // Raise input system Event if it enabled
                         MixedRealityToolkit.InputSystem?.RaiseOnInputPressed(InputSource, ControllerHandedness, interactionMapping.MixedRealityInputAction, interactionMapping.FloatData);
                     }
@@ -176,6 +177,7 @@ protected void UpdateSingleAxisData(MixedRealityInteractionMapping interactionMa
             // If our value was updated, raise it.
             if (interactionMapping.Updated)
             {
+                Debug.LogError($"Interaction updated {interactionMapping.Description} - Value [{interactionMapping.FloatData}]");
                 MixedRealityToolkit.InputSystem?.RaiseOnInputPressed(InputSource, ControllerHandedness, interactionMapping.MixedRealityInputAction, singleAxisValue);
             }
         }