Merge main into feature/XRI3 (#1055)

Keeping things up-to-date

All tests pass: 
<img width="138" height="36"
alt="{603272F5-6CF6-4A13-BBF3-6813B7E0429E}"
src="https://github.com/user-attachments/assets/9994f382-4802-47b0-a450-383b89e69874"
/>

Author: keveleigh

UnityProjects/MRTKDevTemplate/Assets/Scenes/SeeItSayIt Example.unity renamed to UnityProjects/MRTKDevTemplate/Assets/Scenes/SeeItSayItExample.unity

@@ -120,7 +120,7 @@ EditorBuildSettings:
     path: Assets/Scenes/Experimental/ScrollingExample.unity
     guid: 77e21ebc978cbc84f9ebe061742ae42d
   - enabled: 1
-    path: Assets/Scenes/SeeItSayIt Example.unity
+    path: Assets/Scenes/SeeItSayItExample.unity
     guid: cb7d2aaea1c5a4d469a6408ee9ddc5fc
   - enabled: 1
     path: Assets/Scenes/SlateDrawingExample.unity

UnityProjects/MRTKDevTemplate/Assets/Scenes/SeeItSayIt Example.unity.meta renamed to UnityProjects/MRTKDevTemplate/Assets/Scenes/SeeItSayItExample.unity.meta

@@ -51,6 +51,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
 
 * Updated tests to follow existing MRTK test patterns. [PR #1046](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1046)
 
+### Added
+
+* Added event `OnSpeechRecognitionKeywordChanged` to allow UI updates when the speech recognition keyword has changed. [PR #792](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/792/)
+
 ### Fixed
 
 * Fixed broken project validation help link, for item 'MRTK3 profile may need to be assigned for the Standalone build target' (Issue #882) [PR #886](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/886)

UnityProjects/MRTKDevTemplate/ProjectSettings/EditorBuildSettings.asset

@@ -23,6 +23,7 @@ public class StatefulInteractableEditor : BaseInteractableEditor
         private SerializedProperty allowSelectByVoice;
         private SerializedProperty SelectRequiresHover;
         private SerializedProperty speechRecognitionKeyword;
+        private SerializedProperty OnSpeechRecognitionKeywordChanged;
         private SerializedProperty VoiceRequiresFocus;
         private SerializedProperty UseGazeDwell;
         private SerializedProperty GazeDwellTime;
@@ -34,6 +35,7 @@ public class StatefulInteractableEditor : BaseInteractableEditor
         private SerializedProperty OnEnabled;
         private SerializedProperty OnDisabled;
         private static bool advancedFoldout = false;
+        private static bool speechRecognitionKeywordEventFoldout = false;
         private static bool enabledEventsFoldout = false;
 
         /// <summary>
@@ -57,6 +59,7 @@ protected override void OnEnable()
 
             allowSelectByVoice = SetUpProperty(nameof(allowSelectByVoice));
             speechRecognitionKeyword = SetUpProperty(nameof(speechRecognitionKeyword));
+            OnSpeechRecognitionKeywordChanged = SetUpAutoProperty(nameof(OnSpeechRecognitionKeywordChanged));
             VoiceRequiresFocus = SetUpAutoProperty(nameof(VoiceRequiresFocus));
 
             SelectRequiresHover = SetUpAutoProperty(nameof(SelectRequiresHover));
@@ -166,8 +169,13 @@ protected void DrawProperties(bool showToggleMode)
                     {
                         using (new EditorGUI.IndentLevelScope())
                         {
-                            EditorGUILayout.PropertyField(speechRecognitionKeyword);
                             EditorGUILayout.PropertyField(VoiceRequiresFocus);
+                            EditorGUILayout.PropertyField(speechRecognitionKeyword);
+                            speechRecognitionKeywordEventFoldout = EditorGUILayout.Foldout(speechRecognitionKeywordEventFoldout, EditorGUIUtility.TrTempContent("Speech Recognition Keyword event"), true);
+                            if (speechRecognitionKeywordEventFoldout)
+                            {
+                                EditorGUILayout.PropertyField(OnSpeechRecognitionKeywordChanged);
+                            }
                         }
                     }
 

org.mixedrealitytoolkit.core/CHANGELOG.md

@@ -150,10 +150,17 @@ public string SpeechRecognitionKeyword
                     {
                         interactionManager.RegisterInteractable(this as IXRInteractable);
                     }
+                    OnSpeechRecognitionKeywordChanged.Invoke(speechRecognitionKeyword);
                 }
             }
         }
-        
+
+        /// <summary>
+        /// Fired when the <see cref="SpeechRecognitionKeyword"/> has changed.
+        /// </summary>
+        [field: SerializeField, Tooltip("Fired when the Speech Recognition Keyword has changed.")]
+        public UnityEvent<string> OnSpeechRecognitionKeywordChanged { get; private set; } = new UnityEvent<string>();
+
         /// <summary>
         /// Does the voice command require this to have focus?
         /// If true, then the voice command will only respond to voice commands while this Interactable has focus.

org.mixedrealitytoolkit.core/Editor/Editors/StatefulInteractableEditor.cs

@@ -21,6 +21,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
 * Updated the minimum editor version to 2022.3.6f1 [PR #1003](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1003)
 * Updated tests to follow existing MRTK test patterns. [PR #1046](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1046)
 * Remapped the synthetic hands config to read the float "select value" action instead of the bool "select" action, since it's read as a float. [PR #1043](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1043)
+* Updated tests to follow existing MRTK test patterns. [PR #1046](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1046)
 
 ### Removed
 

org.mixedrealitytoolkit.core/Interactables/StatefulInteractable.cs

@@ -96,10 +96,10 @@ public override IEnumerator AimAt(Vector3 target, int numSteps = InputTestUtilit
         }
 
         /// <summary>
-        /// Changes the hand's pose to the given handshape.  Does not animate the hand between the current pose and new pose.
+        /// Changes the hand's pose to the given handshape. Does not animate the hand between the current pose and new pose.
         /// </summary>
         /// <param name="newHandshapeId">The new hand pose.</param>
-        /// <param name="numSteps">The new hand pose.</param>
+        /// <param name="numSteps">The number of steps to take to reach the new hand pose.</param>
         /// <param name="waitForFixedUpdate">If true, waits for a fixed update after moving to the new pose.</param>
         public IEnumerator SetHandshape(HandshapeId newHandshapeId, int numSteps = InputTestUtilities.ControllerMoveStepsSentinelValue, bool waitForFixedUpdate = true)
         {
@@ -112,7 +112,7 @@ public IEnumerator SetHandshape(HandshapeId newHandshapeId, int numSteps = Input
         }
 
         /// <summary>
-        /// Combined sequence of pinching and unpinching
+        /// Combined sequence of pinching and unpinching.
         /// </summary>
         public override IEnumerator Click()
         {
@@ -123,4 +123,4 @@ public override IEnumerator Click()
         }
     }
 }
-#pragma warning restore CS1591
+#pragma warning restore CS1591

org.mixedrealitytoolkit.input/CHANGELOG.md

@@ -28,13 +28,15 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
 ### Added
 
 * Added different types of maintaining scale for bounds handles. [PR #976](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/976)
+* Added InitializeToTargetForward field/property to RadialView to position a GameObject in front of its target (like at the center of the view) when it becomes enabled. [PR #655](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/655)
 
 ### Fixed
 
 * Fixed tap to place `StartPlacement()` when called just after instantiation of the component. [PR #785](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/785)
 * Fix null ref in SpatialManipulationReticle when multiple interactables are hovered. [PR #873](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/873)
 * ConstantViewSize solver now retains the initial scale and aspect ratio [PR #719](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/719)
 * Fixed Follow solver frequently logging "Look Rotation Viewing Vector Is Zero" [PR #895](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/895)
+* Fixed issues with HandConstraint hand tracking events not being fired (OnFirstHandDetected/OnHandActivate/OnLastHandLost/OnHandDeactivate) when SolverHandler TrackedHand is set to Right or Left (not Both) [PR #956](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/956)
 
 ## [3.3.0] - 2024-04-30
 

org.mixedrealitytoolkit.input/Tests/Runtime/Utilities/TestHand.cs

@@ -4,8 +4,6 @@
     "references": [
         "MixedReality.Toolkit.Core",
         "MixedReality.Toolkit.Core.Editor",
-        "MixedReality.Toolkit.Input",
-        "MixedReality.Toolkit.Input.Editor",
         "MixedReality.Toolkit.SpatialManipulation",
         "Unity.XR.Interaction.Toolkit",
         "Unity.XR.Interaction.Toolkit.Editor"