Add SupportedUnityXRPipelines to MixedRealityControllerAttribute

keveleigh · keveleigh · commit 886704d0ad4d · 2021-04-15T14:54:54.000-07:00
diff --git a/Assets/MRTK/Core/Attributes/MixedRealityControllerAttribute.cs b/Assets/MRTK/Core/Attributes/MixedRealityControllerAttribute.cs
@@ -38,19 +38,26 @@ public class MixedRealityControllerAttribute : Attribute
         /// </summary>
         public MixedRealityControllerConfigurationFlags Flags { get; }
 
+        /// <summary>
+        /// Additional flags for configuring controller capabilities.
+        /// </summary>
+        public SupportedUnityXRPipelines SupportedUnityXRPipelines { get; }
+
         /// <summary>
         /// 
         /// </summary>
         public MixedRealityControllerAttribute(
             SupportedControllerType supportedControllerType,
             Handedness[] supportedHandedness,
             string texturePath = "",
-            MixedRealityControllerConfigurationFlags flags = 0)
+            MixedRealityControllerConfigurationFlags flags = 0,
+            SupportedUnityXRPipelines supportedUnityXRPipelines = (SupportedUnityXRPipelines)(-1))
         {
             SupportedControllerType = supportedControllerType;
             SupportedHandedness = supportedHandedness;
             TexturePath = texturePath;
             Flags = flags;
+            SupportedUnityXRPipelines = supportedUnityXRPipelines;
         }
 
         /// <summary>
