Fix curl value in WaveHandTrackingSubmodule

Now when signed angle between finger & palm is
 -90 to 0: curl value is 0
 0 to 180: curl value lerp from 0 to 1
 -180 to -90: curl value is 1

Author: lawwong

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

@@ -528,22 +528,25 @@ public void UpdateDeviceInput(IVRModuleDeviceStateRW state, bool isLeft)
 
                 var indexCurl = GetFingerCurl(state, HandJointName.IndexTip);
                 var middleCurl = GetFingerCurl(state, HandJointName.MiddleTip);
-                var ringCurl = GetFingerCurl(state, HandJointName.MiddleTip);
+                var ringCurl = GetFingerCurl(state, HandJointName.RingTip);
                 var pinkyCurl = GetFingerCurl(state, HandJointName.PinkyTip);
+                var curlAvg = (indexCurl + middleCurl + ringCurl + pinkyCurl) * 0.25f;
+
                 state.SetAxisValue(VRModuleRawAxis.IndexCurl, indexCurl);
                 state.SetAxisValue(VRModuleRawAxis.MiddleCurl, middleCurl);
                 state.SetAxisValue(VRModuleRawAxis.RingCurl, ringCurl);
                 state.SetAxisValue(VRModuleRawAxis.PinkyCurl, pinkyCurl);
-                state.SetAxisValue(VRModuleRawAxis.CapSenseGrip, (indexCurl + middleCurl + ringCurl + pinkyCurl) * 0.25f);
-                state.SetButtonPress(VRModuleRawButton.Grip, indexCurl > 0.75f && middleCurl > 0.75f && ringCurl > 0.75f && pinkyCurl > 0.75f);
-                state.SetButtonTouch(VRModuleRawButton.Grip, indexCurl > 0.5f && middleCurl > 0.5f && ringCurl > 0.5f && pinkyCurl > 0.5f);
+                state.SetAxisValue(VRModuleRawAxis.CapSenseGrip, curlAvg);
+                state.SetButtonPress(VRModuleRawButton.Grip, curlAvg > 0.75f);
+                state.SetButtonTouch(VRModuleRawButton.Grip, curlAvg > 0.50f);
             }
 
             private float GetFingerCurl(IVRModuleDeviceStateRW state, HandJointName finger)
             {
                 var palmDir = state.pose.forward;
                 var fingerDir = state.handJoints[finger].pose.forward;
-                var angle = Vector3.SignedAngle(palmDir, fingerDir, state.handJoints[finger].pose.right);
+                var angle = Vector3.SignedAngle(palmDir, fingerDir, state.pose.right);
+                if (angle < -90f) { angle += 360f; }
                 return Mathf.InverseLerp(0f, 180f, angle);
             }