Disable button adding openxr xr plugin in settings since its not fully supported yet

lawwong · lawwong · commit 54542a98b862 · 2021-05-12T18:57:33.000+08:00
diff --git a/Assets/HTC.UnityPlugin/ViveInputUtility/Scripts/Editor/VRPlatformSettings/OculusGoSettings.cs b/Assets/HTC.UnityPlugin/ViveInputUtility/Scripts/Editor/VRPlatformSettings/OculusGoSettings.cs
@@ -588,7 +588,7 @@ public override void OnPreferenceGUI()
                         GUILayout.FlexibleSpace();
                         ShowSwitchPlatformButton(BuildTargetGroup.Android, BuildTarget.Android);
                     }
-#if UNITY_2020_2_OR_NEWER 
+#if UNITY_2020_2_OR_NEWER && FALSE // openxr not fully supported yet
                     else if (!PackageManagerHelper.IsPackageInList(OPENXR_PLUGIN_PACKAGE_NAME))
                     {
                         GUI.enabled = false;
diff --git a/Assets/HTC.UnityPlugin/ViveInputUtility/Scripts/Editor/VRPlatformSettings/OculusSettings.cs b/Assets/HTC.UnityPlugin/ViveInputUtility/Scripts/Editor/VRPlatformSettings/OculusSettings.cs
@@ -176,7 +176,7 @@ public override void OnPreferenceGUI()
                         GUILayout.FlexibleSpace();
                         ShowSwitchPlatformButton(BuildTargetGroup.Standalone, BuildTarget.StandaloneWindows64);
                     }
-#if UNITY_2020_2_OR_NEWER
+#if UNITY_2020_2_OR_NEWER && FALSE // openxr not fully supported yet
                     else if (!PackageManagerHelper.IsPackageInList(OPENXR_PLUGIN_PACKAGE_NAME))
                     {
                         GUI.enabled = false;
diff --git a/Assets/HTC.UnityPlugin/ViveInputUtility/Scripts/Editor/VRPlatformSettings/OpenVRSettings.cs b/Assets/HTC.UnityPlugin/ViveInputUtility/Scripts/Editor/VRPlatformSettings/OpenVRSettings.cs
@@ -341,7 +341,7 @@ public OpenVRRecommendedSettings()
 
     public static partial class VIUSettingsEditor
     {
-        public const string URL_STEAM_VR_PLUGIN = "https://assetstore.unity.com/packages/slug/32647?";
+        public const string URL_STEAM_VR_PLUGIN = "https://assetstore.unity.com/packages/slug/32647";
 
         private const string OPENVR_PACKAGE_NAME = "com.unity.xr.openvr.standalone";
         private const string OPENVR_XR_PACKAGE_NAME_OLD = "com.valve.openvr";
@@ -478,7 +478,7 @@ public override void OnPreferenceGUI()
                         GUILayout.FlexibleSpace();
                         ShowSwitchPlatformButton(BuildTargetGroup.Standalone, BuildTarget.StandaloneWindows64);
                     }
-#if UNITY_2020_2_OR_NEWER
+#if UNITY_2020_2_OR_NEWER && FALSE // openxr not fully supported yet
                     else if (!PackageManagerHelper.IsPackageInList(OPENXR_PLUGIN_PACKAGE_NAME))
                     {
                         GUI.enabled = false;
@@ -487,7 +487,7 @@ public override void OnPreferenceGUI()
                         GUILayout.FlexibleSpace();
                         ShowAddPackageButton("OpenXR Plugin", OPENXR_PLUGIN_PACKAGE_NAME);
                     }
-#elif UNITY_2019_3_OR_NEWER
+#elif UNITY_2019_3_OR_NEWER && FALSE // openvr xr plugin on Valve registry is obsolete
                     else if (!PackageManagerHelper.IsPackageInList(OPENVR_XR_PACKAGE_NAME))
                     {
                         GUI.enabled = false;
@@ -506,7 +506,7 @@ public override void OnPreferenceGUI()
                             VIUProjectSettings.Instance.isInstallingOpenVRXRPlugin = true;
                         }
                     }
