Merge remote-tracking branch 'upstream/main'

Author: davidkline-ms

Assets/MRTK/Core/Inspectors/ControllerPopupWindow.cs

@@ -316,40 +316,13 @@ private void RenderMappingList(List<string> controllerList)
                 return;
             }
 
-            GUIStyle headerStyle = new GUIStyle();
-            headerStyle.richText = true;
-
-            if (currentControllerOption == null || currentControllerTexture == null)
+            using (new EditorGUILayout.VerticalScope())
             {
-                GUILayout.BeginVertical();
-                using (new EditorGUILayout.VerticalScope())
-                {
-                    GUILayout.FlexibleSpace();
-                    EditorGUILayout.LabelField("<b>Controllers affected by this mapping</b>", headerStyle);
-                    for (int i = 0; i < controllerList.Count; i++)
-                    {
-                        EditorGUILayout.LabelField(controllerList[i]);
-                    }
-                }
-                GUILayout.EndVertical();
-            }
-            else
-            {
-                float max_y = currentControllerOption.InputLabelPositions.Max(x => x.y);
-
-                var titleRectPosition = Vector2.up * (max_y + 4 * EditorGUIUtility.singleLineHeight);
-                var titleRectSize = new Vector2(500, EditorGUIUtility.singleLineHeight);
-
-                var titleRect = new Rect(titleRectPosition, titleRectSize);
-                EditorGUI.LabelField(titleRect, "<b>Controllers affected by this mapping</b>", headerStyle);
-
+                GUILayout.FlexibleSpace();
+                EditorGUILayout.LabelField("Controllers affected by this mapping", EditorStyles.boldLabel);
                 for (int i = 0; i < controllerList.Count; i++)
                 {
-                    var rectPosition = Vector2.up * (max_y + (i + 5) * EditorGUIUtility.singleLineHeight);
-                    var rectSize = new Vector2(1000, EditorGUIUtility.singleLineHeight);
-
-                    var labelRect = new Rect(rectPosition, rectSize);
-                    EditorGUI.LabelField(labelRect, controllerList[i]);
+                    EditorGUILayout.LabelField(controllerList[i]);
                 }
             }
         }

Assets/MRTK/Core/Inspectors/MixedRealityToolkitInspector.cs

@@ -12,10 +12,12 @@ public class MixedRealityToolkitInspector : UnityEditor.Editor
     {
         private SerializedProperty activeProfile;
         private UnityEditor.Editor activeProfileEditor;
+        private Object cachedProfile;
 
         private void OnEnable()
         {
             activeProfile = serializedObject.FindProperty("activeProfile");
+            cachedProfile = activeProfile.objectReferenceValue;
         }
 
         public override void OnInspectorGUI()
@@ -53,14 +55,16 @@ public override void OnInspectorGUI()
                 EditorGUILayout.HelpBox("MixedRealityToolkit cannot initialize unless an Active Profile is assigned!", MessageType.Error);
             }
 
-            bool changed = MixedRealityInspectorUtility.DrawProfileDropDownList(activeProfile, null, activeProfile.objectReferenceValue, typeof(MixedRealityToolkitConfigurationProfile), false, false);
+            bool changed = MixedRealityInspectorUtility.DrawProfileDropDownList(activeProfile, null, activeProfile.objectReferenceValue, typeof(MixedRealityToolkitConfigurationProfile), false, false) ||
+                cachedProfile != activeProfile.objectReferenceValue;
 
             serializedObject.ApplyModifiedProperties();
 
             if (changed)
             {
                 MixedRealityToolkit.Instance.ResetConfiguration((MixedRealityToolkitConfigurationProfile)activeProfile.objectReferenceValue);
                 activeProfileEditor = null;
+                cachedProfile = activeProfile.objectReferenceValue;
             }
 
             if (activeProfile.objectReferenceValue != null && activeProfileEditor == null)

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

@@ -21,7 +21,6 @@ public class MixedRealityToolkitConfigurationProfileInspector : BaseMixedReality
         private static readonly GUIContent TargetScaleContent = new GUIContent("Target Scale:");
 
         // Experience properties
-        private SerializedProperty experienceSettingsType;
         private SerializedProperty experienceSettingsProfile;
 
         // Tracking the old experience scale property for compatibility
@@ -97,7 +96,6 @@ protected override void OnEnable()
             MixedRealityToolkitConfigurationProfile mrtkConfigProfile = target as MixedRealityToolkitConfigurationProfile;
 
             // Experience configuration
-            experienceSettingsType = serializedObject.FindProperty("experienceSettingsType");
             experienceSettingsProfile = serializedObject.FindProperty("experienceSettingsProfile");
             experienceScaleMigration = serializedObject.FindProperty("targetExperienceScale");
 
