Update to v1.10.7

* Bug Fix
  - Fix device AngularVelocity have zero value when UnityEngineVRModule activated
  - Fix showing wrong model when Oculus Quest Controller connected
  - Fix SteamVR_Action callback function isn't working when VIU input system is activated
  - Fix bumper key isn't working when Vive Cosmos Controller connected
  - Fix controller scroll isn't working in WaveVRModule

* Improvement
  - Now support WaveVR SDK new haptic API
  - Hide most "field never assigned" warnings for serialized field in MonoBehaviour
  - Add static controller model for Valve Index Controller
  - Avoid ListPool from ambiguous reference (when Core RP Library installed)

Author: lawwong

Assets/HTC.UnityPlugin/VRModule/Modules/SteamVRv2Module.cs

@@ -144,7 +144,7 @@ public void Set(T e, string pathName, string alias)
             {
                 var index = EqualityComparer<T>.Default.GetHashCode(e) - s_enumInfo.minValue;
                 m_aliases[index] = alias;
-                m_paths[index] = ACTION_SET_NAME + m_pathPrefix + pathName;
+                m_paths[index] = ACTION_SET_PATH + m_pathPrefix + pathName;
             }
 
             public void InitiateHandles(CVRInput vrInput)
@@ -158,7 +158,8 @@ public void InitiateHandles(CVRInput vrInput)
 
         public enum HapticStruct { Haptic }
 
-        public const string ACTION_SET_NAME = "/actions/htc_viu";
+        public const string ACTION_SET_NAME = "htc_viu";
+        public const string ACTION_SET_PATH = "/actions/" + ACTION_SET_NAME;
 
         private static bool s_pathInitialized;
         private static bool s_actionInitialized;
@@ -306,7 +307,7 @@ public static void InitializeHandles()
             v2Actions.InitiateHandles(vrInput);
             vibrateActions.InitiateHandles(vrInput);
 
-            s_actionSetHandle = SafeGetActionSetHandle(vrInput, ACTION_SET_NAME);
+            s_actionSetHandle = SafeGetActionSetHandle(vrInput, ACTION_SET_PATH);
         }
 
         private static ulong SafeGetActionSetHandle(CVRInput vrInput, string path)
@@ -378,7 +379,19 @@ public override void OnActivated()
 
             InitializeHandles();
 
+#if VIU_STEAMVR_2_1_0_OR_NEWER
+            SteamVR_Input.GetActionSet(ACTION_SET_NAME).Activate(SteamVR_Input_Sources.Any, 0, false);
+#else
+            var actionSet = SteamVR_Input.GetActionSetFromPath(ACTION_SET_PATH);
+            if (actionSet != null)
+            {
+                actionSet.ActivatePrimary();
+            }
+#endif
+
+#if !VIU_STEAMVR_2_1_0_OR_NEWER
             m_activeActionSets = new VRActiveActionSet_t[1] { new VRActiveActionSet_t() { ulActionSet = s_actionSetHandle, } };
+#endif
 
 #if VIU_STEAMVR_2_2_0_OR_NEWER
             SteamVR_Input.onNonVisualActionsUpdated += UpdateDeviceInput;
@@ -422,7 +435,6 @@ public override void OnDeactivated()
 
         private void UpdateDeviceInput()
         {
-            EVRInputError error;
             IVRModuleDeviceState prevState;
             IVRModuleDeviceStateRW currState;
 
@@ -441,13 +453,6 @@ private void UpdateDeviceInput()
             }
             else
             {
-                // FIXME: Should update by SteamVR_Input? SteamVR_Input.GetActionSetFromPath(ACTIONSET_PATH).ActivatePrimary();
-                error = vrInput.UpdateActionState(m_activeActionSets, m_activeActionSetSize);
-                if (error != EVRInputError.None)
-                {
-                    Debug.LogError("UpdateActionState failed! " + ACTION_SET_NAME + " error=" + error);
-                }
-
                 m_originDataCache.Clear();
 
                 for (pressActions.Reset(); pressActions.IsCurrentValid(); pressActions.MoveNext())
@@ -696,5 +701,5 @@ public override void TriggerHapticVibration(uint deviceIndex, float durationSeco
             }
         }
 #endif
