Remove Middle Finger & Relaxed Hand checks.

Any hand that is not recognized shall be relaxed.
This commit is contained in:
NotAKidoS 2023-07-17 12:23:09 -05:00
parent 9225506c26
commit 7eb36710e0

View file

@ -246,6 +246,8 @@ namespace ml_lme
// Left hand gestures
if (l_data.m_leftHand.m_present && (!m_inVR || !Utils.IsLeftHandTracked() || !Settings.FingersOnly))
{
m_inputManager.gestureLeftRaw = 0f;
// Finger Point & Finger Gun
if (m_inputManager.fingerCurlLeftIndex < 0.2f && m_inputManager.fingerCurlLeftMiddle > 0.75f &&
m_inputManager.fingerCurlLeftRing > 0.75f && m_inputManager.fingerCurlLeftPinky > 0.75f)
@ -267,13 +269,6 @@ namespace ml_lme
m_inputManager.gestureLeftRaw = 6f;
}
// Rock and Roll (Middle Finger)
if (m_inputManager.fingerCurlLeftIndex > 0.75f && m_inputManager.fingerCurlLeftMiddle < 0.2f &&
m_inputManager.fingerCurlLeftRing > 0.75f && m_inputManager.fingerCurlLeftPinky > 0.75f)
{
m_inputManager.gestureLeftRaw = 6f;
}
// Fist & Thumbs Up
if (m_inputManager.fingerCurlLeftIndex > 0.5f && m_inputManager.fingerCurlLeftMiddle > 0.5f &&
m_inputManager.fingerCurlLeftRing > 0.5f && m_inputManager.fingerCurlLeftPinky > 0.5f)
@ -283,14 +278,6 @@ namespace ml_lme
: 2f;
}
// Relaxed Hand
if (m_inputManager.fingerCurlLeftIndex < 0.5f && m_inputManager.fingerCurlLeftMiddle < 0.5f &&
m_inputManager.fingerCurlLeftRing < 0.5f && m_inputManager.fingerCurlLeftPinky < 0.5f)
{
m_inputManager.gestureLeftRaw = Mathf.Clamp01(
(l_data.m_leftHand.m_grabStrength - 0.4f) / 0.6f);
}
// Open Hand
if (m_inputManager.fingerCurlLeftIndex < 0.2f && m_inputManager.fingerCurlLeftMiddle < 0.2f &&
m_inputManager.fingerCurlLeftRing < 0.2f && m_inputManager.fingerCurlLeftPinky < 0.2f)
@ -304,6 +291,8 @@ namespace ml_lme
// Right hand gestures
if (l_data.m_rightHand.m_present && (!m_inVR || !Utils.IsRightHandTracked() || !Settings.FingersOnly))
{
m_inputManager.gestureRightRaw = 0f;
// Finger Point & Finger Gun
if (m_inputManager.fingerCurlRightIndex < 0.2f && m_inputManager.fingerCurlRightMiddle > 0.75f &&
m_inputManager.fingerCurlRightRing > 0.75f && m_inputManager.fingerCurlRightPinky > 0.75f)
@ -325,13 +314,6 @@ namespace ml_lme
m_inputManager.gestureRightRaw = 6f;
}
// Rock and Roll (Middle Finger)
if (m_inputManager.fingerCurlRightIndex > 0.75f && m_inputManager.fingerCurlRightMiddle < 0.2f &&
m_inputManager.fingerCurlRightRing > 0.75f && m_inputManager.fingerCurlRightPinky > 0.75f)
{
m_inputManager.gestureRightRaw = 6f;
}
// Fist & Thumbs Up
if (m_inputManager.fingerCurlRightIndex > 0.5f && m_inputManager.fingerCurlRightMiddle > 0.5f &&
m_inputManager.fingerCurlRightRing > 0.5f && m_inputManager.fingerCurlRightPinky > 0.5f)
@ -341,14 +323,6 @@ namespace ml_lme
: 2f;
}
// Relaxed Hand
if (m_inputManager.fingerCurlRightIndex < 0.5f && m_inputManager.fingerCurlRightMiddle < 0.5f &&
m_inputManager.fingerCurlRightRing < 0.5f && m_inputManager.fingerCurlRightPinky < 0.5f)
{
m_inputManager.gestureRightRaw = Mathf.Clamp01(
(l_data.m_rightHand.m_grabStrength - 0.4f) / 0.6f);
}
// Open Hand
if (m_inputManager.fingerCurlRightIndex < 0.2f && m_inputManager.fingerCurlRightMiddle < 0.2f &&
m_inputManager.fingerCurlRightRing < 0.2f && m_inputManager.fingerCurlRightPinky < 0.2f)