Merge pull request #9670 from keveleigh/add-enum-to-attributes

Add SupportedUnityXRPipelines enum to attributes

Author: keveleigh

Assets/MRTK/Core/Attributes/MixedRealityControllerAttribute.cs

@@ -38,19 +38,26 @@ public class MixedRealityControllerAttribute : Attribute
         /// </summary>
         public MixedRealityControllerConfigurationFlags Flags { get; }
 
+        /// <summary>
+        /// The supported Unity XR pipelines for this controller.
+        /// </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>

Assets/MRTK/Core/Attributes/MixedRealityDataProviderAttribute.cs

@@ -9,23 +9,31 @@ namespace Microsoft.MixedReality.Toolkit
     /// <summary>
     /// Attribute that defines the properties of a Mixed Reality Toolkit data provider.
     /// </summary>
-    [AttributeUsage(System.AttributeTargets.Class, AllowMultiple = false)]
+    [AttributeUsage(AttributeTargets.Class, AllowMultiple = false)]
     public class MixedRealityDataProviderAttribute : MixedRealityExtensionServiceAttribute
     {
         /// <summary>
         /// The interface type of the IMixedRealityService for which the data provider is supported.
         /// </summary>
         public Type ServiceInterfaceType { get; }
 
+        /// <summary>
+        /// The supported Unity XR pipelines for this data provider.
+        /// </summary>
+        public SupportedUnityXRPipelines SupportedUnityXRPipelines { get; }
+
         public MixedRealityDataProviderAttribute(
             Type serviceInterfaceType,
             SupportedPlatforms runtimePlatforms,
             string name = "",
             string profilePath = "",
             string packageFolder = "MixedRealityToolkit",
-            bool requiresProfile = false) : base(runtimePlatforms, name, profilePath, packageFolder, requiresProfile)
+            bool requiresProfile = false,
+            SupportedUnityXRPipelines supportedUnityXRPipelines = (SupportedUnityXRPipelines)(-1))
+            : base(runtimePlatforms, name, profilePath, packageFolder, requiresProfile)
         {
             ServiceInterfaceType = serviceInterfaceType;
+            SupportedUnityXRPipelines = supportedUnityXRPipelines;
         }
     }
 }

Assets/MRTK/Core/Definitions/Utilities/SupportedPlatforms.cs

@@ -6,7 +6,7 @@
 namespace Microsoft.MixedReality.Toolkit.Utilities
 {
     /// <summary>
-    /// The supported platforms for Mixed Reality Toolkit Components and Features.
+    /// The supported platforms for Mixed Reality Toolkit components and features.
     /// </summary>
     [Flags]
     public enum SupportedPlatforms
@@ -23,4 +23,14 @@ public enum SupportedPlatforms
         Web = 1 << 9,
         Lumin = 1 << 10
     }
+
+    /// <summary>
+    /// The supported Unity XR pipelines for Mixed Reality Toolkit components and features.
+    /// </summary>
+    [Flags]
+    public enum SupportedUnityXRPipelines
+    {
+        LegacyXR = 1 << 0,
+        XRSDK = 1 << 1,
+    }
 }

Assets/MRTK/Core/Providers/UnityInput/UnityJoystickManager.cs

@@ -17,7 +17,8 @@ namespace Microsoft.MixedReality.Toolkit.Input.UnityInput
     [MixedRealityDataProvider(
         typeof(IMixedRealityInputSystem),
         (SupportedPlatforms)(-1),  // All platforms supported by Unity
-        "Unity Joystick Manager")]
+        "Unity Joystick Manager",
+        supportedUnityXRPipelines: SupportedUnityXRPipelines.LegacyXR)]
     public class UnityJoystickManager : BaseInputDeviceManager
     {
         /// <summary>

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>

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;

Assets/MRTK/Providers/Oculus/XRSDK/OculusXRSDKDeviceManager.cs

@@ -27,7 +27,8 @@ namespace Microsoft.MixedReality.Toolkit.XRSDK.Oculus.Input
         "XR SDK Oculus Device Manager",
         "Oculus/XRSDK/Profiles/DefaultOculusXRSDKDeviceManagerProfile.asset",
         "MixedRealityToolkit.Providers",
-        requiresProfile: true)]
+        true,
+        SupportedUnityXRPipelines.XRSDK)]
     public class OculusXRSDKDeviceManager : XRSDKDeviceManager
     {
         /// <summary>

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(

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>

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>