Add Wave Hand Tracking Gesture control option

Author: lawwong

Assets/HTC.UnityPlugin/VRModule/Submodules/PartialSettings/WaveHandTrackingSubmoduleSettings.cs

@@ -17,8 +17,8 @@ public partial class VRModule : SingletonBehaviour<VRModule>
 
     public partial class VRModuleSettings : ScriptableObject
     {
-        public const bool ACTIVATE_WAVE_HAND_TRACKING_SUBMODULE_DEFAULT_VALUE = false;
-        public const bool ENABLE_WAVE_HAND_GESTURE_DEFAULT_VALUE = false;
+        public const bool ACTIVATE_WAVE_HAND_TRACKING_SUBMODULE_DEFAULT_VALUE = true;
+        public const bool ENABLE_WAVE_HAND_GESTURE_DEFAULT_VALUE = true;
         public const bool ENABLE_WAVE_NATURAL_HAND_DEFAULT_VALUE = false;
         public const bool ENABLE_WAVE_ELECTRONIC_HAND_DEFAULT_VALUE = false;
         public const bool SHOW_WAVE_ELECTRONIC_HAND_WITH_CONTROLLER = false;

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

@@ -22,12 +22,12 @@ private struct DeviceFeature
         {
             private ulong featuresField;
 
-            public bool supportedTracking
+            public bool supportTracking
             {
                 get { return (featuresField & (ulong)WVR_SupportedFeature.WVR_SupportedFeature_HandTracking) > 0ul; }
             }
 
-            public bool supportedGesture
+            public bool supportGesture
             {
                 get { return (featuresField & (ulong)WVR_SupportedFeature.WVR_SupportedFeature_HandGesture) > 0ul; }
             }
@@ -57,12 +57,13 @@ protected override void OnActivated()
 
         protected override void OnDeactivated()
         {
-            //GestureInterface.StopGestureDetection();
+            trackingActivator.SetActive(false);
+            gestureActivator.SetActive(false);
         }
 
         protected override void OnUpdateDeviceConnectionAndPoses()
         {
-            trackingActivator.SetActive(VRModuleSettings.activateWaveHandTrackingSubmodule);
+            trackingActivator.SetActive(deviceFeature.supportTracking);
 
             if (VRModule.trackingSpaceType == VRModuleTrackingSpaceType.RoomScale)
             {
@@ -143,7 +144,7 @@ protected override void OnUpdateDeviceConnectionAndPoses()
 
         protected override void OnUpdateDeviceInput()
         {
-            gestureActivator.SetActive(VRModuleSettings.enableWaveHandGesture);
+            gestureActivator.SetActive(VRModuleSettings.enableWaveHandGesture && deviceFeature.supportGesture);
 
             gestureActivator.TryFetchData();
 
@@ -787,11 +788,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.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);
             }
 
             public bool isLeftValid { get { return gestureData.left != WVR_HandGestureType.WVR_HandGestureType_Invalid; } }

Assets/HTC.UnityPlugin/ViveInputUtility/Scripts/Editor/VRPlatformSettings/WaveVRSettings.cs

@@ -324,6 +324,10 @@ public override void OnPreferenceGUI()
                             {
                                 Wave.XR.BuildCheck.CheckIfHandTrackingEnabled.PerformAction(shouldSupport);
                                 VRModuleSettings.activateWaveHandTrackingSubmodule = shouldSupport;
+                                // can manually disable gesture data fetching by setting enableWaveHandGesture to false if needed
+                                // so far the hardware/runtime will start gesture detaction whenever hand tracking detaction is started,
+                                // disabling enableWaveHandGesture only save some data fetching time, it doesn't stop hardware/runtime gesture detaction
+                                if (shouldSupport) { VRModuleSettings.enableWaveHandGesture = true; }
                             }
                         }
 #elif UNITY_2018_1_OR_NEWER