add xrsettingsutilities to reduce pragmas for warning 0618

Author: davidkline-ms

Assets/MixedRealityToolkit.Services/InputSystem/Editor/Microsoft.MixedReality.Toolkit.Services.InputSystem.Editor.asmdef

@@ -1,6 +1,7 @@
 {
     "name": "Microsoft.MixedReality.Toolkit.Services.InputSystem.Editor",
     "references": [
+        "Microsoft.MixedReality.Toolkit.Editor.Utilities",
         "Microsoft.MixedReality.Toolkit",
         "Microsoft.MixedReality.Toolkit.Services.InputSystem"
     ],

Assets/MixedRealityToolkit.Services/InputSystem/Editor/MixedRealityCanvasInspector.cs

@@ -3,6 +3,7 @@
 
 using Microsoft.MixedReality.Toolkit.Input.Utilities;
 using Microsoft.MixedReality.Toolkit.Utilities;
+using Microsoft.MixedReality.Toolkit.Utilities.Editor;
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
@@ -19,7 +20,7 @@ namespace Microsoft.MixedReality.Toolkit.Input
 
     [CanEditMultipleObjects]
     [CustomEditor(typeof(Canvas))]
-    public class MixedRealityCanvasInspector : Editor
+    public class MixedRealityCanvasInspector : UnityEditor.Editor
     {
         private static readonly GUIContent makeMRTKCanvas = new GUIContent("Convert to MRTK Canvas", "Configures the GameObject for MRKT use:\n1. Switches Canvas to world space\n2. Removes world space Camera\n3. Ensures GraphicRaycaster component\n4. Ensures CanvasUtility component");
         private static readonly GUIContent removeMRTKCanvas = new GUIContent("Convert to Unity Canvas", "Configures the GameObject for regular use:\n1. Removes CanvasUtility component\n2. Removes NearInteractionTouchableUnityUI component");
@@ -162,12 +163,7 @@ private void AllRootCanvases()
             }
 
             EditorGUILayout.Space();
-
-            // Ensure compatibility with the pre-2019.3 XR architecture for customers / platforms
-            // with legacy requirements.
-#pragma warning disable 0618
-            if (PlayerSettings.virtualRealitySupported &&
-#pragma warning restore 0618
+            if (XRSettingsUtilities.LegacyXREnabled &&
                 (m_RenderMode.enumValueIndex == (int)RenderMode.ScreenSpaceOverlay))
             {
                 EditorGUILayout.HelpBox("Using a render mode of ScreenSpaceOverlay while VR is enabled will cause the Canvas to continue to incur a rendering cost, even though the Canvas will not be visible in VR.", MessageType.Warning);

Assets/MixedRealityToolkit.Services/InputSystem/Editor/NearInteractionTouchableInspector.cs

@@ -89,7 +89,7 @@ public override void OnInspectorGUI()
     }
 
     [CustomEditor(typeof(BaseNearInteractionTouchable), true)]
-    public class NearInteractionTouchableInspectorBase : Editor
+    public class NearInteractionTouchableInspectorBase : UnityEditor.Editor
     {
         private readonly Color handleColor = Color.white;
         private readonly Color fillColor = new Color(0, 0, 0, 0);

Assets/MixedRealityToolkit.Tools/OptimizeWindow/MixedRealityOptimizeWindow.cs

@@ -133,18 +133,14 @@ private void OnGUI()
             EditorGUILayout.HelpBox(PerformanceTargetDescriptions[(int)PerfTarget], MessageType.Info);
             EditorGUILayout.Space();
 
-            // Ensure compatibility with the pre-2019.3 XR architecture for customers / platforms
-            // with legacy requirements.
-#pragma warning disable 0618
-            if (!PlayerSettings.virtualRealitySupported)
+            if (!XRSettingsUtilities.LegacyXREnabled)
             {
                 EditorGUILayout.HelpBox("Virtual reality support is not enabled in player settings", MessageType.Error);
                 if (GUILayout.Button("Enable Virtual Reality Support"))
                 {
-                    PlayerSettings.virtualRealitySupported = true;
+                    XRSettingsUtilities.LegacyXREnabled = true;
                 }
             }
-#pragma warning disable 0618
             else
             {
                 selectedToolbarIndex = GUILayout.Toolbar(selectedToolbarIndex, ToolbarTitles);

Assets/MixedRealityToolkit/Inspectors/Setup/MixedRealityEditorSettings.cs

@@ -83,9 +83,7 @@ private static void LogConfigurationWarnings()
         {
             // Ensure compatibility with the pre-2019.3 XR architecture for customers / platforms
             // with legacy requirements.
-#pragma warning disable 0618
-            if (!PlayerSettings.virtualRealitySupported)
-#pragma warning restore 0618
+            if (!XRSettingsUtilities.LegacyXREnabled)
             {
                 Debug.LogWarning("<b>Virtual reality supported</b> not enabled. Check <i>XR Settings</i> under <i>Player Settings</i>");
             }

Assets/MixedRealityToolkit/Inspectors/Setup/MixedRealityProjectConfiguratorWindow.cs

@@ -159,7 +159,6 @@ private void RenderConfigurations()
             {
                 using (new EditorGUI.IndentLevelScope())
                 {
-                    // todo
                     RenderToggle(MRConfig.XRManagerWindows, "Windows XR");
                     RenderToggle(MRConfig.XRManagerOculus, "Oculus XR");
                     RenderToggle(MRConfig.XRManagerAndroid, "Android ARCore XR");

Assets/MixedRealityToolkit/Utilities/Editor/XRSettingsUtilities.cs

@@ -0,0 +1,52 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+using System.Collections.Generic;
+using UnityEditor;
+using UnityEngine;
+
+#if UNITY_2019_3_OR_NEWER
+using UnityEditor.PackageManager;
+using UnityEditor.PackageManager.Requests;
+using PackageInfo = UnityEditor.PackageManager.PackageInfo;
+#endif // UNITY_2019_3_OR_NEWER
+
+#if XR_MANAGEMENT_ENABLED
+using System.Threading;
+using UnityEngine.XR.Management;
+#endif //XR_MANAGEMENT_ENABLED
+
+namespace Microsoft.MixedReality.Toolkit.Utilities.Editor
+{
+    /// <summary>
+    /// Utilities that abstract XR settings functionality so that the MRTK need not know which
+    /// implementation is being used.
+    /// </summary>
+    public static class XRSettingsUtilities
+    {
+        /// <summary>
+        /// Gets or sets the legacy virtual reality supported property in the player settings object.
+        /// </summary>
+        public static bool LegacyXREnabled
+        {
+            get
+            {
+                // Ensure compatibility with the pre-2019.3 XR architecture for customers / platforms
+                // with legacy requirements.
+#pragma warning disable 0618
+                return PlayerSettings.virtualRealitySupported;
+#pragma warning restore 0618
+            }
+
+            set
+            {
+                // Ensure compatibility with the pre-2019.3 XR architecture for customers / platforms
+                // with legacy requirements.
+#pragma warning disable 0618
+                PlayerSettings.virtualRealitySupported = value;
+#pragma warning restore 0618
+            }
+        }
+
+    }
+}