+        }
     }
-}

Assets/HTC.UnityPlugin/VRModule/Modules/UnityEngineVRModule_2017_1.cs

@@ -266,6 +266,11 @@ public override void BeforeRenderUpdate()
 
                 var rotation = default(Quaternion);
                 if (m_nodeStateList[i].TryGetRotation(out rotation)) { currState.rotation = rotation; }
+
+#if UNITY_2017_2_OR_NEWER
+                var angularVelocity = default(Vector3);
+                if (m_nodeStateList[i].TryGetAngularVelocity(out angularVelocity)) { currState.angularVelocity = angularVelocity; }
+#endif
             }
 
             m_nodeStateList.Clear();

Assets/HTC.UnityPlugin/VRModule/Modules/WaveVRModule.cs

@@ -520,6 +520,7 @@ private IVRModuleDeviceStateRW UpdateDevicePose(uint deviceIndex, WaveVR.Device
                     currState.serialNumber = content.type.ToString();
                     currState.modelNumber = content.type.ToString();
                     currState.renderModelName = content.type.ToString();
+                    currState.input2DType = VRModuleInput2DType.TouchpadOnly;
                 }
 
                 // update pose
@@ -769,6 +770,36 @@ public override void TriggerViveControllerHaptic(uint deviceIndex, ushort durati
                 deviceInput.TriggerHapticPulse(durationMicroSec);
             }
         }
-#endif
+
+#if VIU_WAVEVR_3_1_0_OR_NEWER
+        public override void TriggerHapticVibration(uint deviceIndex, float durationSeconds = 0.01f, float frequency = 85, float amplitude = 0.125f, float startSecondsFromNow = 0)
+        {
+            var deviceInput = WaveVR_Controller.Input(s_index2type[deviceIndex]);
+            if (deviceInput != null)
+            {
+                if (0 <= amplitude || amplitude <= 0.2)
+                {
+                    Interop.WVR_TriggerVibration(deviceInput.DeviceType, WVR_InputId.WVR_InputId_Alias1_Touchpad, (uint)(durationSeconds * 1000000), (uint)frequency, WVR_Intensity.WVR_Intensity_Weak);
+                }
+                else if (0.2 < amplitude || amplitude <= 0.4)
+                {
+                    Interop.WVR_TriggerVibration(deviceInput.DeviceType, WVR_InputId.WVR_InputId_Alias1_Touchpad, (uint)(durationSeconds * 1000000), (uint)frequency, WVR_Intensity.WVR_Intensity_Light);
+                }
+                else if (0.4 < amplitude || amplitude <= 0.6)
+                {
+                    Interop.WVR_TriggerVibration(deviceInput.DeviceType, WVR_InputId.WVR_InputId_Alias1_Touchpad, (uint)(durationSeconds * 1000000), (uint)frequency, WVR_Intensity.WVR_Intensity_Normal);
+                }
+                else if (0.6 < amplitude || amplitude <= 0.8)
+                {
+                    Interop.WVR_TriggerVibration(deviceInput.DeviceType, WVR_InputId.WVR_InputId_Alias1_Touchpad, (uint)(durationSeconds * 1000000), (uint)frequency, WVR_Intensity.WVR_Intensity_Strong);
+                }
+                else if (0.8 < amplitude || amplitude <= 1)
+                {
+                    Interop.WVR_TriggerVibration(deviceInput.DeviceType, WVR_InputId.WVR_InputId_Alias1_Touchpad, (uint)(durationSeconds * 1000000), (uint)frequency, WVR_Intensity.WVR_Intensity_Severe);
+                }
+            }
         }
-    }
+#endif
+#endif
+    }
+}