Update compatibility with com.unity.xr.openxr 1.4.2 or newer

ChengNan Yang · ChengNan Yang · commit 572b266aa27f · 2022-08-16T16:27:10.000+08:00
diff --git a/Assets/HTC.UnityPlugin/VRModule/Modules/Editor/UnityEngineVRModuleEditor.cs b/Assets/HTC.UnityPlugin/VRModule/Modules/Editor/UnityEngineVRModuleEditor.cs
@@ -127,14 +127,14 @@ public UnityEngineVRSymbolRequirementCollection()
                 reqTypeNames = new string[]
                 {
                     "UnityEditor.XR.OpenXR.OpenXRProjectValidation",
-                    "UnityEditor.XR.OpenXR.OpenXRProjectValidationWindow",
+                    "UnityEditor.XR.OpenXR.OpenXRProjectValidationRulesSetup",
                     "UnityEngine.XR.OpenXR.OpenXRSettings",
                     "UnityEngine.XR.OpenXR.Features.OpenXRFeature",
                 },
                 reqFileNames = new string[]
                 {
                     "OpenXRProjectValidation.cs",
-                    "OpenXRProjectValidationWindow.cs",
+                    "OpenXRProjectValidationRulesSetup.cs",
                     "OpenXRFeature.cs",
                 },
             });
diff --git a/Assets/HTC.UnityPlugin/ViveInputUtility/Scripts/Editor/VRPlatformSettings/UnityXRSettings.cs b/Assets/HTC.UnityPlugin/ViveInputUtility/Scripts/Editor/VRPlatformSettings/UnityXRSettings.cs
@@ -46,12 +46,12 @@ public UnityXRRecommendedSettings()
                             }
                         }
 
-                        MethodInfo openWindowMethod = openXREditorAsm.GetType("UnityEditor.XR.OpenXR.OpenXRProjectValidationWindow", true).GetMethod("ShowWindow", BindingFlags.NonPublic | BindingFlags.Static);
+                        MethodInfo openWindowMethod = openXREditorAsm.GetType("UnityEditor.XR.OpenXR.OpenXRProjectValidationRulesSetup", true).GetMethod("ShowWindow", BindingFlags.NonPublic | BindingFlags.Static);
                         openWindowMethod.Invoke(null, new object[] {VIUSettingsEditor.activeBuildTargetGroup});
                     }
                     catch (Exception e)
                     {
-                        Debug.LogError("Failed to open OpenXRProjectValidationWindow: " + e);
+                        Debug.LogError("Failed to open OpenXRProjectValidationRulesSetup: " + e);
                     }
                 },
                 recommendedValue = 0,

Original file line number	Diff line number	Diff line change
`@@ -46,12 +46,12 @@ public UnityXRRecommendedSettings()`
`46`	`46`	`}`
`47`	`47`	`}`
`48`	`48`
`49`		`- MethodInfo openWindowMethod = openXREditorAsm.GetType("UnityEditor.XR.OpenXR.OpenXRProjectValidationWindow", true).GetMethod("ShowWindow", BindingFlags.NonPublic \| BindingFlags.Static);`
	`49`	`+ MethodInfo openWindowMethod = openXREditorAsm.GetType("UnityEditor.XR.OpenXR.OpenXRProjectValidationRulesSetup", true).GetMethod("ShowWindow", BindingFlags.NonPublic \| BindingFlags.Static);`
`50`	`50`	`openWindowMethod.Invoke(null, new object[] {VIUSettingsEditor.activeBuildTargetGroup});`
`51`	`51`	`}`
`52`	`52`	`catch (Exception e)`
`53`	`53`	`{`
`54`		`- Debug.LogError("Failed to open OpenXRProjectValidationWindow: " + e);`
	`54`	`+ Debug.LogError("Failed to open OpenXRProjectValidationRulesSetup: " + e);`
`55`	`55`	`}`
`56`	`56`	`},`
`57`	`57`	`recommendedValue = 0,`