Fix Wave XR handtracking and tracker settings

ChengNan Yang · ChengNan Yang · commit e3a2d3fce9bb · 2022-02-23T15:27:45.000+08:00
* Both handtracking and tracker required Wave XR Plugin Native
diff --git a/Assets/HTC.UnityPlugin/ViveInputUtility/Scripts/Editor/VRPlatformSettings/WaveVRSettings.cs b/Assets/HTC.UnityPlugin/ViveInputUtility/Scripts/Editor/VRPlatformSettings/WaveVRSettings.cs
@@ -292,7 +292,7 @@ public override void OnPreferenceGUI()
                         GUI.enabled = true;
                         
                         s_guiChanged |= EditorGUI.EndChangeCheck();
-                        if (GUILayout.Button(new GUIContent("Add Wave XR Plugin Essence", "Add " + WAVE_XR_PACKAGE_NAME + " to Package Manager"), GUILayout.ExpandWidth(false)))
+                        if (GUILayout.Button(new GUIContent("Add Wave XR Plugin Essence", "Add " + WAVE_XR_PACKAGE_ESSENCE_NAME + " to Package Manager"), GUILayout.ExpandWidth(false)))
                         {
                             if (!ManifestUtils.CheckRegistryExists(RegistryToolSettings.Instance().Registry))
                             {
@@ -316,7 +316,7 @@ public override void OnPreferenceGUI()
 
                         const string enableWaveHandTrackingTitle = "Enable Wave Hand Tracking Support";
                         EditorGUILayout.BeginHorizontal();
-#if VIU_WAVEVR_HAND_TRACKING_CHECK
+#if VIU_WAVEVR_HAND_TRACKING_CHECK && VIU_WAVEVR_HAND_TRACKING
                         {
                             var supported = EditorPrefs.GetBool("Wave/HandTracking/EnableHandTracking", false) && VRModuleSettings.activateWaveHandTrackingSubmodule;
                             var shouldSupport = EditorGUILayout.ToggleLeft(new GUIContent(enableWaveHandTrackingTitle), supported);
@@ -336,7 +336,7 @@ public override void OnPreferenceGUI()
                         GUI.enabled = true;
 
                         s_guiChanged |= EditorGUI.EndChangeCheck();
-                        if (GUILayout.Button(new GUIContent("Update Wave XR Plugin", "Update " + WAVE_XR_PACKAGE_NAME + " to latest version"), GUILayout.ExpandWidth(false)))
+                        if (GUILayout.Button(new GUIContent("Update Wave XR Plugin Native", "Update " + WAVE_XR_PACKAGE_NATIVE_NAME + " to latest version"), GUILayout.ExpandWidth(false)))
                         {
                             if (!ManifestUtils.CheckRegistryExists(RegistryToolSettings.Instance().Registry))
                             {
@@ -347,13 +347,9 @@ public override void OnPreferenceGUI()
                             {
                                 PackageManagerHelper.AddToPackageList(WAVE_XR_PACKAGE_ESSENCE_NAME);
                             }
-                            else if (PackageManagerHelper.IsPackageInList(WAVE_XR_PACKAGE_NATIVE_NAME))
-                            {
-                                PackageManagerHelper.AddToPackageList(WAVE_XR_PACKAGE_NATIVE_NAME);
-                            }
                             else
                             {
-                                PackageManagerHelper.AddToPackageList(WAVE_XR_PACKAGE_NAME);
+                                PackageManagerHelper.AddToPackageList(WAVE_XR_PACKAGE_NATIVE_NAME);
                             }
 
                             VIUProjectSettings.Instance.isInstallingWaveXRPlugin = true;
@@ -368,7 +364,7 @@ public override void OnPreferenceGUI()
 
                         const string enableWaveTrackerTitle = "Enable Wave Tracker Support";
                         EditorGUILayout.BeginHorizontal();
-#if VIU_WAVEVR_TRACKER_CHECK
+#if VIU_WAVEVR_TRACKER_CHECK && VIU_WAVEVR_TRACKER
                         {
                             var supported = EditorPrefs.GetBool("Wave/Tracker/EnableTracker", false) && VRModuleSettings.activateWaveTrackerSubmodule;
                             var shouldSupport = EditorGUILayout.ToggleLeft(new GUIContent(enableWaveTrackerTitle), supported);
@@ -384,7 +380,7 @@ public override void OnPreferenceGUI()
                         GUI.enabled = true;
 
                         s_guiChanged |= EditorGUI.EndChangeCheck();
-                        if (GUILayout.Button(new GUIContent("Update Wave XR Plugin", "Update " + WAVE_XR_PACKAGE_NAME + " to latest version"), GUILayout.ExpandWidth(false)))
+                        if (GUILayout.Button(new GUIContent("Update Wave XR Plugin Native", "Update " + WAVE_XR_PACKAGE_NATIVE_NAME + " to latest version"), GUILayout.ExpandWidth(false)))
                         {
                             if (!ManifestUtils.CheckRegistryExists(RegistryToolSettings.Instance().Registry))
                             {
@@ -395,13 +391,9 @@ public override void OnPreferenceGUI()
                             {
                                 PackageManagerHelper.AddToPackageList(WAVE_XR_PACKAGE_ESSENCE_NAME);
                             }
-                            else if (PackageManagerHelper.IsPackageInList(WAVE_XR_PACKAGE_NATIVE_NAME))
-                            {
-                                PackageManagerHelper.AddToPackageList(WAVE_XR_PACKAGE_NATIVE_NAME);
-                            }
                             else
                             {
-                                PackageManagerHelper.AddToPackageList(WAVE_XR_PACKAGE_NAME);
+                                PackageManagerHelper.AddToPackageList(WAVE_XR_PACKAGE_NATIVE_NAME);
                             }
 
                             VIUProjectSettings.Instance.isInstallingWaveXRPlugin = true;

Original file line number	Diff line number	Diff line change
`@@ -292,7 +292,7 @@ public override void OnPreferenceGUI()`
`292`	`292`	`GUI.enabled = true;`
`293`	`293`
`294`	`294`	`s_guiChanged \|= EditorGUI.EndChangeCheck();`
`295`		`- if (GUILayout.Button(new GUIContent("Add Wave XR Plugin Essence", "Add " + WAVE_XR_PACKAGE_NAME + " to Package Manager"), GUILayout.ExpandWidth(false)))`
	`295`	`+ if (GUILayout.Button(new GUIContent("Add Wave XR Plugin Essence", "Add " + WAVE_XR_PACKAGE_ESSENCE_NAME + " to Package Manager"), GUILayout.ExpandWidth(false)))`
`296`	`296`	`{`
`297`	`297`	`if (!ManifestUtils.CheckRegistryExists(RegistryToolSettings.Instance().Registry))`
`298`	`298`	`{`
`@@ -316,7 +316,7 @@ public override void OnPreferenceGUI()`
`316`	`316`
`317`	`317`	`const string enableWaveHandTrackingTitle = "Enable Wave Hand Tracking Support";`
`318`	`318`	`EditorGUILayout.BeginHorizontal();`
`319`		`-#if VIU_WAVEVR_HAND_TRACKING_CHECK`
	`319`	`+#if VIU_WAVEVR_HAND_TRACKING_CHECK && VIU_WAVEVR_HAND_TRACKING`
`320`	`320`	`{`
`321`	`321`	`var supported = EditorPrefs.GetBool("Wave/HandTracking/EnableHandTracking", false) && VRModuleSettings.activateWaveHandTrackingSubmodule;`
`322`	`322`	`var shouldSupport = EditorGUILayout.ToggleLeft(new GUIContent(enableWaveHandTrackingTitle), supported);`
`@@ -336,7 +336,7 @@ public override void OnPreferenceGUI()`
`336`	`336`	`GUI.enabled = true;`
`337`	`337`
`338`	`338`	`s_guiChanged \|= EditorGUI.EndChangeCheck();`
`339`		`- if (GUILayout.Button(new GUIContent("Update Wave XR Plugin", "Update " + WAVE_XR_PACKAGE_NAME + " to latest version"), GUILayout.ExpandWidth(false)))`
	`339`	`+ if (GUILayout.Button(new GUIContent("Update Wave XR Plugin Native", "Update " + WAVE_XR_PACKAGE_NATIVE_NAME + " to latest version"), GUILayout.ExpandWidth(false)))`
`340`	`340`	`{`
`341`	`341`	`if (!ManifestUtils.CheckRegistryExists(RegistryToolSettings.Instance().Registry))`
`342`	`342`	`{`
`@@ -347,13 +347,9 @@ public override void OnPreferenceGUI()`
`347`	`347`	`{`
`348`	`348`	`PackageManagerHelper.AddToPackageList(WAVE_XR_PACKAGE_ESSENCE_NAME);`
`349`	`349`	`}`
`350`		`- else if (PackageManagerHelper.IsPackageInList(WAVE_XR_PACKAGE_NATIVE_NAME))`
`351`		`- {`
`352`		`- PackageManagerHelper.AddToPackageList(WAVE_XR_PACKAGE_NATIVE_NAME);`
`353`		`- }`
`354`	`350`	`else`
`355`	`351`	`{`
`356`		`- PackageManagerHelper.AddToPackageList(WAVE_XR_PACKAGE_NAME);`
	`352`	`+ PackageManagerHelper.AddToPackageList(WAVE_XR_PACKAGE_NATIVE_NAME);`
`357`	`353`	`}`
`358`	`354`
`359`	`355`	`VIUProjectSettings.Instance.isInstallingWaveXRPlugin = true;`
`@@ -368,7 +364,7 @@ public override void OnPreferenceGUI()`
`368`	`364`
`369`	`365`	`const string enableWaveTrackerTitle = "Enable Wave Tracker Support";`
`370`	`366`	`EditorGUILayout.BeginHorizontal();`
`371`		`-#if VIU_WAVEVR_TRACKER_CHECK`
	`367`	`+#if VIU_WAVEVR_TRACKER_CHECK && VIU_WAVEVR_TRACKER`
`372`	`368`	`{`
`373`	`369`	`var supported = EditorPrefs.GetBool("Wave/Tracker/EnableTracker", false) && VRModuleSettings.activateWaveTrackerSubmodule;`
`374`	`370`	`var shouldSupport = EditorGUILayout.ToggleLeft(new GUIContent(enableWaveTrackerTitle), supported);`
`@@ -384,7 +380,7 @@ public override void OnPreferenceGUI()`
`384`	`380`	`GUI.enabled = true;`
`385`	`381`
`386`	`382`	`s_guiChanged \|= EditorGUI.EndChangeCheck();`
`387`		`- if (GUILayout.Button(new GUIContent("Update Wave XR Plugin", "Update " + WAVE_XR_PACKAGE_NAME + " to latest version"), GUILayout.ExpandWidth(false)))`
	`383`	`+ if (GUILayout.Button(new GUIContent("Update Wave XR Plugin Native", "Update " + WAVE_XR_PACKAGE_NATIVE_NAME + " to latest version"), GUILayout.ExpandWidth(false)))`
`388`	`384`	`{`
`389`	`385`	`if (!ManifestUtils.CheckRegistryExists(RegistryToolSettings.Instance().Registry))`
`390`	`386`	`{`
`@@ -395,13 +391,9 @@ public override void OnPreferenceGUI()`
`395`	`391`	`{`
`396`	`392`	`PackageManagerHelper.AddToPackageList(WAVE_XR_PACKAGE_ESSENCE_NAME);`
`397`	`393`	`}`
`398`		`- else if (PackageManagerHelper.IsPackageInList(WAVE_XR_PACKAGE_NATIVE_NAME))`
`399`		`- {`
`400`		`- PackageManagerHelper.AddToPackageList(WAVE_XR_PACKAGE_NATIVE_NAME);`
`401`		`- }`
`402`	`394`	`else`
`403`	`395`	`{`
`404`		`- PackageManagerHelper.AddToPackageList(WAVE_XR_PACKAGE_NAME);`
	`396`	`+ PackageManagerHelper.AddToPackageList(WAVE_XR_PACKAGE_NATIVE_NAME);`
`405`	`397`	`}`
`406`	`398`
`407`	`399`	`VIUProjectSettings.Instance.isInstallingWaveXRPlugin = true;`