@@ -153,21 +151,32 @@ protected override void OnEnable()
                         using (var c = new EditorGUI.ChangeCheckScope())
                         {
                             // Reconciling old Experience Scale property with the Experience Settings Profile
-                            var oldExperienceSettigsScale = (experienceSettingsProfile.objectReferenceValue as MixedRealityExperienceSettingsProfile)?.TargetExperienceScale;
+                            ExperienceScale? oldExperienceSettingsScale = null;
+                            if (experienceSettingsProfile.objectReferenceValue is MixedRealityExperienceSettingsProfile oldExperienceSettingsProfile
+                                && oldExperienceSettingsProfile != null)
+                            {
+                                oldExperienceSettingsScale = oldExperienceSettingsProfile.TargetExperienceScale;
+                            }
 
-                            changed |= RenderProfile(experienceSettingsProfile, typeof(MixedRealityExperienceSettingsProfile), true, false,  null, true);
+                            changed |= RenderProfile(experienceSettingsProfile, typeof(MixedRealityExperienceSettingsProfile), true, false,  null);
 
                             // Experience configuration
-                            if(!mrtkConfigProfile.ExperienceSettingsProfile.IsNull())
-                            {                            
+                            if (mrtkConfigProfile.ExperienceSettingsProfile != null)
+                            {
                                 // If the Experience Scale property changed, make sure we also alter the configuration profile's target experience scale property for compatibility
-                                var newExperienceSettigs = (experienceSettingsProfile.objectReferenceValue as MixedRealityExperienceSettingsProfile)?.TargetExperienceScale;
-                                if(oldExperienceSettigsScale.HasValue && newExperienceSettigs.HasValue && oldExperienceSettigsScale != newExperienceSettigs)
+                                ExperienceScale? newExperienceSettingsScale = null;
+                                if (experienceSettingsProfile.objectReferenceValue is MixedRealityExperienceSettingsProfile newExperienceSettingsProfile
+                                    && newExperienceSettingsProfile != null)
+                                {
+                                    newExperienceSettingsScale = newExperienceSettingsProfile.TargetExperienceScale;
+                                }
+
+                                if (oldExperienceSettingsScale.HasValue && newExperienceSettingsScale.HasValue && oldExperienceSettingsScale != newExperienceSettingsScale)
                                 {
-                                    experienceScaleMigration.intValue = (int)newExperienceSettigs;
+                                    experienceScaleMigration.intValue = (int)newExperienceSettingsScale;
                                     experienceScaleMigration.serializedObject.ApplyModifiedProperties();
                                 }
-                                // If we have not changed the Experience Settings profile and it's value is out of sync with the top level configuration profile, display a migration prompt
+                                // If we have not changed the Experience Settings profile and its value is out of sync with the top level configuration profile, display a migration prompt
                                 else if ((ExperienceScale)experienceScaleMigration.intValue != mrtkConfigProfile.ExperienceSettingsProfile.TargetExperienceScale)
                                 {
                                     Color errorColor = Color.Lerp(Color.white, Color.red, 0.5f);
@@ -247,14 +256,24 @@ protected override void OnEnable()
                         return changed;
                     },
                     () => {
-                        var experienceScale = mrtkConfigProfile.ExperienceSettingsProfile.TargetExperienceScale;
-                        if (experienceScale != ExperienceScale.Room)
+                        if(mrtkConfigProfile.ExperienceSettingsProfile.IsNull())
                         {
-                            // Alert the user if the experience scale does not support boundary features.
+                            // Alert that an experience settings profile has not been selected
                             GUILayout.Space(6f);
-                            EditorGUILayout.HelpBox("Boundaries are only supported in Room scale experiences.", MessageType.Warning);
+                            EditorGUILayout.HelpBox("Boundaries require an experience settings profile with a Room scale target experience scale.", MessageType.Warning);
                             GUILayout.Space(6f);
                         }
+                        else
+                        {
+                            var experienceScale = mrtkConfigProfile.ExperienceSettingsProfile.TargetExperienceScale;
+                            if (experienceScale != ExperienceScale.Room)
+                            {
+                                // Alert the user if the experience scale does not support boundary features.
+                                GUILayout.Space(6f);
+                                EditorGUILayout.HelpBox("Boundaries are only supported in Room scale experiences.", MessageType.Warning);
+                                GUILayout.Space(6f);
+                            }
+                        }
 
                         bool changed = false;
                         using (var c = new EditorGUI.ChangeCheckScope())

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

@@ -650,7 +650,11 @@ static public bool DrawScriptableFoldout<T>(SerializedProperty scriptable, strin
                     else
                     {
                         bool isNestedInCurrentPrefab = false;
-                        var prefabStage = PrefabStageUtility.GetCurrentPrefabStage();
+#if UNITY_2021_2_OR_NEWER
+                        var prefabStage = UnityEditor.SceneManagement.PrefabStageUtility.GetCurrentPrefabStage();
+#else
+                        var prefabStage = UnityEditor.Experimental.SceneManagement.PrefabStageUtility.GetCurrentPrefabStage();
+#endif
                         if (prefabStage != null)
                         {
                             var instancePath = AssetDatabase.GetAssetPath(scriptable.objectReferenceValue);

Assets/MRTK/Core/Inspectors/Utilities/InspectorUIUtility.cs

@@ -17,8 +17,7 @@ namespace Microsoft.MixedReality.Toolkit.Input.UnityInput
     [MixedRealityDataProvider(
         typeof(IMixedRealityInputSystem),
         (SupportedPlatforms)(-1),  // All platforms supported by Unity
-        "Unity Joystick Manager",
-        supportedUnityXRPipelines: SupportedUnityXRPipelines.LegacyXR)]
+        "Unity Joystick Manager")]
 #if UNITY_2020_1_OR_NEWER
     [Obsolete("The legacy XR pipeline has been removed in Unity 2020 or newer. Please migrate to XR SDK.")]
 #endif // UNITY_2020_1_OR_NEWER

Assets/MRTK/Core/Providers/UnityInput/UnityJoystickManager.cs

@@ -531,7 +531,11 @@ public static void AddCapabilities(IBuildInfo buildInfo, XElement rootElement =
                 AddGazeInputCapability(rootElement);
             }
 
-            if (uwpBuildInfo.ResearchModeCapabilityEnabled && EditorUserBuildSettings.wsaSubtarget == WSASubtarget.HoloLens)
+            if (uwpBuildInfo.ResearchModeCapabilityEnabled
+#if !UNITY_2021_2_OR_NEWER
+                && EditorUserBuildSettings.wsaSubtarget == WSASubtarget.HoloLens
+#endif // !UNITY_2021_2_OR_NEWER
+                )
             {
                 AddResearchModeCapability(rootElement);
             }