Add compatible with lateast uxr management

lawwong · lawwong · commit d39f50e652e0 · 2023-08-18T14:25:21.000+08:00
seems like in some version, uxr loaders name use loader class name instead
of butified name
diff --git a/Assets/HTC.UnityPlugin/ViveInputUtility/Scripts/Editor/VRPlatformSettings/OculusGoSettings.cs b/Assets/HTC.UnityPlugin/ViveInputUtility/Scripts/Editor/VRPlatformSettings/OculusGoSettings.cs
@@ -506,7 +506,7 @@ public override bool support
                     if (editorGraphicsJobs) { return false; }
 #if UNITY_2019_3_OR_NEWER
                     if (!VIUSettings.activateOculusVRModule && !VIUSettings.activateUnityXRModule) { return false; }
-                    if (!XRPluginManagementUtils.IsXRLoaderEnabled(OculusVRModule.OCULUS_XR_LOADER_NAME, requirdPlatform)) { return false; }
+                    if (!XRPluginManagementUtils.IsXRLoaderEnabled(OculusVRModule.OCULUS_XR_LOADER_NAME, OculusVRModule.OCULUS_XR_LOADER_CLASS_NAME, requirdPlatform)) { return false; }
 #else
                     if (!VIUSettings.activateOculusVRModule && !VIUSettings.activateUnityNativeVRModule) { return false; }
                     if (!OculusSDK.enabled) { return false; }
diff --git a/Assets/HTC.UnityPlugin/ViveInputUtility/Scripts/Editor/VRPlatformSettings/OculusSettings.cs b/Assets/HTC.UnityPlugin/ViveInputUtility/Scripts/Editor/VRPlatformSettings/OculusSettings.cs
@@ -144,7 +144,7 @@ public override bool support
                     if (!canSupport) { return false; }
 #if UNITY_2019_3_OR_NEWER
                     if (!VIUSettings.activateOculusVRModule && !VIUSettings.activateUnityXRModule) { return false; }
-                    if (!XRPluginManagementUtils.IsXRLoaderEnabled(OculusVRModule.OCULUS_XR_LOADER_NAME, requirdPlatform)) { return false; }
+                    if (!XRPluginManagementUtils.IsXRLoaderEnabled(OculusVRModule.OCULUS_XR_LOADER_NAME, OculusVRModule.OCULUS_XR_LOADER_CLASS_NAME, requirdPlatform)) { return false; }
 #elif UNITY_5_5_OR_NEWER
                     if (!VIUSettings.activateOculusVRModule && !VIUSettings.activateUnityNativeVRModule) { return false; }
                     if (!OculusSDK.enabled) { return false; }
