Add compatibility with Wave 4.2.90

Enum changed from
  WVR_HandGestureType_Inverse
to
  WVR_HandGestureType_Palm_Pinch

Author: lawwong

Assets/HTC.UnityPlugin/VRModule/Modules/Editor/WaveVRModuleEditor.cs

@@ -39,26 +39,6 @@ public WaveVRSymbolRequirementCollection()
                 reqFileNames = new string[] { "RenderModel.cs", "ButtonEffect.cs", "ControllerTips.cs" },
             });
 
-            Add(new SymbolRequirement()
-            {
-                symbol = "VIU_WAVE_XRSDK_3_99_31_OR_NEWER",
-                reqMethods = new SymbolRequirement.ReqMethodInfo[]
-                {
-                    new SymbolRequirement.ReqMethodInfo()
-                    {
-                        typeName = "Wave.Native.Interop",
-                        name = "WVR_SetControllerPoseMode",
-                        argTypeNames = new string[]
-                        {
-                            "Wave.Native.WVR_DeviceType",
-                            "Wave.Native.WVR_ControllerPoseMode",
-                        },
-                        bindingAttr = BindingFlags.Public | BindingFlags.Static,
-                    }
-                },
-                reqFileNames = new string[] { "wvr.cs" },
-            });
-
             Add(new SymbolRequirement()
             {
                 symbol = "VIU_WAVEVR_2_0_32_OR_NEWER",
@@ -155,6 +135,45 @@ public WaveVRSymbolRequirementCollection()
                 reqFileNames = new string[] { "wvr.cs" },
             });
 
+            Add(new SymbolRequirement()
+            {
+                symbol = "VIU_WAVE_XRSDK_3_99_31_OR_NEWER",
+                reqMethods = new SymbolRequirement.ReqMethodInfo[]
+                {
+                    new SymbolRequirement.ReqMethodInfo()
+                    {
+                        typeName = "Wave.Native.Interop",
+                        name = "WVR_SetControllerPoseMode",
+                        argTypeNames = new string[]
+                        {
+                            "Wave.Native.WVR_DeviceType",
+                            "Wave.Native.WVR_ControllerPoseMode",
+                        },
+                        bindingAttr = BindingFlags.Public | BindingFlags.Static,
+                    }
+                },
+                reqFileNames = new string[] { "wvr.cs" },
+            });
+
+            Add(new SymbolRequirement()
+            {
+                symbol = "VIU_WAVE_XRSDK_4_2_90_OR_NEWER",
+                reqTypeNames = new string[] { "Wave.Native.WVR_HandGestureType" },
+                validateFunc = (req) =>
+                {
+                    Type wvrGestureType;
+                    if (SymbolRequirement.s_foundTypes.TryGetValue("Wave.Native.WVR_HandGestureType", out wvrGestureType) && wvrGestureType.IsEnum)
+                    {
+                        if (Enum.IsDefined(wvrGestureType, "WVR_HandGestureType_Palm_Pinch"))
+                        {
+                            return true;
+                        }
+                    }
+                    return false;
+                },
+                reqFileNames = new string[] { "wvr.cs" },
+            });
+
             Add(new SymbolRequirement()
             {
                 symbol = "VIU_WAVEVR_LEGACY_HAND_TRACKING",

Assets/HTC.UnityPlugin/VRModule/Submodules/WaveHandTrackingSubmodule.cs

@@ -741,6 +741,13 @@ public static GestureActivator Default
                 }
             }
 
+            private const WVR_HandGestureType WVR_HandGestureType_WVR_HandGestureType_Palm_Pinch =
+#if VIU_WAVE_XRSDK_4_2_90_OR_NEWER
+                WVR_HandGestureType.WVR_HandGestureType_Palm_Pinch;
+#else
+                WVR_HandGestureType.WVR_HandGestureType_Inverse;
+#endif
+
             private static Func<WVR_Result> GenerateStarter()
             {
                 return () =>
@@ -750,7 +757,7 @@ private static Func<WVR_Result> GenerateStarter()
                     m_GestureValue |= 1 << (int)WVR_HandGestureType.WVR_HandGestureType_OK;
                     m_GestureValue |= 1 << (int)WVR_HandGestureType.WVR_HandGestureType_ThumbUp;
                     m_GestureValue |= 1 << (int)WVR_HandGestureType.WVR_HandGestureType_IndexUp;
-                    m_GestureValue |= 1 << (int)WVR_HandGestureType.WVR_HandGestureType_Inverse;
+                    m_GestureValue |= 1 << (int)WVR_HandGestureType_WVR_HandGestureType_Palm_Pinch;
                     return Interop.WVR_StartHandGesture(m_GestureValue);
                 };
             }
@@ -788,13 +795,13 @@ public void UpdateGestureInput(IVRModuleDeviceStateRW state, bool isLeft)
                 state.SetButtonPress(VRModuleRawButton.GestureIndexUp, gesture == WVR_HandGestureType.WVR_HandGestureType_IndexUp);
                 state.SetButtonPress(VRModuleRawButton.GestureOk, gesture == WVR_HandGestureType.WVR_HandGestureType_OK);
                 state.SetButtonPress(VRModuleRawButton.GestureThumbUp, gesture == WVR_HandGestureType.WVR_HandGestureType_ThumbUp);
-                state.SetButtonPress(VRModuleRawButton.System, gesture == WVR_HandGestureType.WVR_HandGestureType_Inverse);
+                state.SetButtonPress(VRModuleRawButton.System, gesture == WVR_HandGestureType_WVR_HandGestureType_Palm_Pinch);
                 state.SetButtonTouch(VRModuleRawButton.GestureFist, gesture == WVR_HandGestureType.WVR_HandGestureType_Fist);
                 state.SetButtonTouch(VRModuleRawButton.GestureFive, gesture == WVR_HandGestureType.WVR_HandGestureType_Five);
                 state.SetButtonTouch(VRModuleRawButton.GestureIndexUp, gesture == WVR_HandGestureType.WVR_HandGestureType_IndexUp);
                 state.SetButtonTouch(VRModuleRawButton.GestureOk, gesture == WVR_HandGestureType.WVR_HandGestureType_OK);
                 state.SetButtonTouch(VRModuleRawButton.GestureThumbUp, gesture == WVR_HandGestureType.WVR_HandGestureType_ThumbUp);
-                state.SetButtonTouch(VRModuleRawButton.System, gesture == WVR_HandGestureType.WVR_HandGestureType_Inverse);
+                state.SetButtonTouch(VRModuleRawButton.System, gesture == WVR_HandGestureType_WVR_HandGestureType_Palm_Pinch);
             }
 
             public bool isLeftValid { get { return gestureData.left != WVR_HandGestureType.WVR_HandGestureType_Invalid; } }