Merge pull request #10319 from keveleigh/has-flag-rework

Introduce alternative to .HasFlag

Author: keveleigh

Assets/MRTK/Core/Definitions/Devices/MixedRealityControllerVisualizationProfile.cs

@@ -248,7 +248,7 @@ private bool SettingContainsParameters(MixedRealityControllerVisualizationSettin
         {
             return setting.ControllerType != null &&
                 setting.ControllerType.Type == controllerType &&
-                setting.Handedness.HasFlag(hand) && setting.Handedness != Handedness.None;
+                setting.Handedness.IsMaskSet(hand) && setting.Handedness != Handedness.None;
         }
     }
 }

Assets/MRTK/Core/Definitions/Devices/SupportedControllerType.cs

@@ -28,4 +28,23 @@ public enum SupportedControllerType
         GGVHand = 1 << 11,
         HPMotionController = 1 << 12
     }
+
+    /// <summary>
+    /// Extension methods specific to the <see cref="SupportedControllerType"/> enum.
+    /// </summary>
+    public static class SupportedControllerTypeExtensions
+    {
+        /// <summary>
+        /// Checks to determine if all bits in a provided mask are set.
+        /// </summary>
+        /// <param name="a"><see cref="SupportedControllerType"/> value.</param>
+        /// <param name="b"><see cref="SupportedControllerType"/> mask.</param>
+        /// <returns>
+        /// True if all of the bits in the specified mask are set in the current value.
+        /// </returns>
+        public static bool IsMaskSet(this SupportedControllerType a, SupportedControllerType b)
+        {
+            return (a & b) == b;
+        }
+    }
 }

Assets/MRTK/Core/Definitions/SpatialAwareness/SpatialAwarenessSurfaceTypes.cs

@@ -63,4 +63,23 @@ public enum SpatialAwarenessSurfaceTypes
         /// </summary>
         Inferred = 1 << 7
     }
+
+    /// <summary>
+    /// Extension methods specific to the <see cref="SpatialAwarenessSurfaceTypes"/> enum.
+    /// </summary>
+    public static class SpatialAwarenessSurfaceTypesExtensions
+    {
+        /// <summary>
+        /// Checks to determine if all bits in a provided mask are set.
+        /// </summary>
+        /// <param name="a"><see cref="SpatialAwarenessSurfaceTypes"/> value.</param>
+        /// <param name="b"><see cref="SpatialAwarenessSurfaceTypes"/> mask.</param>
+        /// <returns>
+        /// True if all of the bits in the specified mask are set in the current value.
+        /// </returns>
+        public static bool IsMaskSet(this SpatialAwarenessSurfaceTypes a, SpatialAwarenessSurfaceTypes b)
+        {
+            return (a & b) == b;
+        }
+    }
 }

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

@@ -13,4 +13,23 @@ public enum AxisFlags
         YAxis = 1 << 1,
         ZAxis = 1 << 2
     }
+
+    /// <summary>
+    /// Extension methods specific to the <see cref="AxisFlags"/> enum.
+    /// </summary>
+    public static class AxisFlagsExtensions
+    {
+        /// <summary>
+        /// Checks to determine if all bits in a provided mask are set.
+        /// </summary>
+        /// <param name="a"><see cref="AxisFlags"/> value.</param>
+        /// <param name="b"><see cref="AxisFlags"/> mask.</param>
+        /// <returns>
+        /// True if all of the bits in the specified mask are set in the current value.
+        /// </returns>
+        public static bool IsMaskSet(this AxisFlags a, AxisFlags b)
+        {
+            return (a & b) == b;
+        }
+    }
 }

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

@@ -39,4 +39,23 @@ public enum Handedness : byte
         /// <remarks>Note, by default the specific hand actions will override settings mapped as both</remarks>
         Any = Other | Left | Right,
     }
+
+    /// <summary>
+    /// Extension methods specific to the <see cref="Handedness"/> enum.
+    /// </summary>
+    public static class HandednessExtensions
+    {
+        /// <summary>
+        /// Checks to determine if all bits in a provided mask are set.
+        /// </summary>
+        /// <param name="a"><see cref="Handedness"/> value.</param>
+        /// <param name="b"><see cref="Handedness"/> mask.</param>
+        /// <returns>
+        /// True if all of the bits in the specified mask are set in the current value.
+        /// </returns>
+        public static bool IsMaskSet(this Handedness a, Handedness b)
+        {
+            return (a & b) == b;
+        }
+    }
 }

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

