Fix WaveVR cannot be selected in previous SDK version

ChengNan Yang · ChengNan Yang · commit 6424850e857e · 2020-06-22T18:16:33.000+08:00
* Fix compile error in WaveSDK 2.0.x
* Fix no EHmdButtons enum in WaveSDK 3.0.2
diff --git a/Assets/HTC.UnityPlugin/VRModule/Modules/Editor/WaveVRModuleEditor.cs b/Assets/HTC.UnityPlugin/VRModule/Modules/Editor/WaveVRModuleEditor.cs
@@ -29,6 +29,7 @@ public WaveVRSymbolRequirementCollection()
             {
                 symbol = "VIU_WAVEVR_RENDER",
                 reqTypeNames = new string[] { "WaveVR_Render" },
+                reqFileNames = new string[] { "WaveVR_Render.cs" },
             });
 
             Add(new SymbolRequirement()
diff --git a/Assets/HTC.UnityPlugin/VRModule/Modules/WaveVRModule.cs b/Assets/HTC.UnityPlugin/VRModule/Modules/WaveVRModule.cs
@@ -136,7 +136,7 @@ public override void UpdateRenderModel()
                             case WVR_DeviceType.WVR_DeviceType_Controller_Left:
 #if VIU_WAVEVR_3_0_0_OR_NEWER
                                 loader.WhichHand = s_moduleInstance.m_deviceHands[LEFT_INDEX];
-#else
+#elif VIU_WAVEVR_2_1_0_OR_NEWER
                                 if (Interop.WVR_GetWaveRuntimeVersion() >= 3 && WaveVR_Controller.IsLeftHanded)
                                 {
                                     loader.WhichHand = WaveVR_ControllerLoader.ControllerHand.Controller_Right;
@@ -145,6 +145,8 @@ public override void UpdateRenderModel()
                                 {
                                     loader.WhichHand = WaveVR_ControllerLoader.ControllerHand.Controller_Left;
                                 }
+#else
+                                loader.WhichHand = WaveVR_ControllerLoader.ControllerHand.Controller_Left;
 #endif
                                 loaderGO.SetActive(true);
 
@@ -312,7 +314,7 @@ public override void OnActivated()
                 VRModule.Instance.gameObject.AddComponent<WaveVR_Init>();
             }
 
-#if !UNITY_EDITOR && VIU_WAVEVR_3_0_0_OR_NEWER
+#if !UNITY_EDITOR && VIU_WAVEVR_3_1_0_OR_NEWER
             if (Object.FindObjectOfType<WaveVR_ButtonList>() == null)
             {
                 VRModule.Instance.gameObject.AddComponent<WaveVR_ButtonList>();
@@ -340,6 +342,34 @@ public override void OnActivated()
                     };
                 }
             }
+#elif !UNITY_EDITOR && VIU_WAVEVR_3_0_0_OR_NEWER
+            if (Object.FindObjectOfType<WaveVR_ButtonList>() == null)
+            {
+                VRModule.Instance.gameObject.AddComponent<WaveVR_ButtonList>();
+
+                var buttonList = VRModule.Instance.gameObject.GetComponent<WaveVR_ButtonList>();
+                if (buttonList != null)
+                {
+                    buttonList.HmdButtons = new List<WaveVR_ButtonList.EButtons>()
+                    {
+                        WaveVR_ButtonList.EButtons.HMDEnter
+                    };
+                    buttonList.DominantButtons = new List<WaveVR_ButtonList.EButtons>()
+                    {
+                        WaveVR_ButtonList.EButtons.Grip,
+                        WaveVR_ButtonList.EButtons.Menu,
+                        WaveVR_ButtonList.EButtons.Touchpad,
+                        WaveVR_ButtonList.EButtons.Trigger
+                    };
+                    buttonList.NonDominantButtons = new List<WaveVR_ButtonList.EButtons>()
+                    {
+                        WaveVR_ButtonList.EButtons.Grip,
+                        WaveVR_ButtonList.EButtons.Menu,
+                        WaveVR_ButtonList.EButtons.Touchpad,
+                        WaveVR_ButtonList.EButtons.Trigger
+                    };
+                }
+            }
 #endif
 
             EnsureDeviceStateLength(DEVICE_COUNT);
diff --git a/Assets/HTC.UnityPlugin/ViveInputUtility/Scripts/Editor/VRPlatformSettings/WaveVRSettings.cs b/Assets/HTC.UnityPlugin/ViveInputUtility/Scripts/Editor/VRPlatformSettings/WaveVRSettings.cs
@@ -80,7 +80,7 @@ private class WaveVRSettings : VRPlatformSetting
 #if UNITY_2018_1_OR_NEWER
         , IPreprocessBuildWithReport
 #elif UNITY_5_6_OR_NEWER