diff --git a/Assets/HTC.UnityPlugin/ViveInputUtility/Scripts/Editor/VRPlatformSettings/OpenVRSettings.cs b/Assets/HTC.UnityPlugin/ViveInputUtility/Scripts/Editor/VRPlatformSettings/OpenVRSettings.cs
@@ -406,7 +406,7 @@ public override bool support
                 {
                     if (!canSupport) { return false; }
 #if UNITY_2019_3_OR_NEWER
-                    return (VIUSettings.activateSteamVRModule || VIUSettings.activateUnityXRModule) && XRPluginManagementUtils.IsXRLoaderEnabled(SteamVRModule.OPENVR_XR_LOADER_NAME, requirdPlatform);
+                    return (VIUSettings.activateSteamVRModule || VIUSettings.activateUnityXRModule) && XRPluginManagementUtils.IsXRLoaderEnabled(SteamVRModule.OPENVR_XR_LOADER_NAME, SteamVRModule.OPENVR_XR_LOADER_CLASS_NAME, requirdPlatform);
 #elif UNITY_5_5_OR_NEWER
                     return (VIUSettings.activateSteamVRModule || VIUSettings.activateUnityNativeVRModule) && OpenVRSDK.enabled;
 #elif UNITY_5_4_OR_NEWER
@@ -629,7 +629,7 @@ public override void OnPreferenceGUI()
                 {
                     bool isPackageInstalled = PackageManagerHelper.IsPackageInList(OPENVR_XR_PACKAGE_NAME) ||
                                               PackageManagerHelper.IsPackageInList(OPENVR_XR_PACKAGE_NAME_OLD);
-                    bool isLoaderEnabled = XRPluginManagementUtils.IsXRLoaderEnabled(SteamVRModule.OPENVR_XR_LOADER_NAME, BuildTargetGroup.Standalone);
+                    bool isLoaderEnabled = XRPluginManagementUtils.IsXRLoaderEnabled(SteamVRModule.OPENVR_XR_LOADER_NAME, SteamVRModule.OPENVR_XR_LOADER_CLASS_NAME, BuildTargetGroup.Standalone);
                     if (isPackageInstalled && !isLoaderEnabled)
                     {
                         XRPluginManagementUtils.SetXRLoaderEnabled(SteamVRModule.OPENVR_XR_LOADER_CLASS_NAME, BuildTargetGroup.Standalone, true);
diff --git a/Assets/HTC.UnityPlugin/ViveInputUtility/Scripts/Editor/VRPlatformSettings/OpenXRAndroidOculusSettings.cs b/Assets/HTC.UnityPlugin/ViveInputUtility/Scripts/Editor/VRPlatformSettings/OpenXRAndroidOculusSettings.cs
@@ -79,7 +79,7 @@ public override bool canSupport
                     if (PackageManagerHelper.IsPackageInList(WAVE_XR_OPENXR_PACKAGE)) { return false; }
                     if (PackageManagerHelper.IsPackageInList(OCULUS_XR_PACKAGE_NAME)) { return false; }
                     if (!PackageManagerHelper.IsPackageInList(OPENXR_PLUGIN_PACKAGE_NAME)) { return false; }
-                    if (!XRPluginManagementUtils.IsXRLoaderEnabled(OPENXR_PLUGIN_LOADER_NAME, requirdPlatform)) { return false; }
+                    if (!XRPluginManagementUtils.IsXRLoaderEnabled(OPENXR_PLUGIN_LOADER_NAME, OPENXR_PLUGIN_LOADER_TYPE, requirdPlatform)) { return false; }
                     return true;
                 }
             }
@@ -90,7 +90,7 @@ public override bool support
                 {
                     if (!canSupport) { return false; }
                     if (!VIUSettings.activateUnityXRModule) { return false; }
-                    if (!XRPluginManagementUtils.IsXRLoaderEnabled(OPENXR_PLUGIN_LOADER_NAME, requirdPlatform)) { return false; }
+                    if (!XRPluginManagementUtils.IsXRLoaderEnabled(OPENXR_PLUGIN_LOADER_NAME, OPENXR_PLUGIN_LOADER_TYPE, requirdPlatform)) { return false; }
                     if (IsOpenXRFeatureGroupEnabled(requirdPlatform, WAVE_XR_OPENXR_FEATURE_ID)) { return false; }
                     if (!IsOpenXRFeatureGroupEnabled(requirdPlatform, OCULUS_QUEST_OPENXR_FEATURE_ID)) { return false; }
                     return true;
@@ -204,7 +204,7 @@ public override void OnPreferenceGUI()
                             PackageManagerHelper.AddToPackageList(OPENXR_PLUGIN_PACKAGE_NAME);
                         }
                     }
-                    else if (!XRPluginManagementUtils.IsXRLoaderEnabled(OPENXR_PLUGIN_LOADER_NAME, requirdPlatform))
+                    else if (!XRPluginManagementUtils.IsXRLoaderEnabled(OPENXR_PLUGIN_LOADER_NAME, OPENXR_PLUGIN_LOADER_TYPE, requirdPlatform))
                     {
                         GUI.enabled = false;
                         ShowToggle(new GUIContent(s_title), false, GUILayout.Width(toggleWidth));
diff --git a/Assets/HTC.UnityPlugin/ViveInputUtility/Scripts/Editor/VRPlatformSettings/OpenXRAndroidWaveSettings.cs b/Assets/HTC.UnityPlugin/ViveInputUtility/Scripts/Editor/VRPlatformSettings/OpenXRAndroidWaveSettings.cs
@@ -85,7 +85,7 @@ public override bool canSupport
                     if (PackageManagerHelper.IsPackageInList(OCULUS_XR_PACKAGE_NAME)) { return false; }
                     if (PackageManagerHelper.IsPackageInList(WAVE_XR_PACKAGE_NAME)) { return false; }
                     if (!PackageManagerHelper.IsPackageInList(WAVE_XR_OPENXR_PACKAGE)) { return false; }
-                    if (!XRPluginManagementUtils.IsXRLoaderEnabled(OPENXR_PLUGIN_LOADER_NAME, requirdPlatform)) { return false; }
+                    if (!XRPluginManagementUtils.IsXRLoaderEnabled(OPENXR_PLUGIN_LOADER_NAME, OPENXR_PLUGIN_LOADER_TYPE, requirdPlatform)) { return false; }
                     return true;
                 }
             }
@@ -96,7 +96,7 @@ public override bool support
                 {
                     if (!canSupport) { return false; }
                     if (!VIUSettings.activateUnityXRModule) { return false; }
-                    if (!XRPluginManagementUtils.IsXRLoaderEnabled(OPENXR_PLUGIN_LOADER_NAME, requirdPlatform)) { return false; }
+                    if (!XRPluginManagementUtils.IsXRLoaderEnabled(OPENXR_PLUGIN_LOADER_NAME, OPENXR_PLUGIN_LOADER_TYPE, requirdPlatform)) { return false; }
                     if (IsOpenXRFeatureGroupEnabled(requirdPlatform, OCULUS_QUEST_OPENXR_FEATURE_ID)) { return false; }
                     if (!IsOpenXRFeatureGroupEnabled(requirdPlatform, WAVE_XR_OPENXR_FEATURE_ID)) { return false; }
                     return true;
@@ -204,7 +204,7 @@ public override void OnPreferenceGUI()
                             PackageManagerHelper.AddToPackageList(WAVE_XR_OPENXR_PACKAGE);
                         }
                     }