@@ -12,4 +12,23 @@ public enum ManipulationHandFlags
         OneHanded = 1 << 0,
         TwoHanded = 1 << 1,
     }
+
+    /// <summary>
+    /// Extension methods specific to the <see cref="ManipulationHandFlags"/> enum.
+    /// </summary>
+    public static class ManipulationHandFlagsExtensions
+    {
+        /// <summary>
+        /// Checks to determine if all bits in a provided mask are set.
+        /// </summary>
+        /// <param name="a"><see cref="ManipulationHandFlags"/> value.</param>
+        /// <param name="b"><see cref="ManipulationHandFlags"/> mask.</param>
+        /// <returns>
+        /// True if all of the bits in the specified mask are set in the current value.
+        /// </returns>
+        public static bool IsMaskSet(this ManipulationHandFlags a, ManipulationHandFlags b)
+        {
+            return (a & b) == b;
+        }
+    }
 }

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

@@ -12,4 +12,23 @@ public enum ManipulationProximityFlags
         Near = 1 << 0,
         Far = 1 << 1,
     }
+
+    /// <summary>
+    /// Extension methods specific to the <see cref="ManipulationProximityFlags"/> enum.
+    /// </summary>
+    public static class ManipulationProximityFlagsExtensions
+    {
+        /// <summary>
+        /// Checks to determine if all bits in a provided mask are set.
+        /// </summary>
+        /// <param name="a"><see cref="ManipulationProximityFlags"/> value.</param>
+        /// <param name="b"><see cref="ManipulationProximityFlags"/> mask.</param>
+        /// <returns>
+        /// True if all of the bits in the specified mask are set in the current value.
+        /// </returns>
+        public static bool IsMaskSet(this ManipulationProximityFlags a, ManipulationProximityFlags b)
+        {
+            return (a & b) == b;
+        }
+    }
 }

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

@@ -36,4 +36,23 @@ public enum SupportedUnityXRPipelines
         LegacyXR = 1 << 0,
         XRSDK = 1 << 1,
     }
+
+    /// <summary>
+    /// Extension methods specific to the <see cref="SupportedUnityXRPipelines"/> enum.
+    /// </summary>
+    public static class SupportedUnityXRPipelinesExtensions
+    {
+        /// <summary>
+        /// Checks to determine if all bits in a provided mask are set.
+        /// </summary>
+        /// <param name="a"><see cref="SupportedUnityXRPipelines"/> value.</param>
+        /// <param name="b"><see cref="SupportedUnityXRPipelines"/> mask.</param>
+        /// <returns>
+        /// True if all of the bits in the specified mask are set in the current value.
+        /// </returns>
+        public static bool IsMaskSet(this SupportedUnityXRPipelines a, SupportedUnityXRPipelines b)
+        {
+            return (a & b) == b;
+        }
+    }
 }

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

@@ -13,4 +13,23 @@ public enum TransformFlags
         Rotate = 1 << 1,
         Scale = 1 << 2
     }
+
+    /// <summary>
+    /// Extension methods specific to the <see cref="TransformFlags"/> enum.
+    /// </summary>
+    public static class TransformFlagsExtensions
+    {
+        /// <summary>
+        /// Checks to determine if all bits in a provided mask are set.
+        /// </summary>
+        /// <param name="a"><see cref="TransformFlags"/> value.</param>
+        /// <param name="b"><see cref="TransformFlags"/> mask.</param>
+        /// <returns>
+        /// True if all of the bits in the specified mask are set in the current value.
+        /// </returns>
+        public static bool IsMaskSet(this TransformFlags a, TransformFlags b)
+        {
+            return (a & b) == b;
+        }
+    }
 }

Assets/MRTK/Core/Inspectors/Profiles/MixedRealityControllerVisualizationProfileInspector.cs

@@ -193,7 +193,7 @@ private void RenderControllerList(SerializedProperty controllerList)
                 if (hasValidType)
                 {
                     MixedRealityControllerAttribute controllerAttribute = MixedRealityControllerAttribute.Find(controllerType.Type);
-                    if (controllerAttribute != null && !controllerAttribute.SupportedUnityXRPipelines.HasFlag(xrPipelineUtility.SelectedPipeline))
+                    if (controllerAttribute != null && !controllerAttribute.SupportedUnityXRPipelines.IsMaskSet(xrPipelineUtility.SelectedPipeline))
                     {
                         continue;
                     }