-		, IPreprocessBuild
+        , IPreprocessBuild
 #endif
         {
             private Foldouter m_foldouter = new Foldouter();
@@ -130,14 +130,15 @@ public override bool support
                 {
                     if (!canSupport) { return false; }
                     if (!VIUSettings.activateWaveVRModule) { return false; }
-                    
+
 #if !VIU_WAVEVR_3_0_0_OR_NEWER
                     if (virtualRealitySupported) { return false; }
-#endif
+#else
                     if (!((VRModule.isWaveVRRenderDetected && MockHMDSDK.enabled) || XRPluginManagementUtils.IsXRLoaderEnabled(WAVEVR_LOADER_NAME, requirdPlatform)))
                     {
                         return false;
                     }
+#endif
 
                     if (PlayerSettings.Android.minSdkVersion < AndroidSdkVersions.AndroidApiLevel23) { return false; }
                     if (PlayerSettings.colorSpace == ColorSpace.Linear && !GraphicsAPIContainsOnly(BuildTarget.Android, GraphicsDeviceType.OpenGLES3)) { return false; }
@@ -149,7 +150,9 @@ public override bool support
 
                     if (value)
                     {
-#if !VIU_WAVEVR_3_0_0_OR_NEWER
+#if VIU_WAVEVR_3_0_0_OR_NEWER
+                        virtualRealitySupported = value;
+#else
                         virtualRealitySupported = false;
 #endif
 
@@ -167,12 +170,14 @@ public override bool support
                         supportOculusGo = false;
                     }
 
+#if VIU_WAVEVR_3_0_0_OR_NEWER
                     if (virtualRealitySupported)
                     {
                         MockHMDSDK.enabled = value;
                     }
 
                     XRPluginManagementUtils.SetXRLoaderEnabled(WAVEVR_LOADER_CLASS_NAME, requirdPlatform, value);
+#endif
 
                     VIUSettings.activateWaveVRModule = value;
                 }

Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,7 @@ public WaveVRSymbolRequirementCollection()`
`29`	`29`	`{`
`30`	`30`	`symbol = "VIU_WAVEVR_RENDER",`
`31`	`31`	`reqTypeNames = new string[] { "WaveVR_Render" },`
	`32`	`+ reqFileNames = new string[] { "WaveVR_Render.cs" },`
`32`	`33`	`});`
`33`	`34`
`34`	`35`	`Add(new SymbolRequirement()`
Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ private class WaveVRSettings : VRPlatformSetting`
`80`	`80`	`#if UNITY_2018_1_OR_NEWER`
`81`	`81`	`, IPreprocessBuildWithReport`
`82`	`82`	`#elif UNITY_5_6_OR_NEWER`
`83`		`- , IPreprocessBuild`
	`83`	`+ , IPreprocessBuild`
`84`	`84`	`#endif`
`85`	`85`	`{`
`86`	`86`	`private Foldouter m_foldouter = new Foldouter();`
`@@ -130,14 +130,15 @@ public override bool support`
`130`	`130`	`{`
`131`	`131`	`if (!canSupport) { return false; }`
`132`	`132`	`if (!VIUSettings.activateWaveVRModule) { return false; }`
`133`		`-`
	`133`	`+`
`134`	`134`	`#if !VIU_WAVEVR_3_0_0_OR_NEWER`
`135`	`135`	`if (virtualRealitySupported) { return false; }`
`136`		`-#endif`
	`136`	`+#else`
`137`	`137`	`if (!((VRModule.isWaveVRRenderDetected && MockHMDSDK.enabled) \|\| XRPluginManagementUtils.IsXRLoaderEnabled(WAVEVR_LOADER_NAME, requirdPlatform)))`
`138`	`138`	`{`
`139`	`139`	`return false;`
`140`	`140`	`}`
	`141`	`+#endif`
`141`	`142`
`142`	`143`	`if (PlayerSettings.Android.minSdkVersion < AndroidSdkVersions.AndroidApiLevel23) { return false; }`
`143`	`144`	`if (PlayerSettings.colorSpace == ColorSpace.Linear && !GraphicsAPIContainsOnly(BuildTarget.Android, GraphicsDeviceType.OpenGLES3)) { return false; }`
`@@ -149,7 +150,9 @@ public override bool support`
`149`	`150`
`150`	`151`	`if (value)`
`151`	`152`	`{`
`152`		`-#if !VIU_WAVEVR_3_0_0_OR_NEWER`
	`153`	`+#if VIU_WAVEVR_3_0_0_OR_NEWER`
	`154`	`+ virtualRealitySupported = value;`
	`155`	`+#else`
`153`	`156`	`virtualRealitySupported = false;`
`154`	`157`	`#endif`
`155`	`158`
`@@ -167,12 +170,14 @@ public override bool support`
`167`	`170`	`supportOculusGo = false;`
`168`	`171`	`}`
`169`	`172`
	`173`	`+#if VIU_WAVEVR_3_0_0_OR_NEWER`
`170`	`174`	`if (virtualRealitySupported)`
`171`	`175`	`{`
`172`	`176`	`MockHMDSDK.enabled = value;`
`173`	`177`	`}`
`174`	`178`
`175`	`179`	`XRPluginManagementUtils.SetXRLoaderEnabled(WAVEVR_LOADER_CLASS_NAME, requirdPlatform, value);`
	`180`	`+#endif`
`176`	`181`
`177`	`182`	`VIUSettings.activateWaveVRModule = value;`
`178`	`183`	`}`