Update to v1.20.1

* Changes
  - Add support for Unity 6
    - Fix compile errors & warnnings
  - Add support for VIVE OpenXR Unity SDK
    - Now support hand tracking thru Unity XR Hand
      - Goto PackageManager > install "XR Hands" (com.unity.xr.hands)
      - Goto ProjectSettings > XR Plug-in Management > OpenXR > Enabled Interaction Profiles > add "VIVE XR Hand Interaction"
      - Goto ProjectSettings > XR Plug-in Management > OpenXR > OpenXR Feature Groups > enable "Hand Tracking Subsystem"
      - Tracked hand will identify as VRModuleDeviceModel.UnityXRHandRight/Left
  - Add support for latest Wave XR plugin
    - Fix selecting wrong left/right device in some cases
  - Add support for latest Oculus plugin
    - Fix tracked hand model not working

* Bug Fix
  - Fix grabber(ColliderEventCaster) emitting incorrect button

Author: lawwong

Assets/HTC.UnityPlugin/ViveInputUtility/Scripts/VIUVersion.cs

@@ -6,6 +6,6 @@ namespace HTC.UnityPlugin.Vive
 {
     public static class VIUVersion
     {
-        public static readonly Version current = new Version("1.20.0.0");
+        public static readonly Version current = new Version("1.20.1.0");
     }
 }

Assets/HTC.UnityPlugin/ViveInputUtility/Scripts/ViveColliderEvent/ViveColliderEventCaster.cs

@@ -46,20 +46,20 @@ protected void FilterOutAssignedButton()
         {
             EnumUtils.SetFlag(ref m_additionalButtons, (int)m_buttonTrigger, false);
             EnumUtils.SetFlag(ref m_additionalButtons, (int)m_buttonPadOrStick, false);
-            EnumUtils.SetFlag(ref m_additionalButtons, (int)m_buttonFunctionKey, false);
             EnumUtils.SetFlag(ref m_additionalButtons, (int)m_buttonGripOrHandTrigger, false);
+            EnumUtils.SetFlag(ref m_additionalButtons, (int)m_buttonFunctionKey, false);
         }
 
         protected virtual void Start()
         {
             buttonEventDataList.Add(new ViveColliderButtonEventData(this, m_buttonTrigger, ColliderButtonEventData.InputButton.Trigger));
             if (m_buttonPadOrStick != ControllerButton.None) { buttonEventDataList.Add(new ViveColliderButtonEventData(this, m_buttonPadOrStick, ColliderButtonEventData.InputButton.PadOrStick)); }
-            if (m_buttonGripOrHandTrigger != ControllerButton.None) { buttonEventDataList.Add(new ViveColliderButtonEventData(this, m_buttonFunctionKey, ColliderButtonEventData.InputButton.FunctionKey)); }
-            if (m_buttonFunctionKey != ControllerButton.None) { buttonEventDataList.Add(new ViveColliderButtonEventData(this, m_buttonGripOrHandTrigger, ColliderButtonEventData.InputButton.GripOrHandTrigger)); }
+            if (m_buttonGripOrHandTrigger != ControllerButton.None) { buttonEventDataList.Add(new ViveColliderButtonEventData(this, m_buttonGripOrHandTrigger, ColliderButtonEventData.InputButton.GripOrHandTrigger)); }
+            if (m_buttonFunctionKey != ControllerButton.None) { buttonEventDataList.Add(new ViveColliderButtonEventData(this, m_buttonFunctionKey, ColliderButtonEventData.InputButton.FunctionKey)); }
 
             FilterOutAssignedButton();
 
-            var eventBtn = ColliderButtonEventData.InputButton.GripOrHandTrigger + 1;
+            var eventBtn = ColliderButtonEventData.InputButton.FunctionKey + 1;
             var addBtns = m_additionalButtons;
             for (ControllerButton btn = 0; addBtns > 0u; ++btn, addBtns >>= 1)
             {

Assets/HTC.UnityPlugin/package.json

@@ -1,6 +1,6 @@
 {
   "name": "com.htc.upm.vive-input-utility",
-  "version": "1.20.0",
+  "version": "1.20.1",
   "displayName": "VIVE Input Utility",
   "description": "The VIVE Input Utility (VIU) is a toolkit for developing VR experiences in Unity, especially with the VIVE/VIVE Pro but also targeting many platforms from a common code base including Oculus Rift, Rift S Go, Quest, Google Daydream, VIVE Wave SDK (e.g. VIVE Focus standalone) and additional VR platforms as supported by Unity such as Microsoft's 'Mixed Reality' VR headsets and more.\n\nCompatible with SteamVR 2.4.0+ and Oculus Integration 16.0+.\n\nView license:\nhttps://github.com/ViveSoftware/ViveInputUtility-Unity/blob/develop/LICENSE.md",
   "keywords": [

CHANGELOG.md

@@ -1,8 +1,8 @@
-# Vive Input Utility for Unity - v1.20.0
+# Vive Input Utility for Unity - v1.20.1
 Copyright (c) 2016-2024, HTC Corporation. All rights reserved.
 
 
-## Changes for v1.20.0:
+## Changes for v1.20.1:
 
 * Changes
   - Add support for Unity 6
@@ -17,6 +17,9 @@ Copyright (c) 2016-2024, HTC Corporation. All rights reserved.
     - Fix selecting wrong left/right device in some cases
   - Add support for latest Oculus plugin
     - Fix tracked hand model not working
+
+* Bug Fix
+  - Fix grabber(ColliderEventCaster) emitting incorrect button
 
 
 ## Changes for v1.19.0: