Change SupportedControllerType to flags

Author: keveleigh

Assets/MixedRealityToolkit/Definitions/Devices/SupportedControllerType.cs

@@ -1,6 +1,8 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See LICENSE in the project root for license information.
 
+using System;
+
 namespace Microsoft.MixedReality.Toolkit.Input
 {
     // todo: remove this.... it requires customization to add new device types
@@ -9,20 +11,20 @@ namespace Microsoft.MixedReality.Toolkit.Input
     /// The SDKType lists the XR SDKs that are supported by the Mixed Reality Toolkit.
     /// Initially, this lists proposed SDKs, not all may be implemented at this time (please see ReleaseNotes for more details)
     /// </summary>
+    [Flags]
     public enum SupportedControllerType
     {
-        None = 0,
-        GenericOpenVR,
-        ViveWand,
-        ViveKnuckles,
-        OculusTouch,
-        OculusRemote,
-        WindowsMixedReality,
-        GenericUnity,
-        Xbox,
-        TouchScreen,
-        Mouse,
-        ArticulatedHand,
-        GGVHand
+        GenericOpenVR = 1 << 0,
+        ViveWand = 1 << 1,
+        ViveKnuckles = 1 << 2,
+        OculusTouch = 1 << 3,
+        OculusRemote = 1 << 4,
+        WindowsMixedReality = 1 << 5,
+        GenericUnity = 1 << 6,
+        Xbox = 1 << 7,
+        TouchScreen = 1 << 8,
+        Mouse = 1 << 9,
+        ArticulatedHand = 1 << 10,
+        GGVHand = 1 << 11
     }
 }

Assets/MixedRealityToolkit/Definitions/InputSystem/PointerOption.cs

@@ -26,6 +26,7 @@ public PointerOption(SupportedControllerType controllerType, Handedness handedne
             this.pointerPrefab = pointerPrefab;
         }
 
+        [EnumFlags]
         [SerializeField]
         [Tooltip("The controller this pointer will attach itself to at runtime.")]
         private SupportedControllerType controllerType;