Fix SteamVR_Action listener callback function not working

Author: ChengNan Yang

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)
@@ -376,9 +377,15 @@ public override void OnActivated()
             m_gamePoses = new TrackedDevicePose_t[0];
             m_originDataCache = new Dictionary<ulong, OriginData>((int)OpenVR.k_unMaxActionOriginCount);
 
+#if VIU_STEAMVR_2_1_0_OR_NEWER
+            SteamVR_Input.GetActionSet(ACTION_SET_NAME).Activate(SteamVR_Input_Sources.Any, 0, false);
+#endif
+
             InitializeHandles();
 
+#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;
@@ -441,12 +448,14 @@ private void UpdateDeviceInput()
             }
             else
             {
+#if !VIU_STEAMVR_2_1_0_OR_NEWER
                 // 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);
                 }
+#endif
 
                 m_originDataCache.Clear();
 
@@ -696,5 +705,5 @@ public override void TriggerHapticVibration(uint deviceIndex, float durationSeco
             }
         }
 #endif
+        }
     }
-}