diff --git a/Assets/MRTK/Providers/Oculus/XRSDK/Controllers/OculusXRSDKTouchController.cs b/Assets/MRTK/Providers/Oculus/XRSDK/Controllers/OculusXRSDKTouchController.cs
@@ -18,7 +18,8 @@ namespace Microsoft.MixedReality.Toolkit.XRSDK.Oculus.Input
     [MixedRealityController(
         SupportedControllerType.OculusTouch,
         new[] { Handedness.Left, Handedness.Right },
-        "Textures/OculusControllersTouch")]
+        "Textures/OculusControllersTouch",
+        supportedUnityXRPipelines: SupportedUnityXRPipelines.XRSDK)]
     public class OculusXRSDKTouchController : GenericXRSDKController
     {
         /// <summary>
diff --git a/Assets/MRTK/Providers/Oculus/XRSDK/MRTK-Quest/Scripts/Input/Controllers/OculusHand.cs b/Assets/MRTK/Providers/Oculus/XRSDK/MRTK-Quest/Scripts/Input/Controllers/OculusHand.cs
@@ -44,7 +44,8 @@ namespace Microsoft.MixedReality.Toolkit.XRSDK.Oculus.Input
     /// </summary>
     [MixedRealityController(
         SupportedControllerType.ArticulatedHand,
-        new[] { Handedness.Left, Handedness.Right })]
+        new[] { Handedness.Left, Handedness.Right },
+        supportedUnityXRPipelines: SupportedUnityXRPipelines.XRSDK)]
     public class OculusHand : BaseHand
     {
         private MixedRealityPose currentPointerPose = MixedRealityPose.ZeroIdentity;
diff --git a/Assets/MRTK/Providers/OpenVR/GenericOpenVRController.cs b/Assets/MRTK/Providers/OpenVR/GenericOpenVRController.cs
@@ -15,7 +15,8 @@ namespace Microsoft.MixedReality.Toolkit.OpenVR.Input
     [MixedRealityController(
         SupportedControllerType.GenericOpenVR,
         new[] { Handedness.Left, Handedness.Right },
-        flags: MixedRealityControllerConfigurationFlags.UseCustomInteractionMappings)]
+        flags: MixedRealityControllerConfigurationFlags.UseCustomInteractionMappings,
+        supportedUnityXRPipelines: SupportedUnityXRPipelines.LegacyXR)]
     public class GenericOpenVRController : GenericJoystickController
     {
         public GenericOpenVRController(
diff --git a/Assets/MRTK/Providers/OpenVR/HPMotionController.cs b/Assets/MRTK/Providers/OpenVR/HPMotionController.cs
@@ -12,7 +12,8 @@ namespace Microsoft.MixedReality.Toolkit.OpenVR.Input
     /// </summary>
     [MixedRealityController(
         SupportedControllerType.HPMotionController,
-        new[] { Handedness.Left, Handedness.Right })]
+        new[] { Handedness.Left, Handedness.Right },
+        supportedUnityXRPipelines: SupportedUnityXRPipelines.LegacyXR)]
     public class HPMotionController : GenericOpenVRController
     {
         /// <summary>
diff --git a/Assets/MRTK/Providers/OpenVR/OculusRemoteController.cs b/Assets/MRTK/Providers/OpenVR/OculusRemoteController.cs
@@ -10,7 +10,8 @@ namespace Microsoft.MixedReality.Toolkit.OpenVR.Input
     [MixedRealityController(
         SupportedControllerType.OculusRemote,
         new[] { Handedness.None },
-        "Textures/OculusRemoteController")]
+        "Textures/OculusRemoteController",
+        supportedUnityXRPipelines: SupportedUnityXRPipelines.LegacyXR)]
     public class OculusRemoteController : GenericOpenVRController
     {
         /// <summary>
diff --git a/Assets/MRTK/Providers/OpenVR/OculusTouchController.cs b/Assets/MRTK/Providers/OpenVR/OculusTouchController.cs
@@ -10,7 +10,8 @@ namespace Microsoft.MixedReality.Toolkit.OpenVR.Input
     [MixedRealityController(
         SupportedControllerType.OculusTouch,
         new[] { Handedness.Left, Handedness.Right },
-        "Textures/OculusControllersTouch")]
+        "Textures/OculusControllersTouch",
+        supportedUnityXRPipelines: SupportedUnityXRPipelines.LegacyXR)]
     public class OculusTouchController : GenericOpenVRController
     {
         /// <summary>
diff --git a/Assets/MRTK/Providers/OpenVR/ViveKnucklesController.cs b/Assets/MRTK/Providers/OpenVR/ViveKnucklesController.cs
@@ -9,7 +9,8 @@ namespace Microsoft.MixedReality.Toolkit.OpenVR.Input
 {
     [MixedRealityController(
         SupportedControllerType.ViveKnuckles,
-        new[] { Handedness.Left, Handedness.Right })]
+        new[] { Handedness.Left, Handedness.Right },
+        supportedUnityXRPipelines: SupportedUnityXRPipelines.LegacyXR)]
     public class ViveKnucklesController : GenericOpenVRController
     {
         /// <summary>
diff --git a/Assets/MRTK/Providers/OpenVR/ViveWandController.cs b/Assets/MRTK/Providers/OpenVR/ViveWandController.cs
@@ -10,7 +10,8 @@ namespace Microsoft.MixedReality.Toolkit.OpenVR.Input
     [MixedRealityController(
         SupportedControllerType.ViveWand,
         new[] { Handedness.Left, Handedness.Right },
-        "Textures/ViveWandController")]
+        "Textures/ViveWandController",
+        supportedUnityXRPipelines: SupportedUnityXRPipelines.LegacyXR)]
     public class ViveWandController : GenericOpenVRController
     {
         /// <summary>
diff --git a/Assets/MRTK/Providers/OpenVR/WindowsMixedRealityOpenVRMotionController.cs b/Assets/MRTK/Providers/OpenVR/WindowsMixedRealityOpenVRMotionController.cs
@@ -13,7 +13,8 @@ namespace Microsoft.MixedReality.Toolkit.OpenVR.Input
     [MixedRealityController(
         SupportedControllerType.WindowsMixedReality,
         new[] { Handedness.Left, Handedness.Right },
-        "Textures/MotionController")]
+        "Textures/MotionController",
+        supportedUnityXRPipelines: SupportedUnityXRPipelines.LegacyXR)]
     public class WindowsMixedRealityOpenVRMotionController : GenericOpenVRController
     {
         /// <summary>
diff --git a/Assets/MRTK/Providers/WindowsMixedReality/XR2018/Controllers/HPMotionController.cs b/Assets/MRTK/Providers/WindowsMixedReality/XR2018/Controllers/HPMotionController.cs
@@ -19,7 +19,8 @@ namespace Microsoft.MixedReality.Toolkit.WindowsMixedReality.Input
     /// </summary>
     [MixedRealityController(
         SupportedControllerType.HPMotionController,
-        new[] { Handedness.Left, Handedness.Right })]
+        new[] { Handedness.Left, Handedness.Right },
+        supportedUnityXRPipelines: SupportedUnityXRPipelines.LegacyXR)]
     public class HPMotionController : WindowsMixedRealityController
     {
 #if HP_CONTROLLER_ENABLED
diff --git a/Assets/MRTK/Providers/WindowsMixedReality/XR2018/Controllers/WindowsMixedRealityArticulatedHand.cs b/Assets/MRTK/Providers/WindowsMixedReality/XR2018/Controllers/WindowsMixedRealityArticulatedHand.cs
@@ -29,7 +29,8 @@ namespace Microsoft.MixedReality.Toolkit.WindowsMixedReality.Input
     /// </summary>
     [MixedRealityController(
         SupportedControllerType.ArticulatedHand,
-        new[] { Handedness.Left, Handedness.Right })]
+        new[] { Handedness.Left, Handedness.Right },
+        supportedUnityXRPipelines: SupportedUnityXRPipelines.LegacyXR)]
     public class WindowsMixedRealityArticulatedHand : BaseWindowsMixedRealitySource, IMixedRealityHand
     {
         /// <summary>
diff --git a/Assets/MRTK/Providers/WindowsMixedReality/XR2018/Controllers/WindowsMixedRealityController.cs b/Assets/MRTK/Providers/WindowsMixedReality/XR2018/Controllers/WindowsMixedRealityController.cs
@@ -17,7 +17,8 @@ namespace Microsoft.MixedReality.Toolkit.WindowsMixedReality.Input
     [MixedRealityController(
         SupportedControllerType.WindowsMixedReality,
         new[] { Handedness.Left, Handedness.Right },
-        "Textures/MotionController")]
+        "Textures/MotionController",
+        supportedUnityXRPipelines: SupportedUnityXRPipelines.LegacyXR)]
     public class WindowsMixedRealityController : BaseWindowsMixedRealitySource
     {
         /// <summary>
diff --git a/Assets/MRTK/Providers/WindowsMixedReality/XR2018/Controllers/WindowsMixedRealityGGVHand.cs b/Assets/MRTK/Providers/WindowsMixedReality/XR2018/Controllers/WindowsMixedRealityGGVHand.cs
@@ -11,7 +11,8 @@ namespace Microsoft.MixedReality.Toolkit.WindowsMixedReality.Input
     /// </summary>
     [MixedRealityController(
         SupportedControllerType.GGVHand,
-        new[] { Handedness.Left, Handedness.Right, Handedness.None })]
+        new[] { Handedness.Left, Handedness.Right, Handedness.None },
+        supportedUnityXRPipelines: SupportedUnityXRPipelines.LegacyXR)]
     public class WindowsMixedRealityGGVHand : BaseWindowsMixedRealitySource
     {
         public WindowsMixedRealityGGVHand(
diff --git a/Assets/MRTK/Providers/WindowsMixedReality/XRSDK/Controllers/HPMotionController.cs b/Assets/MRTK/Providers/WindowsMixedReality/XRSDK/Controllers/HPMotionController.cs
@@ -17,7 +17,8 @@ namespace Microsoft.MixedReality.Toolkit.XRSDK.WindowsMixedReality
     /// </summary>
     [MixedRealityController(
         SupportedControllerType.HPMotionController,
-        new[] { Handedness.Left, Handedness.Right })]
+        new[] { Handedness.Left, Handedness.Right },
+        supportedUnityXRPipelines: SupportedUnityXRPipelines.XRSDK)]
     public class HPMotionController : WindowsMixedRealityXRSDKMotionController
     {
 #if HP_CONTROLLER_ENABLED
diff --git a/Assets/MRTK/Providers/WindowsMixedReality/XRSDK/Controllers/WindowsMixedRealityXRSDKArticulatedHand.cs b/Assets/MRTK/Providers/WindowsMixedReality/XRSDK/Controllers/WindowsMixedRealityXRSDKArticulatedHand.cs
@@ -24,7 +24,8 @@ namespace Microsoft.MixedReality.Toolkit.XRSDK.WindowsMixedReality
     /// </summary>
     [MixedRealityController(
         SupportedControllerType.ArticulatedHand,
-        new[] { Handedness.Left, Handedness.Right })]
+        new[] { Handedness.Left, Handedness.Right },
+        supportedUnityXRPipelines: SupportedUnityXRPipelines.XRSDK)]
     public class WindowsMixedRealityXRSDKArticulatedHand : BaseWindowsMixedRealityXRSDKSource, IMixedRealityHand
     {
         /// <summary>
diff --git a/Assets/MRTK/Providers/WindowsMixedReality/XRSDK/Controllers/WindowsMixedRealityXRSDKGGVHand.cs b/Assets/MRTK/Providers/WindowsMixedReality/XRSDK/Controllers/WindowsMixedRealityXRSDKGGVHand.cs
@@ -11,7 +11,8 @@ namespace Microsoft.MixedReality.Toolkit.XRSDK.WindowsMixedReality
     /// </summary>
     [MixedRealityController(
         SupportedControllerType.GGVHand,
-        new[] { Handedness.Left, Handedness.Right, Handedness.None })]
+        new[] { Handedness.Left, Handedness.Right, Handedness.None },
+        supportedUnityXRPipelines: SupportedUnityXRPipelines.XRSDK)]
     public class WindowsMixedRealityXRSDKGGVHand : BaseWindowsMixedRealityXRSDKSource
     {
         public WindowsMixedRealityXRSDKGGVHand(
diff --git a/Assets/MRTK/Providers/WindowsMixedReality/XRSDK/Controllers/WindowsMixedRealityXRSDKMotionController.cs b/Assets/MRTK/Providers/WindowsMixedReality/XRSDK/Controllers/WindowsMixedRealityXRSDKMotionController.cs
@@ -19,7 +19,8 @@ namespace Microsoft.MixedReality.Toolkit.XRSDK.WindowsMixedReality
     [MixedRealityController(
         SupportedControllerType.WindowsMixedReality,
         new[] { Handedness.Left, Handedness.Right },
-        "Textures/MotionController")]
+        "Textures/MotionController",
+        supportedUnityXRPipelines: SupportedUnityXRPipelines.XRSDK)]
     public class WindowsMixedRealityXRSDKMotionController : BaseWindowsMixedRealityXRSDKSource
     {
         /// <summary>
diff --git a/Assets/MRTK/Providers/XRSDK/Controllers/GenericXRSDKController.cs b/Assets/MRTK/Providers/XRSDK/Controllers/GenericXRSDKController.cs
@@ -12,7 +12,8 @@ namespace Microsoft.MixedReality.Toolkit.XRSDK.Input
     [MixedRealityController(
         SupportedControllerType.GenericUnity,
         new[] { Handedness.Left, Handedness.Right },
-        flags: MixedRealityControllerConfigurationFlags.UseCustomInteractionMappings)]
+        flags: MixedRealityControllerConfigurationFlags.UseCustomInteractionMappings,
+        supportedUnityXRPipelines: SupportedUnityXRPipelines.XRSDK)]
     public class GenericXRSDKController : BaseController
     {
         public GenericXRSDKController(

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,8 @@ namespace Microsoft.MixedReality.Toolkit.OpenVR.Input`
`9`	`9`	`{`
`10`	`10`	`[MixedRealityController(`
`11`	`11`	`SupportedControllerType.ViveKnuckles,`
`12`		`- new[] { Handedness.Left, Handedness.Right })]`
	`12`	`+ new[] { Handedness.Left, Handedness.Right },`
	`13`	`+ supportedUnityXRPipelines: SupportedUnityXRPipelines.LegacyXR)]`
`13`	`14`	`public class ViveKnucklesController : GenericOpenVRController`
`14`	`15`	`{`
`15`	`16`	`/// <summary>`