-                    else if (!XRPluginManagementUtils.IsXRLoaderEnabled(OPENXR_PLUGIN_LOADER_NAME, requirdPlatform))
+                    else if (!XRPluginManagementUtils.IsXRLoaderEnabled(OPENXR_PLUGIN_LOADER_NAME, OPENXR_PLUGIN_LOADER_TYPE, requirdPlatform))
                     {
                         GUI.enabled = false;
                         ShowToggle(new GUIContent(s_title), false, GUILayout.Width(toggleWidth));
diff --git a/Assets/HTC.UnityPlugin/ViveInputUtility/Scripts/Editor/VRPlatformSettings/OpenXRDesktopSettings.cs b/Assets/HTC.UnityPlugin/ViveInputUtility/Scripts/Editor/VRPlatformSettings/OpenXRDesktopSettings.cs
@@ -31,7 +31,7 @@ public override bool support
                 {
                     if (!canSupport) { return false; }
                     if (!VIUSettings.activateUnityXRModule) { return false; }
-                    if (!XRPluginManagementUtils.IsXRLoaderEnabled(OPENXR_PLUGIN_LOADER_NAME, requirdPlatform)) { return false; }
+                    if (!XRPluginManagementUtils.IsXRLoaderEnabled(OPENXR_PLUGIN_LOADER_NAME, OPENXR_PLUGIN_LOADER_TYPE, requirdPlatform)) { return false; }
                     return true;
                 }
                 set
@@ -84,7 +84,7 @@ public override void OnPreferenceGUI()
                             PackageManagerHelper.AddToPackageList(OPENXR_PLUGIN_PACKAGE_NAME);
                         }
                     }
