Skip to content

Commit 5b18da3

Browse files
committed
Revert rename to fix configurator, which takes a much larger dependency on this class
1 parent 0eba244 commit 5b18da3

File tree

6 files changed

+8
-8
lines changed

6 files changed

+8
-8
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ private static void ShowProjectConfigurationDialog()
104104
/// </summary>
105105
private static void LogConfigurationWarnings()
106106
{
107-
if (!XRSettingsEditorUtilities.XREnabled)
107+
if (!XRSettingsUtilities.XREnabled)
108108
{
109109
Debug.LogWarning("There is no properly configured XR pipeline in the project! Please run the configurator by clicking on Mixed Reality (menu bar) -> Toolkit -> Utilities -> Configure Project for MRTK if the current settings are not desired.");
110110
}

Assets/MRTK/Core/Utilities/Editor/MixedRealityOptimizeUtils.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ public static void SetDepthBufferSharing(bool enableDepthBuffer)
103103
public static bool IsWMRDepthBufferFormat16bit()
104104
{
105105
#if !UNITY_2020_1_OR_NEWER
106-
if (XRSettingsEditorUtilities.XREnabled)
106+
if (XRSettingsUtilities.XREnabled)
107107
{
108108
#if UNITY_2019_1_OR_NEWER
109109
// Ensure compatibility with the pre-2019.3 XR architecture for customers / platforms

Assets/MRTK/Core/Utilities/Editor/Setup/MixedRealityProjectConfigurator.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ public bool IsActiveBuildTargetValid()
120120
{ Configurations.ForceTextSerialization, new ConfigGetter(IsForceTextSerialization) },
121121
{ Configurations.VisibleMetaFiles, new ConfigGetter(IsVisibleMetaFiles) },
122122
#if !UNITY_2019_3_OR_NEWER
123-
{ Configurations.VirtualRealitySupported, new ConfigGetter(() => XRSettingsEditorUtilities.LegacyXREnabled) },
123+
{ Configurations.VirtualRealitySupported, new ConfigGetter(() => XRSettingsUtilities.LegacyXREnabled) },
124124
#endif // !UNITY_2019_3_OR_NEWER
125125
{ Configurations.OptimalRenderingPath, new ConfigGetter(MixedRealityOptimizeUtils.IsOptimalRenderingPath) },
126126
{ Configurations.SpatialAwarenessLayer, new ConfigGetter(HasSpatialAwarenessLayer) },
@@ -164,7 +164,7 @@ public bool IsActiveBuildTargetValid()
164164
{ Configurations.ForceTextSerialization, SetForceTextSerialization },
165165
{ Configurations.VisibleMetaFiles, SetVisibleMetaFiles },
166166
#if !UNITY_2019_3_OR_NEWER
167-
{ Configurations.VirtualRealitySupported, () => XRSettingsEditorUtilities.LegacyXREnabled = true },
167+
{ Configurations.VirtualRealitySupported, () => XRSettingsUtilities.LegacyXREnabled = true },
168168
#endif // !UNITY_2019_3_OR_NEWER
169169
{ Configurations.OptimalRenderingPath, MixedRealityOptimizeUtils.SetOptimalRenderingPath },
170170
{ Configurations.SpatialAwarenessLayer, SetSpatialAwarenessLayer },

Assets/MRTK/Core/Utilities/Editor/XRSettingsEditorUtilities.cs renamed to Assets/MRTK/Core/Utilities/Editor/XRSettingsUtilities.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ namespace Microsoft.MixedReality.Toolkit.Utilities.Editor
1919
/// <summary>
2020
/// Utilities that abstract XR settings functionality
2121
/// </summary>
22-
public static class XRSettingsEditorUtilities
22+
public static class XRSettingsUtilities
2323
{
2424
/// <summary>
2525
/// Is either LegacyXR pipeline or XRSDK pipeline enabled?
@@ -152,7 +152,7 @@ public static bool XRManagementPresent
152152
#if UNITY_2019_3_OR_NEWER
153153
private static bool? isXRSDKSuppressingLegacyXR = null;
154154

155-
static XRSettingsEditorUtilities()
155+
static XRSettingsUtilities()
156156
{
157157
// Called when packages are installed or uninstalled
158158
EditorApplication.projectChanged += EditorApplication_projectChanged;

Assets/MRTK/Tools/OptimizeWindow/MixedRealityOptimizeWindow.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,12 +146,12 @@ private void OnGUI()
146146
EditorGUILayout.HelpBox(PerformanceTargetDescriptions[(int)PerfTarget], MessageType.Info);
147147
EditorGUILayout.Space();
148148

149-
if (!XRSettingsEditorUtilities.LegacyXREnabled && XRSettingsEditorUtilities.LegacyXRAvailable)
149+
if (!Utilities.Editor.XRSettingsUtilities.LegacyXREnabled && Utilities.Editor.XRSettingsUtilities.LegacyXRAvailable)
150150
{
151151
EditorGUILayout.HelpBox("Virtual reality support is not enabled in player settings", MessageType.Error);
152152
if (GUILayout.Button("Enable Virtual Reality Support"))
153153
{
154-
XRSettingsEditorUtilities.LegacyXREnabled = true;
154+
Utilities.Editor.XRSettingsUtilities.LegacyXREnabled = true;
155155
}
156156
}
157157
else

0 commit comments

Comments
 (0)