-#elif UNITY_2018_2_OR_NEWER
+#elif UNITY_2018_2_OR_NEWER && FALSE // obsolete
                     else if (!PackageManagerHelper.IsPackageInList(OPENVR_PACKAGE_NAME))
                     {
                         GUI.enabled = false;
diff --git a/Assets/HTC.UnityPlugin/ViveInputUtility/Scripts/Editor/VRPlatformSettings/WaveVRSettings.cs b/Assets/HTC.UnityPlugin/ViveInputUtility/Scripts/Editor/VRPlatformSettings/WaveVRSettings.cs
@@ -202,7 +202,12 @@ public override void OnPreferenceGUI()
                     const float wvrToggleWidth = 226f;
                     GUILayout.BeginHorizontal();
                     Foldouter.ShowFoldoutBlank();
-#if UNITY_5_6_OR_NEWER && !UNITY_5_6_0 && !UNITY_5_6_1 && !UNITY_5_6_2
+
+#if !UNITY_5_6_OR_NEWER || UNITY_5_6_0 || UNITY_5_6_1 || UNITY_5_6_2
+                    GUI.enabled = false;
+                    ShowToggle(new GUIContent(title, "Unity 5.6.3 or later version required."), false, GUILayout.Width(wvrToggleWidth));
+                    GUI.enabled = true;
+#else
                     if (activeBuildTargetGroup != BuildTargetGroup.Android)
                     {
                         GUI.enabled = false;
@@ -239,11 +244,8 @@ public override void OnPreferenceGUI()
                         GUILayout.FlexibleSpace();
                         ShowUrlLinkButton(URL_WAVE_VR_PLUGIN);
                     }
-#else
-                    GUI.enabled = false;
-                    ShowToggle(new GUIContent(title, "Unity 5.6.3 or later version required."), false, GUILayout.Width(wvrToggleWidth));
-                    GUI.enabled = true;
 #endif
+
                     GUILayout.EndHorizontal();
                 }
 
diff --git a/Assets/HTC.UnityPlugin/ViveInputUtility/Scripts/Editor/VRPlatformSettings/WindowsMRSettings.cs b/Assets/HTC.UnityPlugin/ViveInputUtility/Scripts/Editor/VRPlatformSettings/WindowsMRSettings.cs
@@ -128,7 +128,7 @@ public override void OnPreferenceGUI()
                         GUILayout.FlexibleSpace();
                         ShowSwitchPlatformButton(BuildTargetGroup.Standalone, BuildTarget.StandaloneWindows64);
                     }
