Now fetch Wave hand tracking & gesture at the same time

Author: lawwong

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

@@ -64,6 +64,7 @@ protected override void OnDeactivated()
         protected override void OnUpdateDeviceConnectionAndPoses()
         {
             trackingActivator.SetActive(deviceFeature.supportTracking);
+            gestureActivator.SetActive(VRModuleSettings.enableWaveHandGesture && deviceFeature.supportGesture);
 
             if (VRModule.trackingSpaceType == VRModuleTrackingSpaceType.RoomScale)
             {
@@ -74,6 +75,8 @@ protected override void OnUpdateDeviceConnectionAndPoses()
                 trackingActivator.TryFetchData(WVR_PoseOriginModel.WVR_PoseOriginModel_OriginOnHead);
             }
 
+            gestureActivator.TryFetchData();
+
             var isFocused = Interop.WVR_IsInputFocusCapturedBySystem();
             var isLeftValid = !isFocused && (trackingActivator.isLeftValid || gestureActivator.isLeftValid);
             var isRightValid = !isFocused && (trackingActivator.isRightValid || gestureActivator.isRightValid);
@@ -105,6 +108,12 @@ protected override void OnUpdateDeviceConnectionAndPoses()
                 if (trackingActivator.isLeftValid)
                 {
                     trackingActivator.UpdateJoints(currState, true);
+                    trackingActivator.UpdateDeviceInput(currState, true);
+                }
+
+                if (gestureActivator.isLeftValid)
+                {
+                    gestureActivator.UpdateDeviceInput(currState, true);
                 }
             }
             else
@@ -141,6 +150,12 @@ protected override void OnUpdateDeviceConnectionAndPoses()
                 if (trackingActivator.isRightValid)
                 {
                     trackingActivator.UpdateJoints(currState, false);
+                    trackingActivator.UpdateDeviceInput(currState, false);
+                }
+
+                if (gestureActivator.isRightValid)
+                {
+                    gestureActivator.UpdateDeviceInput(currState, false);
                 }
             }
             else
@@ -154,24 +169,6 @@ protected override void OnUpdateDeviceConnectionAndPoses()
             }
         }
 
-        protected override void OnUpdateDeviceInput()
-        {
-            gestureActivator.SetActive(VRModuleSettings.enableWaveHandGesture && deviceFeature.supportGesture);
-
-            gestureActivator.TryFetchData();
-
-            IVRModuleDeviceState prevState;
-            IVRModuleDeviceStateRW currState;
-
-            EnsureValidDeviceState(leftDeviceIndex, out prevState, out currState);
-            gestureActivator.UpdateDeviceInput(currState, true);
-            trackingActivator.UpdateDeviceInput(currState, true);
-
-            EnsureValidDeviceState(rightDeviceIndex, out prevState, out currState);
-            gestureActivator.UpdateDeviceInput(currState, false);
-            trackingActivator.UpdateDeviceInput(currState, false);
-        }
-
         public override uint GetLeftHandedIndex() { return leftDeviceIndex; }
 
         public override uint GetRightHandedIndex() { return rightDeviceIndex; }