-                    else if (!XRPluginManagementUtils.IsXRLoaderEnabled(OPENXR_PLUGIN_LOADER_NAME, requirdPlatform))
+                    else if (!XRPluginManagementUtils.IsXRLoaderEnabled(OPENXR_PLUGIN_LOADER_NAME, OPENXR_PLUGIN_LOADER_TYPE, requirdPlatform))
                     {
                         GUI.enabled = false;
                         ShowToggle(s_title, false, GUILayout.Width(toggleWidth));
diff --git a/Assets/HTC.UnityPlugin/ViveInputUtility/Scripts/Editor/VRPlatformSettings/UnityXRSettings.cs b/Assets/HTC.UnityPlugin/ViveInputUtility/Scripts/Editor/VRPlatformSettings/UnityXRSettings.cs
@@ -27,7 +27,7 @@ public UnityXRRecommendedSettings()
             Add(new VIUVersionCheck.RecommendedSetting<int>
             {
                 settingTitle = "Review OpenXR Project Validation Issues",
-                skipCheckFunc = () => !VIUSettingsEditor.PackageManagerHelper.IsPackageInList(VIUSettingsEditor.OPENXR_PLUGIN_PACKAGE_NAME) || !XRPluginManagementUtils.IsXRLoaderEnabled(UnityXRModule.OPENXR_LOADER_NAME, VIUSettingsEditor.activeBuildTargetGroup),
+                skipCheckFunc = () => !VIUSettingsEditor.PackageManagerHelper.IsPackageInList(VIUSettingsEditor.OPENXR_PLUGIN_PACKAGE_NAME) || !XRPluginManagementUtils.IsXRLoaderEnabled(UnityXRModule.OPENXR_LOADER_NAME, UnityXRModule.OPENXR_LOADER_CLASS_NAME, VIUSettingsEditor.activeBuildTargetGroup),
                 currentValueFunc = () => {
                     OpenXRProjectValidation.GetCurrentValidationIssues(s_tempOpenXRValidationIssues, VIUSettingsEditor.activeBuildTargetGroup);
                     return s_tempOpenXRValidationIssues.Count;
@@ -60,7 +60,7 @@ public UnityXRRecommendedSettings()
             Add(new VIUVersionCheck.RecommendedSetting<bool>
             {
                 settingTitle = "Enable All Feature Sets",
-                skipCheckFunc = () => !VIUSettingsEditor.PackageManagerHelper.IsPackageInList(VIUSettingsEditor.OPENXR_PLUGIN_PACKAGE_NAME) || !XRPluginManagementUtils.IsXRLoaderEnabled(UnityXRModule.OPENXR_LOADER_NAME, VIUSettingsEditor.activeBuildTargetGroup),
+                skipCheckFunc = () => !VIUSettingsEditor.PackageManagerHelper.IsPackageInList(VIUSettingsEditor.OPENXR_PLUGIN_PACKAGE_NAME) || !XRPluginManagementUtils.IsXRLoaderEnabled(UnityXRModule.OPENXR_LOADER_NAME, UnityXRModule.OPENXR_LOADER_CLASS_NAME, VIUSettingsEditor.activeBuildTargetGroup),
                 currentValueFunc = () =>
                 {
                     return OpenXRSettings.ActiveBuildTargetInstance.GetFeatures<OpenXRInteractionFeature>().All(feature => feature.enabled);
diff --git a/Assets/HTC.UnityPlugin/ViveInputUtility/Scripts/Editor/VRPlatformSettings/WaveVRSettings.cs b/Assets/HTC.UnityPlugin/ViveInputUtility/Scripts/Editor/VRPlatformSettings/WaveVRSettings.cs
@@ -127,7 +127,7 @@ public override bool support
                     if (!VIUSettings.activateWaveVRModule) { return false; }
 
 #if VIU_XR_GENERAL_SETTINGS
-                    if (!(MockHMDSDK.enabled || XRPluginManagementUtils.IsXRLoaderEnabled(UnityXRModule.WAVE_XR_LOADER_NAME, requirdPlatform)))
+                    if (!(MockHMDSDK.enabled || XRPluginManagementUtils.IsXRLoaderEnabled(UnityXRModule.WAVE_XR_LOADER_NAME, UnityXRModule.WAVE_XR_LOADER_CLASS_NAME, requirdPlatform)))
                     {
                         return false;
                     }
@@ -453,7 +453,7 @@ public override void OnPreferenceGUI()
                 if (VIUProjectSettings.Instance.isInstallingWaveXRPlugin)
                 {
                     bool isPackageInstalled = PackageManagerHelper.IsPackageInList(WAVE_XR_PACKAGE_NAME);
-                    bool isLoaderEnabled = XRPluginManagementUtils.IsXRLoaderEnabled(UnityXRModule.WAVE_XR_LOADER_NAME, BuildTargetGroup.Android);
+                    bool isLoaderEnabled = XRPluginManagementUtils.IsXRLoaderEnabled(UnityXRModule.WAVE_XR_LOADER_NAME, UnityXRModule.WAVE_XR_LOADER_CLASS_NAME, BuildTargetGroup.Android);
                     if (isPackageInstalled && !isLoaderEnabled)
                     {
                         XRPluginManagementUtils.SetXRLoaderEnabled(UnityXRModule.WAVE_XR_LOADER_CLASS_NAME, BuildTargetGroup.Android, true);
diff --git a/Assets/HTC.UnityPlugin/ViveInputUtility/Scripts/Editor/VRPlatformSettings/WindowsMRSettings.cs b/Assets/HTC.UnityPlugin/ViveInputUtility/Scripts/Editor/VRPlatformSettings/WindowsMRSettings.cs
@@ -78,7 +78,7 @@ public override bool support
                 get
                 {
 #if UNITY_2019_3_OR_NEWER
-                    return canSupport && VIUSettings.activateUnityXRModule && XRPluginManagementUtils.IsXRLoaderEnabled(WINDOWSMR_XR_LOADER_NAME, requirdPlatform);
+                    return canSupport && VIUSettings.activateUnityXRModule && XRPluginManagementUtils.IsXRLoaderEnabled(WINDOWSMR_XR_LOADER_NAME, WINDOWSMR_XR_LOADER_CLASS_NAME, requirdPlatform);
 #elif UNITY_2018_2_OR_NEWER
                     return canSupport && VIUSettings.activateUnityNativeVRModule && WindowsMRSDK.enabled;
 #else
diff --git a/Assets/HTC.UnityPlugin/ViveInputUtility/Scripts/Editor/XRPluginManagementUtils.cs b/Assets/HTC.UnityPlugin/ViveInputUtility/Scripts/Editor/XRPluginManagementUtils.cs
@@ -19,7 +19,7 @@ namespace HTC.UnityPlugin.Vive
 {
     public static class XRPluginManagementUtils
     {
-        public static bool IsXRLoaderEnabled(string loaderName, BuildTargetGroup buildTargetGroup)
+        public static bool IsXRLoaderEnabled(string loaderName, string loaderClassName, BuildTargetGroup buildTargetGroup)
         {
 #if VIU_XR_GENERAL_SETTINGS
             XRGeneralSettings xrSettings = XRGeneralSettingsPerBuildTarget.XRGeneralSettingsForBuildTarget(buildTargetGroup);
@@ -35,7 +35,7 @@ public static bool IsXRLoaderEnabled(string loaderName, BuildTargetGroup buildTa
 
             foreach (XRLoader loader in xrSettings.AssignedSettings.loaders)
             {
-                if (loader.name == loaderName)
+                if (loader.name == loaderName || loader.name == loaderClassName)
                 {
                     return true;
                 }
@@ -44,7 +44,7 @@ public static bool IsXRLoaderEnabled(string loaderName, BuildTargetGroup buildTa
             return false;
         }
 
-        public static bool OnlyOneXRLoaderEnabled(string loaderName, BuildTargetGroup buildTargetGroup)
+        public static bool OnlyOneXRLoaderEnabled(string loaderName, string loaderClassName, BuildTargetGroup buildTargetGroup)
         {
 #if VIU_XR_GENERAL_SETTINGS
             XRGeneralSettings xrSettings = XRGeneralSettingsPerBuildTarget.XRGeneralSettingsForBuildTarget(buildTargetGroup);
@@ -59,7 +59,7 @@ public static bool OnlyOneXRLoaderEnabled(string loaderName, BuildTargetGroup bu
             }
 
             var loaders = xrSettings.AssignedSettings.loaders;
-            return loaders.Count == 1 && loaders[0].name == loaderName;
+            return loaders.Count == 1 && (loaders[0].name == loaderName || loaders[0].name == loaderClassName);
 #else
             return false;
 #endif

Original file line number	Diff line number	Diff line change
`@@ -406,7 +406,7 @@ public override bool support`
`406`	`406`	`{`
`407`	`407`	`if (!canSupport) { return false; }`
`408`	`408`	`#if UNITY_2019_3_OR_NEWER`
`409`		`- return (VIUSettings.activateSteamVRModule \|\| VIUSettings.activateUnityXRModule) && XRPluginManagementUtils.IsXRLoaderEnabled(SteamVRModule.OPENVR_XR_LOADER_NAME, requirdPlatform);`
	`409`	`+ return (VIUSettings.activateSteamVRModule \|\| VIUSettings.activateUnityXRModule) && XRPluginManagementUtils.IsXRLoaderEnabled(SteamVRModule.OPENVR_XR_LOADER_NAME, SteamVRModule.OPENVR_XR_LOADER_CLASS_NAME, requirdPlatform);`
`410`	`410`	`#elif UNITY_5_5_OR_NEWER`
`411`	`411`	`return (VIUSettings.activateSteamVRModule \|\| VIUSettings.activateUnityNativeVRModule) && OpenVRSDK.enabled;`
`412`	`412`	`#elif UNITY_5_4_OR_NEWER`
`@@ -629,7 +629,7 @@ public override void OnPreferenceGUI()`
`629`	`629`	`{`
`630`	`630`	`bool isPackageInstalled = PackageManagerHelper.IsPackageInList(OPENVR_XR_PACKAGE_NAME) \|\|`
`631`	`631`	`PackageManagerHelper.IsPackageInList(OPENVR_XR_PACKAGE_NAME_OLD);`
`632`		`- bool isLoaderEnabled = XRPluginManagementUtils.IsXRLoaderEnabled(SteamVRModule.OPENVR_XR_LOADER_NAME, BuildTargetGroup.Standalone);`
	`632`	`+ bool isLoaderEnabled = XRPluginManagementUtils.IsXRLoaderEnabled(SteamVRModule.OPENVR_XR_LOADER_NAME, SteamVRModule.OPENVR_XR_LOADER_CLASS_NAME, BuildTargetGroup.Standalone);`
`633`	`633`	`if (isPackageInstalled && !isLoaderEnabled)`
`634`	`634`	`{`
`635`	`635`	`XRPluginManagementUtils.SetXRLoaderEnabled(SteamVRModule.OPENVR_XR_LOADER_CLASS_NAME, BuildTargetGroup.Standalone, true);`
Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ public override bool canSupport`
`79`	`79`	`if (PackageManagerHelper.IsPackageInList(WAVE_XR_OPENXR_PACKAGE)) { return false; }`
`80`	`80`	`if (PackageManagerHelper.IsPackageInList(OCULUS_XR_PACKAGE_NAME)) { return false; }`
`81`	`81`	`if (!PackageManagerHelper.IsPackageInList(OPENXR_PLUGIN_PACKAGE_NAME)) { return false; }`
`82`		`- if (!XRPluginManagementUtils.IsXRLoaderEnabled(OPENXR_PLUGIN_LOADER_NAME, requirdPlatform)) { return false; }`
	`82`	`+ if (!XRPluginManagementUtils.IsXRLoaderEnabled(OPENXR_PLUGIN_LOADER_NAME, OPENXR_PLUGIN_LOADER_TYPE, requirdPlatform)) { return false; }`
`83`	`83`	`return true;`
`84`	`84`	`}`
`85`	`85`	`}`
`@@ -90,7 +90,7 @@ public override bool support`
`90`	`90`	`{`
`91`	`91`	`if (!canSupport) { return false; }`
`92`	`92`	`if (!VIUSettings.activateUnityXRModule) { return false; }`
`93`		`- if (!XRPluginManagementUtils.IsXRLoaderEnabled(OPENXR_PLUGIN_LOADER_NAME, requirdPlatform)) { return false; }`
	`93`	`+ if (!XRPluginManagementUtils.IsXRLoaderEnabled(OPENXR_PLUGIN_LOADER_NAME, OPENXR_PLUGIN_LOADER_TYPE, requirdPlatform)) { return false; }`
`94`	`94`	`if (IsOpenXRFeatureGroupEnabled(requirdPlatform, WAVE_XR_OPENXR_FEATURE_ID)) { return false; }`
`95`	`95`	`if (!IsOpenXRFeatureGroupEnabled(requirdPlatform, OCULUS_QUEST_OPENXR_FEATURE_ID)) { return false; }`
`96`	`96`	`return true;`
`@@ -204,7 +204,7 @@ public override void OnPreferenceGUI()`
`204`	`204`	`PackageManagerHelper.AddToPackageList(OPENXR_PLUGIN_PACKAGE_NAME);`
`205`	`205`	`}`
`206`	`206`	`}`
`207`		`- else if (!XRPluginManagementUtils.IsXRLoaderEnabled(OPENXR_PLUGIN_LOADER_NAME, requirdPlatform))`
	`207`	`+ else if (!XRPluginManagementUtils.IsXRLoaderEnabled(OPENXR_PLUGIN_LOADER_NAME, OPENXR_PLUGIN_LOADER_TYPE, requirdPlatform))`
`208`	`208`	`{`
`209`	`209`	`GUI.enabled = false;`
`210`	`210`	`ShowToggle(new GUIContent(s_title), false, GUILayout.Width(toggleWidth));`
Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ public override bool canSupport`
`85`	`85`	`if (PackageManagerHelper.IsPackageInList(OCULUS_XR_PACKAGE_NAME)) { return false; }`
`86`	`86`	`if (PackageManagerHelper.IsPackageInList(WAVE_XR_PACKAGE_NAME)) { return false; }`
`87`	`87`	`if (!PackageManagerHelper.IsPackageInList(WAVE_XR_OPENXR_PACKAGE)) { return false; }`
`88`		`- if (!XRPluginManagementUtils.IsXRLoaderEnabled(OPENXR_PLUGIN_LOADER_NAME, requirdPlatform)) { return false; }`
	`88`	`+ if (!XRPluginManagementUtils.IsXRLoaderEnabled(OPENXR_PLUGIN_LOADER_NAME, OPENXR_PLUGIN_LOADER_TYPE, requirdPlatform)) { return false; }`
`89`	`89`	`return true;`
`90`	`90`	`}`
`91`	`91`	`}`
`@@ -96,7 +96,7 @@ public override bool support`
`96`	`96`	`{`
`97`	`97`	`if (!canSupport) { return false; }`
`98`	`98`	`if (!VIUSettings.activateUnityXRModule) { return false; }`
`99`		`- if (!XRPluginManagementUtils.IsXRLoaderEnabled(OPENXR_PLUGIN_LOADER_NAME, requirdPlatform)) { return false; }`
	`99`	`+ if (!XRPluginManagementUtils.IsXRLoaderEnabled(OPENXR_PLUGIN_LOADER_NAME, OPENXR_PLUGIN_LOADER_TYPE, requirdPlatform)) { return false; }`
`100`	`100`	`if (IsOpenXRFeatureGroupEnabled(requirdPlatform, OCULUS_QUEST_OPENXR_FEATURE_ID)) { return false; }`
`101`	`101`	`if (!IsOpenXRFeatureGroupEnabled(requirdPlatform, WAVE_XR_OPENXR_FEATURE_ID)) { return false; }`
`102`	`102`	`return true;`
`@@ -204,7 +204,7 @@ public override void OnPreferenceGUI()`
`204`	`204`	`PackageManagerHelper.AddToPackageList(WAVE_XR_OPENXR_PACKAGE);`
`205`	`205`	`}`
`206`	`206`	`}`
`207`		`- else if (!XRPluginManagementUtils.IsXRLoaderEnabled(OPENXR_PLUGIN_LOADER_NAME, requirdPlatform))`
	`207`	`+ else if (!XRPluginManagementUtils.IsXRLoaderEnabled(OPENXR_PLUGIN_LOADER_NAME, OPENXR_PLUGIN_LOADER_TYPE, requirdPlatform))`
`208`	`208`	`{`
`209`	`209`	`GUI.enabled = false;`
`210`	`210`	`ShowToggle(new GUIContent(s_title), false, GUILayout.Width(toggleWidth));`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ public override bool support`
`31`	`31`	`{`
`32`	`32`	`if (!canSupport) { return false; }`
`33`	`33`	`if (!VIUSettings.activateUnityXRModule) { return false; }`
`34`		`- if (!XRPluginManagementUtils.IsXRLoaderEnabled(OPENXR_PLUGIN_LOADER_NAME, requirdPlatform)) { return false; }`
	`34`	`+ if (!XRPluginManagementUtils.IsXRLoaderEnabled(OPENXR_PLUGIN_LOADER_NAME, OPENXR_PLUGIN_LOADER_TYPE, requirdPlatform)) { return false; }`
`35`	`35`	`return true;`
`36`	`36`	`}`
`37`	`37`	`set`
`@@ -84,7 +84,7 @@ public override void OnPreferenceGUI()`
`84`	`84`	`PackageManagerHelper.AddToPackageList(OPENXR_PLUGIN_PACKAGE_NAME);`
`85`	`85`	`}`
`86`	`86`	`}`
`87`		`- else if (!XRPluginManagementUtils.IsXRLoaderEnabled(OPENXR_PLUGIN_LOADER_NAME, requirdPlatform))`
	`87`	`+ else if (!XRPluginManagementUtils.IsXRLoaderEnabled(OPENXR_PLUGIN_LOADER_NAME, OPENXR_PLUGIN_LOADER_TYPE, requirdPlatform))`
`88`	`88`	`{`
`89`	`89`	`GUI.enabled = false;`
`90`	`90`	`ShowToggle(s_title, false, GUILayout.Width(toggleWidth));`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ public UnityXRRecommendedSettings()`
`27`	`27`	`Add(new VIUVersionCheck.RecommendedSetting<int>`
`28`	`28`	`{`
`29`	`29`	`settingTitle = "Review OpenXR Project Validation Issues",`
`30`		`- skipCheckFunc = () => !VIUSettingsEditor.PackageManagerHelper.IsPackageInList(VIUSettingsEditor.OPENXR_PLUGIN_PACKAGE_NAME) \|\| !XRPluginManagementUtils.IsXRLoaderEnabled(UnityXRModule.OPENXR_LOADER_NAME, VIUSettingsEditor.activeBuildTargetGroup),`
	`30`	`+ skipCheckFunc = () => !VIUSettingsEditor.PackageManagerHelper.IsPackageInList(VIUSettingsEditor.OPENXR_PLUGIN_PACKAGE_NAME) \|\| !XRPluginManagementUtils.IsXRLoaderEnabled(UnityXRModule.OPENXR_LOADER_NAME, UnityXRModule.OPENXR_LOADER_CLASS_NAME, VIUSettingsEditor.activeBuildTargetGroup),`
`31`	`31`	`currentValueFunc = () => {`
`32`	`32`	`OpenXRProjectValidation.GetCurrentValidationIssues(s_tempOpenXRValidationIssues, VIUSettingsEditor.activeBuildTargetGroup);`
`33`	`33`	`return s_tempOpenXRValidationIssues.Count;`
`@@ -60,7 +60,7 @@ public UnityXRRecommendedSettings()`
`60`	`60`	`Add(new VIUVersionCheck.RecommendedSetting<bool>`
`61`	`61`	`{`
`62`	`62`	`settingTitle = "Enable All Feature Sets",`
`63`		`- skipCheckFunc = () => !VIUSettingsEditor.PackageManagerHelper.IsPackageInList(VIUSettingsEditor.OPENXR_PLUGIN_PACKAGE_NAME) \|\| !XRPluginManagementUtils.IsXRLoaderEnabled(UnityXRModule.OPENXR_LOADER_NAME, VIUSettingsEditor.activeBuildTargetGroup),`
	`63`	`+ skipCheckFunc = () => !VIUSettingsEditor.PackageManagerHelper.IsPackageInList(VIUSettingsEditor.OPENXR_PLUGIN_PACKAGE_NAME) \|\| !XRPluginManagementUtils.IsXRLoaderEnabled(UnityXRModule.OPENXR_LOADER_NAME, UnityXRModule.OPENXR_LOADER_CLASS_NAME, VIUSettingsEditor.activeBuildTargetGroup),`
`64`	`64`	`currentValueFunc = () =>`
`65`	`65`	`{`
`66`	`66`	`return OpenXRSettings.ActiveBuildTargetInstance.GetFeatures<OpenXRInteractionFeature>().All(feature => feature.enabled);`
Original file line number	Diff line number	Diff line change
`@@ -127,7 +127,7 @@ public override bool support`
`127`	`127`	`if (!VIUSettings.activateWaveVRModule) { return false; }`
`128`	`128`
`129`	`129`	`#if VIU_XR_GENERAL_SETTINGS`
`130`		`- if (!(MockHMDSDK.enabled \|\| XRPluginManagementUtils.IsXRLoaderEnabled(UnityXRModule.WAVE_XR_LOADER_NAME, requirdPlatform)))`
	`130`	`+ if (!(MockHMDSDK.enabled \|\| XRPluginManagementUtils.IsXRLoaderEnabled(UnityXRModule.WAVE_XR_LOADER_NAME, UnityXRModule.WAVE_XR_LOADER_CLASS_NAME, requirdPlatform)))`
`131`	`131`	`{`
`132`	`132`	`return false;`
`133`	`133`	`}`
`@@ -453,7 +453,7 @@ public override void OnPreferenceGUI()`
`453`	`453`	`if (VIUProjectSettings.Instance.isInstallingWaveXRPlugin)`
`454`	`454`	`{`
`455`	`455`	`bool isPackageInstalled = PackageManagerHelper.IsPackageInList(WAVE_XR_PACKAGE_NAME);`
`456`		`- bool isLoaderEnabled = XRPluginManagementUtils.IsXRLoaderEnabled(UnityXRModule.WAVE_XR_LOADER_NAME, BuildTargetGroup.Android);`
	`456`	`+ bool isLoaderEnabled = XRPluginManagementUtils.IsXRLoaderEnabled(UnityXRModule.WAVE_XR_LOADER_NAME, UnityXRModule.WAVE_XR_LOADER_CLASS_NAME, BuildTargetGroup.Android);`
`457`	`457`	`if (isPackageInstalled && !isLoaderEnabled)`
`458`	`458`	`{`
`459`	`459`	`XRPluginManagementUtils.SetXRLoaderEnabled(UnityXRModule.WAVE_XR_LOADER_CLASS_NAME, BuildTargetGroup.Android, true);`
Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ public override bool support`
`78`	`78`	`get`
`79`	`79`	`{`
`80`	`80`	`#if UNITY_2019_3_OR_NEWER`
`81`		`- return canSupport && VIUSettings.activateUnityXRModule && XRPluginManagementUtils.IsXRLoaderEnabled(WINDOWSMR_XR_LOADER_NAME, requirdPlatform);`
	`81`	`+ return canSupport && VIUSettings.activateUnityXRModule && XRPluginManagementUtils.IsXRLoaderEnabled(WINDOWSMR_XR_LOADER_NAME, WINDOWSMR_XR_LOADER_CLASS_NAME, requirdPlatform);`
`82`	`82`	`#elif UNITY_2018_2_OR_NEWER`
`83`	`83`	`return canSupport && VIUSettings.activateUnityNativeVRModule && WindowsMRSDK.enabled;`
`84`	`84`	`#else`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ namespace HTC.UnityPlugin.Vive`
`19`	`19`	`{`
`20`	`20`	`public static class XRPluginManagementUtils`
`21`	`21`	`{`
`22`		`- public static bool IsXRLoaderEnabled(string loaderName, BuildTargetGroup buildTargetGroup)`
	`22`	`+ public static bool IsXRLoaderEnabled(string loaderName, string loaderClassName, BuildTargetGroup buildTargetGroup)`
`23`	`23`	`{`
`24`	`24`	`#if VIU_XR_GENERAL_SETTINGS`
`25`	`25`	`XRGeneralSettings xrSettings = XRGeneralSettingsPerBuildTarget.XRGeneralSettingsForBuildTarget(buildTargetGroup);`
`@@ -35,7 +35,7 @@ public static bool IsXRLoaderEnabled(string loaderName, BuildTargetGroup buildTa`
`35`	`35`
`36`	`36`	`foreach (XRLoader loader in xrSettings.AssignedSettings.loaders)`
`37`	`37`	`{`
`38`		`- if (loader.name == loaderName)`
	`38`	`+ if (loader.name == loaderName \|\| loader.name == loaderClassName)`
`39`	`39`	`{`
`40`	`40`	`return true;`
`41`	`41`	`}`
`@@ -44,7 +44,7 @@ public static bool IsXRLoaderEnabled(string loaderName, BuildTargetGroup buildTa`
`44`	`44`	`return false;`
`45`	`45`	`}`
`46`	`46`
`47`		`- public static bool OnlyOneXRLoaderEnabled(string loaderName, BuildTargetGroup buildTargetGroup)`
	`47`	`+ public static bool OnlyOneXRLoaderEnabled(string loaderName, string loaderClassName, BuildTargetGroup buildTargetGroup)`
`48`	`48`	`{`
`49`	`49`	`#if VIU_XR_GENERAL_SETTINGS`
`50`	`50`	`XRGeneralSettings xrSettings = XRGeneralSettingsPerBuildTarget.XRGeneralSettingsForBuildTarget(buildTargetGroup);`
`@@ -59,7 +59,7 @@ public static bool OnlyOneXRLoaderEnabled(string loaderName, BuildTargetGroup bu`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`var loaders = xrSettings.AssignedSettings.loaders;`
`62`		`- return loaders.Count == 1 && loaders[0].name == loaderName;`
	`62`	`+ return loaders.Count == 1 && (loaders[0].name == loaderName \|\| loaders[0].name == loaderClassName);`
`63`	`63`	`#else`
`64`	`64`	`return false;`
`65`	`65`	`#endif`