Merge pull request #10357 from keveleigh/releases/2.7.3

Releases/2.7.3 proposal

Author: keveleigh

Assets/MRTK/Core/Attributes/SpeechKeywordAttribute.cs

@@ -0,0 +1,14 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+using System;
+using UnityEngine;
+
+namespace Microsoft.MixedReality.Toolkit
+{
+    /// <summary>
+    /// Attribute used to display a dropdown of registered keywords from the speech profile.
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Field)]
+    public sealed class SpeechKeywordAttribute : PropertyAttribute { }
+}

Assets/MRTK/Core/Attributes/SpeechKeywordAttribute.cs.meta

@@ -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/MixedRealityControllerVisualizationProfile.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/Devices/SupportedControllerType.cs

@@ -26,6 +26,7 @@ public KeywordAndResponse(string keyword, UnityEvent response)
 
         [SerializeField]
         [Tooltip("The keyword to listen for.")]
+        [SpeechKeyword]
         private string keyword;
 
         /// <summary>

Assets/MRTK/Core/Definitions/InputSystem/KeywordAndResponse.cs

@@ -43,8 +43,6 @@ public enum SpatialAwarenessSurfaceTypes
         /// </remarks>
         Platform = 1 << 4,
 
-        // Insert additional surface types here.
-
         /// <summary>
         /// A surface that does not fit one of the defined surface types.
         /// </summary>
@@ -53,16 +51,35 @@ public enum SpatialAwarenessSurfaceTypes
         /// <para>Background should not be confused with Unknown. There is sufficient data to 
         /// classify the surface and it has been found to not correspond to a defined type.</para>
         /// </remarks>
-        Background = 1 << 29,
+        Background = 1 << 5,
 
         /// <summary>
         /// A boundless world mesh.
         /// </summary>
-        World = 1 << 30,
+        World = 1 << 6,
 
         /// <summary>
         /// Objects for which we have no observations
         /// </summary>
-        Inferred = 1 << 31
+        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/SpatialAwareness/SpatialAwarenessSurfaceTypes.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/AxisFlags.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/Handedness.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/ManipulationHandFlags.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;
+        }
+    }
 }