Skip to content

Commit e07e811

Browse files
committed
Rename Active -> Available to match new terminology
From configurator PR
1 parent ab21df0 commit e07e811

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

Assets/MRTK/Core/Definitions/MixedRealityToolkitConfigurationProfile.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ public bool IsBoundarySystemEnabled
169169
/// <summary>
170170
/// Boundary system class to instantiate at runtime.
171171
/// </summary>
172-
public SystemType BoundarySystemSystemType => (!XRSettingsUtilities.IsLegacyXRActive && xrsdkBoundarySystemType?.Type != null) ? xrsdkBoundarySystemType : boundarySystemType;
172+
public SystemType BoundarySystemSystemType => (!XRSettingsUtilities.LegacyXRAvailable && xrsdkBoundarySystemType?.Type != null) ? xrsdkBoundarySystemType : boundarySystemType;
173173

174174
[SerializeField]
175175
[Tooltip("Profile for wiring up boundary visualization assets.")]

Assets/MRTK/Core/Services/BaseDataProviderAccessCoreSystem.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ private bool RegisterDataProviderInternal<T>(
216216
#if UNITY_2020_1_OR_NEWER
217217
SupportedUnityXRPipelines.XRSDK;
218218
#elif UNITY_2019
219-
!XRSettingsUtilities.IsLegacyXRActive ? SupportedUnityXRPipelines.XRSDK : SupportedUnityXRPipelines.LegacyXR;
219+
!XRSettingsUtilities.LegacyXRAvailable ? SupportedUnityXRPipelines.XRSDK : SupportedUnityXRPipelines.LegacyXR;
220220
#else
221221
SupportedUnityXRPipelines.LegacyXR;
222222
#endif

Assets/MRTK/Core/Utilities/XRSettingsUtilities.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,20 +16,20 @@ namespace Microsoft.MixedReality.Toolkit.Utilities
1616
public static class XRSettingsUtilities
1717
{
1818
#if UNITY_2019_3_OR_NEWER
19-
private static bool? isLegacyXRActive = null;
19+
private static bool? legacyXRAvailable = null;
2020
#endif // UNITY_2019_3_OR_NEWER
2121

2222
/// <summary>
2323
/// Checks if an XR SDK plug-in is installed that disables legacy VR. Returns false if so.
2424
/// </summary>
25-
public static bool IsLegacyXRActive
25+
public static bool LegacyXRAvailable
2626
{
2727
get
2828
{
2929
#if UNITY_2019_3_OR_NEWER
30-
if (!isLegacyXRActive.HasValue)
30+
if (!legacyXRAvailable.HasValue)
3131
{
32-
isLegacyXRActive = true;
32+
legacyXRAvailable = true;
3333

3434
List<XRDisplaySubsystemDescriptor> descriptors = new List<XRDisplaySubsystemDescriptor>();
3535
SubsystemManager.GetSubsystemDescriptors(descriptors);
@@ -38,13 +38,13 @@ public static bool IsLegacyXRActive
3838
{
3939
if (displayDescriptor.disablesLegacyVr)
4040
{
41-
isLegacyXRActive = false;
41+
legacyXRAvailable = false;
4242
break;
4343
}
4444
}
4545
}
4646

47-
return isLegacyXRActive.HasValue && isLegacyXRActive.Value;
47+
return legacyXRAvailable.HasValue && legacyXRAvailable.Value;
4848
#else
4949
return true;
5050
#endif // UNITY_2019_3_OR_NEWER

0 commit comments

Comments
 (0)