Merge pull request #9985 from keveleigh/2.7.1-cherrypicks

2.7.1 cherrypicks round 2

Author: keveleigh

Assets/MRTK/Core/Inspectors/Setup/MRTKVersionPopup.cs

@@ -0,0 +1,53 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+using Microsoft.MixedReality.Toolkit.Utilities.Editor;
+using System;
+using UnityEditor;
+using UnityEngine;
+
+namespace Microsoft.MixedReality.Toolkit.Editor
+{
+    internal class MRTKVersionPopup : EditorWindow
+    {
+        private const string DefaultVersion = "0.0.0.0";
+        private const string NotFoundMessage = "The version could not be read. This is most often due to (and expected when) using MRTK directly from the repo. If you're using an official distribution and seeing this message, please file a GitHub issue!";
+        private static readonly Version MRTKVersion = typeof(MixedRealityToolkit).Assembly.GetName().Version;
+        private static readonly bool FoundVersion = MRTKVersion.ToString() != DefaultVersion;
+        private static readonly Vector2 WindowSize = new Vector2(300, 140);
+        private static readonly Vector2 NotFoundWindowSize = new Vector2(300, 175);
+        private static readonly GUIContent Title = new GUIContent("Mixed Reality Toolkit");
+        private static MRTKVersionPopup window;
+
+        [MenuItem("Mixed Reality/Toolkit/Show version...", priority = int.MaxValue)]
+        private static void Init()
+        {
+            if (window != null)
+            {
+                window.ShowUtility();
+                return;
+            }
+
+            window = CreateInstance<MRTKVersionPopup>();
+            window.titleContent = Title;
+            window.maxSize = FoundVersion ? WindowSize : NotFoundWindowSize;
+            window.minSize = FoundVersion ? WindowSize : NotFoundWindowSize;
+            window.ShowUtility();
+        }
+
+        private void OnGUI()
+        {
+            using (new EditorGUILayout.VerticalScope())
+            {
+                MixedRealityInspectorUtility.RenderMixedRealityToolkitLogo();
+
+                using (new EditorGUILayout.HorizontalScope())
+                {
+                    GUILayout.FlexibleSpace();
+                    EditorGUILayout.LabelField(FoundVersion ? $"Version {MRTKVersion}" : NotFoundMessage, EditorStyles.wordWrappedLabel);
+                    GUILayout.FlexibleSpace();
+                }
+            }
+        }
+    }
+}

Assets/MRTK/Core/Inspectors/Setup/MRTKVersionPopup.cs.meta

@@ -33,5 +33,12 @@ MonoBehaviour:
         Microsoft.MixedReality.Toolkit.Providers.XRSDK
     componentName: XR SDK Spatial Mesh Observer
     priority: 0
-    runtimePlatform: -1
+    runtimePlatform: 2039
+    observerProfile: {fileID: 11400000, guid: 4f5009fa6e8234540be72702bb09d29a, type: 2}
+  - componentType:
+      reference: Microsoft.MixedReality.Toolkit.XRSDK.OpenXR.OpenXRSpatialAwarenessMeshObserver,
+        Microsoft.MixedReality.Toolkit.Providers.OpenXR
+    componentName: OpenXR Spatial Mesh Observer
+    priority: 0
+    runtimePlatform: 8
     observerProfile: {fileID: 11400000, guid: 4f5009fa6e8234540be72702bb09d29a, type: 2}

Assets/MRTK/Examples/Demos/PulseShader/Profile/PulseShaderSpatialAwarenessSystemProfile.asset

@@ -2344,7 +2344,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 83d9acc7968244a8886f3af591305bcb, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  activeProfile: {fileID: 11400000, guid: fbb8235a0e1db804880e49990996f5a4, type: 2}
+  activeProfile: {fileID: 11400000, guid: ec6c5962fb980c041854a25f84d6f2e6, type: 2}
 --- !u!4 &1462653017
 Transform:
   m_ObjectHideFlags: 0

Assets/MRTK/Extensions/HandPhysicsService/Examples/HandPhysicsServiceExample.unity

@@ -556,12 +556,26 @@ public static bool TryGetInputActions(out string[] descriptionsArray)
                 return false;
             }
 
-            MixedRealityInputAction[] actions = CoreServices.InputSystem.InputSystemProfile.InputActionsProfile.InputActions;
+            MixedRealityInputSystemProfile inputSystemProfile = CoreServices.InputSystem?.InputSystemProfile;
 
-            descriptionsArray = new string[actions.Length];
-            for (int i = 0; i < actions.Length; i++)
+            if (inputSystemProfile != null && inputSystemProfile.SpeechCommandsProfile != null)
             {
-                descriptionsArray[i] = actions[i].Description;
+                MixedRealityInputAction[] actions = inputSystemProfile.InputActionsProfile.InputActions;
+
+                descriptionsArray = new string[actions.Length];
+                for (int i = 0; i < actions.Length; i++)
+                {
+                    descriptionsArray[i] = actions[i].Description;
+                }
+            }
+            else
+            {
+                descriptionsArray = null;
+            }
+
+            if (descriptionsArray == null || descriptionsArray.Length < 1)
+            {
+                return false;
             }
 
             return true;

Assets/MRTK/SDK/Editor/Inspectors/UX/Interactable/InteractableInspector.cs

@@ -547,7 +547,7 @@ private static Ray CalculateRayForSafeZone(
                             direction = IsPalmFacingCamera(hand) ? direction : -direction;
                         }
 
-                        if (hand.ControllerHandedness == Handedness.Right)
+                        if (hand.ControllerHandedness.IsRight())
                         {
                             direction = -direction;
                         }
@@ -672,7 +672,7 @@ private static bool IsPalmFacingCamera(IMixedRealityController hand)
         /// </remarks>
         private static bool IsApplicableController(IMixedRealityController controller)
         {
-            return controller.ControllerHandedness != Handedness.None;
+            return !controller.ControllerHandedness.IsNone();
         }
 
         /// <summary>

Assets/MRTK/SDK/Features/Utilities/Solvers/HandConstraint.cs

@@ -372,8 +372,8 @@ private bool TryGenerateActivationPoint(IMixedRealityHand jointedHand, out Vecto
                     break;
                 case SolverSafeZone.UlnarSide:
                 default:
-                    referenceJoint1 = TrackedHandJoint.IndexKnuckle;
-                    referenceJoint2 = TrackedHandJoint.ThumbProximalJoint;
+                    referenceJoint1 = TrackedHandJoint.PinkyKnuckle;
+                    referenceJoint2 = TrackedHandJoint.Wrist;
                     break;
             }
 

Assets/MRTK/SDK/Features/Utilities/Solvers/HandConstraintPalmUp.cs

@@ -33,7 +33,7 @@ MonoBehaviour:
         Microsoft.MixedReality.Toolkit.Providers.XRSDK
     componentName: XR SDK Spatial Mesh Observer
     priority: 0
-    runtimePlatform: -9
+    runtimePlatform: 2039
     observerProfile: {fileID: 11400000, guid: 8be0bcd2117dd214da41ed98f0def2e3, type: 2}
   - componentType:
       reference: Microsoft.MixedReality.Toolkit.XRSDK.OpenXR.OpenXRSpatialAwarenessMeshObserver,