-#if UNITY_2020_2_OR_NEWER
+#if UNITY_2020_2_OR_NEWER && FALSE // openxr not fully supported yet
                     else if (!PackageManagerHelper.IsPackageInList(OPENXR_PLUGIN_PACKAGE_NAME))
                     {
                         GUI.enabled = false;

Original file line number	Diff line number	Diff line change
`@@ -588,7 +588,7 @@ public override void OnPreferenceGUI()`
`588`	`588`	`GUILayout.FlexibleSpace();`
`589`	`589`	`ShowSwitchPlatformButton(BuildTargetGroup.Android, BuildTarget.Android);`
`590`	`590`	`}`
`591`		`-#if UNITY_2020_2_OR_NEWER`
	`591`	`+#if UNITY_2020_2_OR_NEWER && FALSE // openxr not fully supported yet`
`592`	`592`	`else if (!PackageManagerHelper.IsPackageInList(OPENXR_PLUGIN_PACKAGE_NAME))`
`593`	`593`	`{`
`594`	`594`	`GUI.enabled = false;`
Original file line number	Diff line number	Diff line change
`@@ -176,7 +176,7 @@ public override void OnPreferenceGUI()`
`176`	`176`	`GUILayout.FlexibleSpace();`
`177`	`177`	`ShowSwitchPlatformButton(BuildTargetGroup.Standalone, BuildTarget.StandaloneWindows64);`
`178`	`178`	`}`
`179`		`-#if UNITY_2020_2_OR_NEWER`
	`179`	`+#if UNITY_2020_2_OR_NEWER && FALSE // openxr not fully supported yet`
`180`	`180`	`else if (!PackageManagerHelper.IsPackageInList(OPENXR_PLUGIN_PACKAGE_NAME))`
`181`	`181`	`{`
`182`	`182`	`GUI.enabled = false;`
Original file line number	Diff line number	Diff line change
`@@ -341,7 +341,7 @@ public OpenVRRecommendedSettings()`
`341`	`341`
`342`	`342`	`public static partial class VIUSettingsEditor`
`343`	`343`	`{`
`344`		`- public const string URL_STEAM_VR_PLUGIN = "https://assetstore.unity.com/packages/slug/32647?";`
	`344`	`+ public const string URL_STEAM_VR_PLUGIN = "https://assetstore.unity.com/packages/slug/32647";`
`345`	`345`
`346`	`346`	`private const string OPENVR_PACKAGE_NAME = "com.unity.xr.openvr.standalone";`
`347`	`347`	`private const string OPENVR_XR_PACKAGE_NAME_OLD = "com.valve.openvr";`
`@@ -478,7 +478,7 @@ public override void OnPreferenceGUI()`
`478`	`478`	`GUILayout.FlexibleSpace();`
`479`	`479`	`ShowSwitchPlatformButton(BuildTargetGroup.Standalone, BuildTarget.StandaloneWindows64);`
`480`	`480`	`}`
`481`		`-#if UNITY_2020_2_OR_NEWER`
	`481`	`+#if UNITY_2020_2_OR_NEWER && FALSE // openxr not fully supported yet`
`482`	`482`	`else if (!PackageManagerHelper.IsPackageInList(OPENXR_PLUGIN_PACKAGE_NAME))`
`483`	`483`	`{`
`484`	`484`	`GUI.enabled = false;`
`@@ -487,7 +487,7 @@ public override void OnPreferenceGUI()`
`487`	`487`	`GUILayout.FlexibleSpace();`
`488`	`488`	`ShowAddPackageButton("OpenXR Plugin", OPENXR_PLUGIN_PACKAGE_NAME);`
`489`	`489`	`}`
`490`		`-#elif UNITY_2019_3_OR_NEWER`
	`490`	`+#elif UNITY_2019_3_OR_NEWER && FALSE // openvr xr plugin on Valve registry is obsolete`
`491`	`491`	`else if (!PackageManagerHelper.IsPackageInList(OPENVR_XR_PACKAGE_NAME))`
`492`	`492`	`{`
`493`	`493`	`GUI.enabled = false;`
`@@ -506,7 +506,7 @@ public override void OnPreferenceGUI()`
`506`	`506`	`VIUProjectSettings.Instance.isInstallingOpenVRXRPlugin = true;`
`507`	`507`	`}`
`508`	`508`	`}`
`509`		`-#elif UNITY_2018_2_OR_NEWER`
	`509`	`+#elif UNITY_2018_2_OR_NEWER && FALSE // obsolete`
`510`	`510`	`else if (!PackageManagerHelper.IsPackageInList(OPENVR_PACKAGE_NAME))`
`511`	`511`	`{`
`512`	`512`	`GUI.enabled = false;`
Original file line number	Diff line number	Diff line change
`@@ -128,7 +128,7 @@ public override void OnPreferenceGUI()`
`128`	`128`	`GUILayout.FlexibleSpace();`
`129`	`129`	`ShowSwitchPlatformButton(BuildTargetGroup.Standalone, BuildTarget.StandaloneWindows64);`
`130`	`130`	`}`
`131`		`-#if UNITY_2020_2_OR_NEWER`
	`131`	`+#if UNITY_2020_2_OR_NEWER && FALSE // openxr not fully supported yet`
`132`	`132`	`else if (!PackageManagerHelper.IsPackageInList(OPENXR_PLUGIN_PACKAGE_NAME))`
`133`	`133`	`{`
`134`	`134`	`GUI.enabled = false;`