Merge pull request #10012 from keveleigh/merge-2.7.1

Merge 2.7.1 -> main

Author: keveleigh

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

@@ -23,7 +23,7 @@ public class MixedRealityProjectConfiguratorWindow : EditorWindow
         private const string XRSDKUnityDocsUrl = "https://docs.unity3d.com/Manual/configuring-project-for-xr.html";
         private const string MSOpenXRPluginUrl = "https://aka.ms/openxr-unity-install";
         private const string MRTKConfiguratorLogPrefix = "[MRTK Configurator]";
-        private const string XRPipelineIntro = "To build applications for AR/VR headsets you need to enable an XR pipeline. ";
+        private const string XRPipelineIntro = "To build applications for AR/VR devices you need to enable an XR pipeline. Please make sure you are targeting the desired build target before proceeding. ";
         private const string AlternativePipelineText = "\n\nFor more information on alternative pipelines, please click on the Learn More button.";
         private readonly GUIContent ApplyButtonContent = new GUIContent("Apply", "Apply configurations to this Unity Project");
         private readonly GUIContent SkipButtonContent = new GUIContent("Skip This Step", "Skip to the next step");
@@ -284,20 +284,33 @@ private void RenderLegacyXRPipelineDetected()
         private void RenderMicrosoftOpenXRPipelineDetected()
         {
             EditorGUILayout.LabelField("XR Pipeline Setting - XR SDK with Unity + Microsoft OpenXR plugins in use", EditorStyles.boldLabel);
-            EditorGUILayout.LabelField(XRPipelineIntro
-                + $"\n\nThe XR SDK pipeline with Unity and Microsoft OpenXR plugins are detected in the project. You are good to go."
-                + AlternativePipelineText, EditorStyles.wordWrappedLabel);
+            EditorGUILayout.LabelField(XRPipelineIntro + $"\n\nThe XR SDK pipeline with Unity and Microsoft OpenXR plugins are detected in the project. You are good to go.", EditorStyles.wordWrappedLabel);
             CreateSpace(15);
+            GUIStyle richTextLabelStyle = new GUIStyle(EditorStyles.helpBox)
+            {
+                richText = true,
+                wordWrap = true,
+                fontSize = 12
+            };
+            EditorGUILayout.LabelField("<size=18><b>Important - for first time setup only</b></size>\n\nIf you are setting up OpenXR <b>for the first time and are targeting HoloLens 2</b>, " +
+                "click on the Apply Settings button below to apply recommended project settings <b>before clicking Next</b>. You can safely proceed (click Next) if there is no error message or only one regarding Holographic Remoting for Play Mode.\n" +
+                "If you are targeting Windows Mixed Reality headset or prefer setting up manually, click on the Learn More button and refer to the manual setup section.", richTextLabelStyle);
+            CreateSpace(30);
             using (new EditorGUILayout.HorizontalScope())
             {
+                if (GUILayout.Button("Apply Settings"))
+                {
+                    Debug.Log(MRTKConfiguratorLogPrefix + " Applying recommended project settings for HoloLens 2. Operation performed is equivalent to clicking on Mixed Reality -> Project -> Apply recommended project settings for HoloLens 2.");
+                    EditorApplication.ExecuteMenuItem("Mixed Reality/Project/Apply recommended project settings for HoloLens 2");
+                }
                 if (GUILayout.Button("Next"))
                 {
                     CurrentStage = ConfigurationStage.ProjectConfiguration;
                     Repaint();
                 }
                 if (GUILayout.Button("Learn More"))
                 {
-                    Application.OpenURL(XRPipelineDocsUrl);
+                    Application.OpenURL(MSOpenXRPluginUrl);
                 }
 
             }

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

@@ -18,9 +18,6 @@ namespace Microsoft.MixedReality.Toolkit.Input.UnityInput
         typeof(IMixedRealityInputSystem),
         (SupportedPlatforms)(-1),  // All platforms supported by Unity
         "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
     public class UnityJoystickManager : BaseInputDeviceManager
     {
         /// <summary>
@@ -237,8 +234,11 @@ protected virtual SupportedControllerType GetCurrentControllerType(string joysti
         {
             // todo: this should be using an allow list, not a disallow list
             if (string.IsNullOrEmpty(joystickName) ||
-                joystickName.Contains("OpenVR") ||
-                joystickName.Contains("Spatial"))
+                joystickName.Contains("OpenVR") || // This catches input sources from legacy OpenVR
+                joystickName.Contains("OpenXR") || // This catches input sources from OpenXR Plugin
+                joystickName.Contains("Oculus") || // This catches controllers from Oculus XR Plugin
+                joystickName.Contains("Hand - ") || // This catches HoloLens hands from Windows XR Plugin
+                joystickName.Contains("Spatial")) // This catches controllers from Windows XR Plugin and all input sources from legacy WMR
             {
                 return 0;
             }

Assets/MRTK/Providers/OpenXR/Scripts/OpenXRHandMeshProvider.cs

@@ -122,7 +122,8 @@ private Vector2[] InitializeUVs(Vector3[] neutralPoseVertices)
         {
             if (neutralPoseVertices.Length == 0)
             {
-                Debug.LogError("Loaded 0 verts for neutralPoseVertices");
+                Debug.LogError("Loaded 0 vertices for neutralPoseVertices");
+                return System.Array.Empty<Vector2>();
             }
 
             float minY = neutralPoseVertices[0].y;

Assets/MRTK/Providers/WindowsMixedReality/Shared/WindowsMixedRealityHandMeshProvider.cs

@@ -78,7 +78,9 @@ private void InitializeUVs(Vector3[] poseVertices)
         {
             if (poseVertices.Length == 0)
             {
-                Debug.LogError("Loaded 0 verts for poseVertices");
+                Debug.LogError("Loaded 0 vertices for poseVertices");
+                handMeshUVsUnity = Array.Empty<Vector2>();
+                return;
             }
 
             float minY = poseVertices[0].y;

Assets/MRTK/Tests/EditModeTests/Core/Utilities/BuildAndDeploy/UwpAppxBuildToolsTest.cs

@@ -26,7 +26,7 @@ class UwpAppxBuildToolsTest
                      xmlns:mobile='http://schemas.microsoft.com/appx/manifest/mobile/windows10'
                      IgnorableNamespaces='uap uap2 uap3 uap4 mp mobile iot'
                      xmlns='http://schemas.microsoft.com/appx/manifest/foundation/windows10'>
-              <Identity Name='Microsoft.MixedReality.Toolkit' Publisher='CN=Microsoft' Version='2.7.0.0' />
+              <Identity Name='Microsoft.MixedReality.Toolkit' Publisher='CN=Microsoft' Version='2.8.0.0' />
               <mp:PhoneIdentity PhoneProductId='85c8bcd4-fbac-44ed-adf6-bfc01242a27f' PhonePublisherId='00000000-0000-0000-0000-000000000000' />
               <Properties>
                 <DisplayName>MixedRealityToolkit</DisplayName>