Update to game build 2024r174ex3

Bones oriented fingers tracking
This commit is contained in:
SDraw 2024-03-06 02:31:06 +03:00
parent 60259c94c4
commit b547512b69
No known key found for this signature in database
GPG key ID: BB95B4DAB2BB8BB5
12 changed files with 1677 additions and 1395 deletions

129
ml_lme/LeapHand.cs Normal file
View file

@ -0,0 +1,129 @@
using UnityEngine;
namespace ml_lme
{
class LeapHand
{
public enum FingerBone
{
ThumbMetacarpal = 0,
ThumbProximal,
ThumbIntermediate,
ThumbDistal,
IndexMetacarpal,
IndexProximal,
IndexIntermediate,
IndexDistal,
MiddleMetacarpal,
MiddleProximal,
MiddleIntermediate,
MiddleDistal,
RingMetacarpal,
RingProximal,
RingIntermediate,
RingDistal,
PinkyMetacarpal,
PinkyProximal,
PinkyIntermediate,
PinkyDistal
};
readonly Transform m_root = null;
readonly Transform m_wrist = null;
readonly GameObject m_mesh = null;
readonly Transform[] m_fingersBones = null;
readonly Quaternion[] m_initialRotations = null;
public LeapHand(Transform p_root, bool p_left)
{
m_fingersBones = new Transform[20];
m_initialRotations = new Quaternion[20];
m_root = p_root;
if(m_root != null)
{
m_mesh = m_root.Find(p_left ? "GenericHandL" : "GenericHandR")?.gameObject;
m_wrist = m_root.Find(p_left ? "LeftHand/Wrist" : "RightHand/Wrist");
if(m_wrist != null)
{
m_fingersBones[0] = null; // Actual thumb-meta, look at Leap Motion docs, dummy, it's zero point
m_fingersBones[1] = m_wrist.Find("thumb_meta");
m_fingersBones[2] = m_wrist.Find("thumb_meta/thumb_a");
m_fingersBones[3] = m_wrist.Find("thumb_meta/thumb_a/thumb_b");
m_fingersBones[4] = m_wrist.Find("index_meta");
m_fingersBones[5] = m_wrist.Find("index_meta/index_a");
m_fingersBones[6] = m_wrist.Find("index_meta/index_a/index_b");
m_fingersBones[7] = m_wrist.Find("index_meta/index_a/index_b/index_c");
m_fingersBones[8] = m_wrist.Find("middle_meta");
m_fingersBones[9] = m_wrist.Find("middle_meta/middle_a");
m_fingersBones[10] = m_wrist.Find("middle_meta/middle_a/middle_b");
m_fingersBones[11] = m_wrist.Find("middle_meta/middle_a/middle_b/middle_c");
m_fingersBones[12] = m_wrist.Find("ring_meta");
m_fingersBones[13] = m_wrist.Find("ring_meta/ring_a");
m_fingersBones[14] = m_wrist.Find("ring_meta/ring_a/ring_b");
m_fingersBones[15] = m_wrist.Find("ring_meta/ring_a/ring_b/ring_c");
m_fingersBones[16] = m_wrist.Find("pinky_meta");
m_fingersBones[17] = m_wrist.Find("pinky_meta/pinky_a");
m_fingersBones[18] = m_wrist.Find("pinky_meta/pinky_a/pinky_b");
m_fingersBones[19] = m_wrist.Find("pinky_meta/pinky_a/pinky_b/pinky_c");
}
}
for(int i = 0; i < 20; i++)
{
if(m_fingersBones[i] != null)
m_initialRotations[i] = m_fingersBones[i].localRotation;
}
}
public void Update(LeapParser.HandData p_data)
{
if(m_wrist != null)
{
m_wrist.position = p_data.m_position;
m_wrist.rotation = p_data.m_rotation;
for(int i = 0; i < 20; i++)
{
if(m_fingersBones[i] != null)
{
//m_fingers[i].position = p_data.m_fingerPosition[i];
m_fingersBones[i].rotation = p_data.m_fingerRotation[i];
}
}
m_wrist.localPosition = Vector3.zero;
m_wrist.localRotation = Quaternion.identity;
}
}
public void Reset()
{
if(m_wrist != null)
{
m_wrist.localPosition = Vector3.zero;
m_wrist.localRotation = Quaternion.identity;
}
for(int i = 0; i < 20; i++)
{
if(m_fingersBones[i] != null)
m_fingersBones[i].localRotation = m_initialRotations[i];
}
}
public Transform GetRoot() => m_root;
public Transform GetWrist() => m_wrist;
public Transform GetFingersBone(FingerBone p_bone) => m_fingersBones[(int)p_bone];
public void SetMeshActive(bool p_state)
{
if(m_mesh != null)
m_mesh.SetActive(p_state);
}
}
}

View file

@ -34,7 +34,7 @@ namespace ml_lme
m_inVR = Utils.IsInVR(); m_inVR = Utils.IsInVR();
m_handRayLeft = LeapTracking.Instance.GetLeftHand().gameObject.AddComponent<ControllerRay>(); m_handRayLeft = LeapTracking.Instance.GetLeftHand().GetRoot().gameObject.AddComponent<ControllerRay>();
m_handRayLeft.hand = true; m_handRayLeft.hand = true;
m_handRayLeft.generalMask = -269; m_handRayLeft.generalMask = -269;
m_handRayLeft.isInteractionRay = true; m_handRayLeft.isInteractionRay = true;
@ -56,7 +56,7 @@ namespace ml_lme
m_lineLeft.receiveShadows = false; m_lineLeft.receiveShadows = false;
m_handRayLeft.lineRenderer = m_lineLeft; m_handRayLeft.lineRenderer = m_lineLeft;
m_handRayRight = LeapTracking.Instance.GetRightHand().gameObject.AddComponent<ControllerRay>(); m_handRayRight = LeapTracking.Instance.GetRightHand().GetRoot().gameObject.AddComponent<ControllerRay>();
m_handRayRight.hand = false; m_handRayRight.hand = false;
m_handRayRight.generalMask = -269; m_handRayRight.generalMask = -269;
m_handRayRight.isInteractionRay = true; m_handRayRight.isInteractionRay = true;
@ -176,36 +176,36 @@ namespace ml_lme
base._inputManager.gestureLeftRaw = 0f; base._inputManager.gestureLeftRaw = 0f;
// Finger Point & Finger Gun // Finger Point & Finger Gun
if((base._inputManager.fingerCurlLeftIndex < 0.2f) && (base._inputManager.fingerCurlLeftMiddle > 0.75f) && if((base._inputManager.fingerFullCurlNormalizedLeftIndex < 0.2f) && (base._inputManager.fingerFullCurlNormalizedLeftMiddle > 0.75f) &&
(base._inputManager.fingerCurlLeftRing > 0.75f) && (base._inputManager.fingerCurlLeftPinky > 0.75f)) (base._inputManager.fingerFullCurlNormalizedLeftRing > 0.75f) && (base._inputManager.fingerFullCurlNormalizedLeftPinky > 0.75f))
{ {
base._inputManager.gestureLeftRaw = (base._inputManager.fingerCurlLeftThumb >= 0.5f) ? 4f : 3f; base._inputManager.gestureLeftRaw = (base._inputManager.fingerFullCurlNormalizedLeftThumb >= 0.5f) ? 4f : 3f;
} }
// Peace Sign // Peace Sign
if((base._inputManager.fingerCurlLeftIndex < 0.2f) && (base._inputManager.fingerCurlLeftMiddle < 0.2f) && if((base._inputManager.fingerFullCurlNormalizedLeftIndex < 0.2f) && (base._inputManager.fingerFullCurlNormalizedLeftMiddle < 0.2f) &&
(base._inputManager.fingerCurlLeftRing > 0.75f) && (base._inputManager.fingerCurlLeftPinky > 0.75f)) (base._inputManager.fingerFullCurlNormalizedLeftRing > 0.75f) && (base._inputManager.fingerFullCurlNormalizedLeftPinky > 0.75f))
{ {
base._inputManager.gestureLeftRaw = 5f; base._inputManager.gestureLeftRaw = 5f;
} }
// Rock and Roll // Rock and Roll
if((base._inputManager.fingerCurlLeftIndex < 0.2f) && (base._inputManager.fingerCurlLeftMiddle > 0.75f) && if((base._inputManager.fingerFullCurlNormalizedLeftIndex < 0.2f) && (base._inputManager.fingerFullCurlNormalizedLeftMiddle > 0.75f) &&
(base._inputManager.fingerCurlLeftRing > 0.75f) && (base._inputManager.fingerCurlLeftPinky < 0.5f)) (base._inputManager.fingerFullCurlNormalizedLeftRing > 0.75f) && (base._inputManager.fingerFullCurlNormalizedLeftPinky < 0.5f))
{ {
base._inputManager.gestureLeftRaw = 6f; base._inputManager.gestureLeftRaw = 6f;
} }
// Fist & Thumbs Up // Fist & Thumbs Up
if((base._inputManager.fingerCurlLeftIndex > 0.5f) && (base._inputManager.fingerCurlLeftMiddle > 0.5f) && if((base._inputManager.fingerFullCurlNormalizedLeftIndex > 0.5f) && (base._inputManager.fingerFullCurlNormalizedLeftMiddle > 0.5f) &&
(base._inputManager.fingerCurlLeftRing > 0.5f) && (base._inputManager.fingerCurlLeftPinky > 0.5f)) (base._inputManager.fingerFullCurlNormalizedLeftRing > 0.5f) && (base._inputManager.fingerFullCurlNormalizedLeftPinky > 0.5f))
{ {
base._inputManager.gestureLeftRaw = (base._inputManager.fingerCurlLeftThumb >= 0.5f) ? ((l_data.m_leftHand.m_grabStrength - 0.5f) * 2f) : 2f; base._inputManager.gestureLeftRaw = (base._inputManager.fingerFullCurlNormalizedLeftThumb >= 0.5f) ? ((l_data.m_leftHand.m_grabStrength - 0.5f) * 2f) : 2f;
} }
// Open Hand // Open Hand
if((base._inputManager.fingerCurlLeftIndex < 0.2f) && (base._inputManager.fingerCurlLeftMiddle < 0.2f) && if((base._inputManager.fingerFullCurlNormalizedLeftIndex < 0.2f) && (base._inputManager.fingerFullCurlNormalizedLeftMiddle < 0.2f) &&
(base._inputManager.fingerCurlLeftRing < 0.2f) && (base._inputManager.fingerCurlLeftPinky < 0.2f)) (base._inputManager.fingerFullCurlNormalizedLeftRing < 0.2f) && (base._inputManager.fingerFullCurlNormalizedLeftPinky < 0.2f))
{ {
base._inputManager.gestureLeftRaw = -1f; base._inputManager.gestureLeftRaw = -1f;
} }
@ -236,36 +236,36 @@ namespace ml_lme
base._inputManager.gestureRightRaw = 0f; base._inputManager.gestureRightRaw = 0f;
// Finger Point & Finger Gun // Finger Point & Finger Gun
if((base._inputManager.fingerCurlRightIndex < 0.2f) && (base._inputManager.fingerCurlRightMiddle > 0.75f) && if((base._inputManager.fingerFullCurlNormalizedRightIndex < 0.2f) && (base._inputManager.fingerFullCurlNormalizedRightMiddle > 0.75f) &&
(base._inputManager.fingerCurlRightRing > 0.75f) && (base._inputManager.fingerCurlRightPinky > 0.75f)) (base._inputManager.fingerFullCurlNormalizedRightRing > 0.75f) && (base._inputManager.fingerFullCurlNormalizedRightPinky > 0.75f))
{ {
base._inputManager.gestureRightRaw = (base._inputManager.fingerCurlRightThumb >= 0.5f) ? 4f : 3f; base._inputManager.gestureRightRaw = (base._inputManager.fingerFullCurlNormalizedRightThumb >= 0.5f) ? 4f : 3f;
} }
// Peace Sign // Peace Sign
if((base._inputManager.fingerCurlRightIndex < 0.2f) && (base._inputManager.fingerCurlRightMiddle < 0.2f) && if((base._inputManager.fingerFullCurlNormalizedRightIndex < 0.2f) && (base._inputManager.fingerFullCurlNormalizedRightMiddle < 0.2f) &&
(base._inputManager.fingerCurlRightRing > 0.75f) && (base._inputManager.fingerCurlRightPinky > 0.75f)) (base._inputManager.fingerFullCurlNormalizedRightRing > 0.75f) && (base._inputManager.fingerFullCurlNormalizedRightPinky > 0.75f))
{ {
base._inputManager.gestureRightRaw = 5f; base._inputManager.gestureRightRaw = 5f;
} }
// Rock and Roll // Rock and Roll
if((base._inputManager.fingerCurlRightIndex < 0.2f) && (base._inputManager.fingerCurlRightMiddle > 0.75f) && if((base._inputManager.fingerFullCurlNormalizedRightIndex < 0.2f) && (base._inputManager.fingerFullCurlNormalizedRightMiddle > 0.75f) &&
(base._inputManager.fingerCurlRightRing > 0.75f) && (base._inputManager.fingerCurlRightPinky < 0.5f)) (base._inputManager.fingerFullCurlNormalizedRightRing > 0.75f) && (base._inputManager.fingerFullCurlNormalizedRightPinky < 0.5f))
{ {
base._inputManager.gestureRightRaw = 6f; base._inputManager.gestureRightRaw = 6f;
} }
// Fist & Thumbs Up // Fist & Thumbs Up
if((base._inputManager.fingerCurlRightIndex > 0.5f) && (base._inputManager.fingerCurlRightMiddle > 0.5f) && if((base._inputManager.fingerFullCurlNormalizedRightIndex > 0.5f) && (base._inputManager.fingerFullCurlNormalizedRightMiddle > 0.5f) &&
(base._inputManager.fingerCurlRightRing > 0.5f) && (base._inputManager.fingerCurlRightPinky > 0.5f)) (base._inputManager.fingerFullCurlNormalizedRightRing > 0.5f) && (base._inputManager.fingerFullCurlNormalizedRightPinky > 0.5f))
{ {
base._inputManager.gestureRightRaw = (base._inputManager.fingerCurlRightThumb >= 0.5f) ? ((l_data.m_rightHand.m_grabStrength - 0.5f) * 2f) : 2f; base._inputManager.gestureRightRaw = (base._inputManager.fingerFullCurlNormalizedRightThumb >= 0.5f) ? ((l_data.m_rightHand.m_grabStrength - 0.5f) * 2f) : 2f;
} }
// Open Hand // Open Hand
if((base._inputManager.fingerCurlRightIndex < 0.2f) && (base._inputManager.fingerCurlRightMiddle < 0.2f) && if((base._inputManager.fingerFullCurlNormalizedRightIndex < 0.2f) && (base._inputManager.fingerFullCurlNormalizedRightMiddle < 0.2f) &&
(base._inputManager.fingerCurlRightRing < 0.2f) && (base._inputManager.fingerCurlRightPinky < 0.2f)) (base._inputManager.fingerFullCurlNormalizedRightRing < 0.2f) && (base._inputManager.fingerFullCurlNormalizedRightPinky < 0.2f))
{ {
base._inputManager.gestureRightRaw = -1f; base._inputManager.gestureRightRaw = -1f;
} }
@ -466,33 +466,71 @@ namespace ml_lme
// Arbitrary // Arbitrary
void SetFingersInput(LeapParser.HandData p_hand, bool p_left) void SetFingersInput(LeapParser.HandData p_hand, bool p_left)
{ {
// Game has spreads in range of [0;1], but mod now operates in range of [-1;1]
// So spreads will be normalized towards game's range
if(p_left) if(p_left)
{ {
base._inputManager.fingerCurlLeftThumb = p_hand.m_bends[0]; base._inputManager.finger1StretchedLeftThumb = LeapTracked.ms_lastLeftFingerBones[0];
base._inputManager.fingerCurlLeftIndex = p_hand.m_bends[1]; base._inputManager.finger2StretchedLeftThumb = LeapTracked.ms_lastLeftFingerBones[1];
base._inputManager.fingerCurlLeftMiddle = p_hand.m_bends[2]; base._inputManager.finger3StretchedLeftThumb = LeapTracked.ms_lastLeftFingerBones[2];
base._inputManager.fingerCurlLeftRing = p_hand.m_bends[3]; base._inputManager.fingerSpreadLeftThumb = LeapTracked.ms_lastLeftFingerBones[3];
base._inputManager.fingerCurlLeftPinky = p_hand.m_bends[4];
base._inputManager.fingerSpreadLeftThumb = 1f - (p_hand.m_spreads[0] * 0.5f + 0.5f); base._inputManager.finger1StretchedLeftIndex = LeapTracked.ms_lastLeftFingerBones[4];
base._inputManager.fingerSpreadLeftIndex = 1f - (p_hand.m_spreads[1] * 0.5f + 0.5f); base._inputManager.finger2StretchedLeftIndex = LeapTracked.ms_lastLeftFingerBones[5];
base._inputManager.fingerSpreadLeftMiddle = 1f - (p_hand.m_spreads[2] * 0.5f + 0.5f); base._inputManager.finger3StretchedLeftIndex = LeapTracked.ms_lastLeftFingerBones[6];
base._inputManager.fingerSpreadLeftRing = 1f - (p_hand.m_spreads[3] * 0.5f + 0.5f); base._inputManager.fingerSpreadLeftIndex = LeapTracked.ms_lastLeftFingerBones[7];
base._inputManager.fingerSpreadLeftPinky = 1f - (p_hand.m_spreads[4] * 0.5f + 0.5f);
base._inputManager.finger1StretchedLeftMiddle = LeapTracked.ms_lastLeftFingerBones[8];
base._inputManager.finger2StretchedLeftMiddle = LeapTracked.ms_lastLeftFingerBones[9];
base._inputManager.finger3StretchedLeftMiddle = LeapTracked.ms_lastLeftFingerBones[10];
base._inputManager.fingerSpreadLeftMiddle = LeapTracked.ms_lastLeftFingerBones[11];
base._inputManager.finger1StretchedLeftRing = LeapTracked.ms_lastLeftFingerBones[12];
base._inputManager.finger2StretchedLeftRing = LeapTracked.ms_lastLeftFingerBones[13];
base._inputManager.finger3StretchedLeftRing = LeapTracked.ms_lastLeftFingerBones[14];
base._inputManager.fingerSpreadLeftRing = LeapTracked.ms_lastLeftFingerBones[15];
base._inputManager.finger1StretchedLeftPinky = LeapTracked.ms_lastLeftFingerBones[16];
base._inputManager.finger2StretchedLeftPinky = LeapTracked.ms_lastLeftFingerBones[17];
base._inputManager.finger3StretchedLeftPinky = LeapTracked.ms_lastLeftFingerBones[18];
base._inputManager.fingerSpreadLeftPinky = LeapTracked.ms_lastLeftFingerBones[19];
base._inputManager.fingerFullCurlNormalizedLeftThumb = p_hand.m_bends[0];
base._inputManager.fingerFullCurlNormalizedLeftIndex = p_hand.m_bends[1];
base._inputManager.fingerFullCurlNormalizedLeftMiddle = p_hand.m_bends[2];
base._inputManager.fingerFullCurlNormalizedLeftRing = p_hand.m_bends[3];
base._inputManager.fingerFullCurlNormalizedLeftPinky = p_hand.m_bends[4];
} }
else else
{ {
base._inputManager.fingerCurlRightThumb = p_hand.m_bends[0]; base._inputManager.finger1StretchedRightThumb = LeapTracked.ms_lastRightFingerBones[0];
base._inputManager.fingerCurlRightIndex = p_hand.m_bends[1]; base._inputManager.finger2StretchedRightThumb = LeapTracked.ms_lastRightFingerBones[1];
base._inputManager.fingerCurlRightMiddle = p_hand.m_bends[2]; base._inputManager.finger3StretchedRightThumb = LeapTracked.ms_lastRightFingerBones[2];
base._inputManager.fingerCurlRightRing = p_hand.m_bends[3]; base._inputManager.fingerSpreadRightThumb = LeapTracked.ms_lastRightFingerBones[3];
base._inputManager.fingerCurlRightPinky = p_hand.m_bends[4];
base._inputManager.fingerSpreadRightThumb = 1f - (p_hand.m_spreads[0] * 0.5f + 0.5f); base._inputManager.finger1StretchedRightIndex = LeapTracked.ms_lastRightFingerBones[4];
base._inputManager.fingerSpreadRightIndex = 1f - (p_hand.m_spreads[1] * 0.5f + 0.5f); base._inputManager.finger2StretchedRightIndex = LeapTracked.ms_lastRightFingerBones[5];
base._inputManager.fingerSpreadRightMiddle = 1f - (p_hand.m_spreads[2] * 0.5f + 0.5f); base._inputManager.finger3StretchedRightIndex = LeapTracked.ms_lastRightFingerBones[6];
base._inputManager.fingerSpreadRightRing = 1f - (p_hand.m_spreads[3] * 0.5f + 0.5f); base._inputManager.fingerSpreadRightIndex = LeapTracked.ms_lastRightFingerBones[7];
base._inputManager.fingerSpreadRightPinky = 1f - (p_hand.m_spreads[4] * 0.5f + 0.5f);
base._inputManager.finger1StretchedRightMiddle = LeapTracked.ms_lastRightFingerBones[8];
base._inputManager.finger2StretchedRightMiddle = LeapTracked.ms_lastRightFingerBones[9];
base._inputManager.finger3StretchedRightMiddle = LeapTracked.ms_lastRightFingerBones[10];
base._inputManager.fingerSpreadRightMiddle = LeapTracked.ms_lastRightFingerBones[11];
base._inputManager.finger1StretchedRightRing = LeapTracked.ms_lastRightFingerBones[12];
base._inputManager.finger2StretchedRightRing = LeapTracked.ms_lastRightFingerBones[13];
base._inputManager.finger3StretchedRightRing = LeapTracked.ms_lastRightFingerBones[14];
base._inputManager.fingerSpreadRightRing = LeapTracked.ms_lastRightFingerBones[15];
base._inputManager.finger1StretchedRightPinky = LeapTracked.ms_lastRightFingerBones[16];
base._inputManager.finger2StretchedRightPinky = LeapTracked.ms_lastRightFingerBones[17];
base._inputManager.finger3StretchedRightPinky = LeapTracked.ms_lastRightFingerBones[18];
base._inputManager.fingerSpreadRightPinky = LeapTracked.ms_lastRightFingerBones[19];
base._inputManager.fingerFullCurlNormalizedRightThumb = p_hand.m_bends[0];
base._inputManager.fingerFullCurlNormalizedRightIndex = p_hand.m_bends[1];
base._inputManager.fingerFullCurlNormalizedRightMiddle = p_hand.m_bends[2];
base._inputManager.fingerFullCurlNormalizedRightRing = p_hand.m_bends[3];
base._inputManager.fingerFullCurlNormalizedRightPinky = p_hand.m_bends[4];
} }
} }
@ -500,29 +538,69 @@ namespace ml_lme
{ {
if(p_left) if(p_left)
{ {
base._inputManager.fingerCurlLeftThumb = 0f; base._inputManager.finger1StretchedLeftThumb = -0.5f;
base._inputManager.fingerCurlLeftIndex = 0f; base._inputManager.finger2StretchedLeftThumb = 0.7f;
base._inputManager.fingerCurlLeftMiddle = 0f; base._inputManager.finger3StretchedLeftThumb = 0.7f;
base._inputManager.fingerCurlLeftRing = 0f; base._inputManager.fingerSpreadLeftThumb = 0f;
base._inputManager.fingerCurlLeftPinky = 0f;
base._inputManager.fingerSpreadLeftThumb = 0.5f; base._inputManager.finger1StretchedLeftIndex = 0.5f;
base._inputManager.fingerSpreadLeftIndex = 0.5f; base._inputManager.finger2StretchedLeftIndex = 0.7f;
base._inputManager.fingerSpreadLeftMiddle = 0.5f; base._inputManager.finger3StretchedLeftIndex = 0.7f;
base._inputManager.fingerSpreadLeftRing = 0.5f; base._inputManager.fingerSpreadLeftIndex = 0f;
base._inputManager.fingerSpreadLeftPinky = 0.5f;
base._inputManager.finger1StretchedLeftMiddle = 0.5f;
base._inputManager.finger2StretchedLeftMiddle = 0.7f;
base._inputManager.finger3StretchedLeftMiddle = 0.7f;
base._inputManager.fingerSpreadLeftMiddle = 0f;
base._inputManager.finger1StretchedLeftRing = 0.5f;
base._inputManager.finger2StretchedLeftRing = 0.7f;
base._inputManager.finger3StretchedLeftRing = 0.7f;
base._inputManager.fingerSpreadLeftRing = 0f;
base._inputManager.finger1StretchedLeftPinky = 0.5f;
base._inputManager.finger2StretchedLeftPinky = 0.7f;
base._inputManager.finger3StretchedLeftPinky = 0.7f;
base._inputManager.fingerSpreadLeftPinky = 0f;
base._inputManager.fingerFullCurlNormalizedLeftThumb = 0f;
base._inputManager.fingerFullCurlNormalizedLeftIndex = 0f;
base._inputManager.fingerFullCurlNormalizedLeftMiddle = 0f;
base._inputManager.fingerFullCurlNormalizedLeftRing = 0f;
base._inputManager.fingerFullCurlNormalizedLeftPinky = 0f;
} }
else else
{ {
base._inputManager.fingerCurlRightThumb = 0f; base._inputManager.finger1StretchedRightThumb = -0.5f;
base._inputManager.fingerCurlRightIndex = 0f; base._inputManager.finger2StretchedRightThumb = 0.7f;
base._inputManager.fingerCurlRightMiddle = 0f; base._inputManager.finger3StretchedRightThumb = 0.7f;
base._inputManager.fingerCurlRightRing = 0f; base._inputManager.fingerSpreadRightThumb = 0f;
base._inputManager.fingerCurlRightPinky = 0f;
base._inputManager.fingerSpreadRightThumb = 0.5f; base._inputManager.finger1StretchedRightIndex = 0.5f;
base._inputManager.fingerSpreadRightIndex = 0.5f; base._inputManager.finger2StretchedRightIndex = 0.7f;
base._inputManager.fingerSpreadRightMiddle = 0.5f; base._inputManager.finger3StretchedRightIndex = 0.7f;
base._inputManager.fingerSpreadRightRing = 0.5f; base._inputManager.fingerSpreadRightIndex = 0f;
base._inputManager.fingerSpreadRightPinky = 0.5f;
base._inputManager.finger1StretchedRightMiddle = 0.5f;
base._inputManager.finger2StretchedRightMiddle = 0.7f;
base._inputManager.finger3StretchedRightMiddle = 0.7f;
base._inputManager.fingerSpreadRightMiddle = 0f;
base._inputManager.finger1StretchedRightRing = 0.5f;
base._inputManager.finger2StretchedRightRing = 0.7f;
base._inputManager.finger3StretchedRightRing = 0.7f;
base._inputManager.fingerSpreadRightRing = 0f;
base._inputManager.finger1StretchedRightPinky = 0.5f;
base._inputManager.finger2StretchedRightPinky = 0.7f;
base._inputManager.finger3StretchedRightPinky = 0.7f;
base._inputManager.fingerSpreadRightPinky = 0f;
base._inputManager.fingerFullCurlNormalizedRightThumb = 0f;
base._inputManager.fingerFullCurlNormalizedRightIndex = 0f;
base._inputManager.fingerFullCurlNormalizedRightMiddle = 0f;
base._inputManager.fingerFullCurlNormalizedRightRing = 0f;
base._inputManager.fingerFullCurlNormalizedRightPinky = 0f;
} }
} }

View file

@ -1,226 +1,226 @@
using ABI.CCK.Components; using ABI.CCK.Components;
using ABI_RC.Core.Player; using ABI_RC.Core.Player;
using ABI_RC.Systems.InputManagement; using ABI_RC.Systems.InputManagement;
using System.Collections; using System.Collections;
using UnityEngine; using UnityEngine;
namespace ml_lme namespace ml_lme
{ {
[DisallowMultipleComponent] [DisallowMultipleComponent]
class LeapManager : MonoBehaviour class LeapManager : MonoBehaviour
{ {
public static LeapManager Instance { get; private set; } = null; public static LeapManager Instance { get; private set; } = null;
Leap.Controller m_leapController = null; Leap.Controller m_leapController = null;
LeapParser.LeapData m_leapData = null; LeapParser.LeapData m_leapData = null;
LeapTracking m_leapTracking = null; LeapTracking m_leapTracking = null;
LeapTracked m_leapTracked = null; LeapTracked m_leapTracked = null;
LeapInput m_leapInput = null; LeapInput m_leapInput = null;
void Awake() void Awake()
{ {
if(Instance == null) if(Instance == null)
Instance = this; Instance = this;
m_leapController = new Leap.Controller(); m_leapController = new Leap.Controller();
m_leapData = new LeapParser.LeapData(); m_leapData = new LeapParser.LeapData();
DontDestroyOnLoad(this); DontDestroyOnLoad(this);
m_leapController.Device += this.OnLeapDeviceInitialized; m_leapController.Device += this.OnLeapDeviceInitialized;
m_leapController.DeviceFailure += this.OnLeapDeviceFailure; m_leapController.DeviceFailure += this.OnLeapDeviceFailure;
m_leapController.DeviceLost += this.OnLeapDeviceLost; m_leapController.DeviceLost += this.OnLeapDeviceLost;
m_leapController.Connect += this.OnLeapServiceConnect; m_leapController.Connect += this.OnLeapServiceConnect;
m_leapController.Disconnect += this.OnLeapServiceDisconnect; m_leapController.Disconnect += this.OnLeapServiceDisconnect;
Settings.EnabledChange += this.OnEnableChange; Settings.EnabledChange += this.OnEnableChange;
Settings.TrackingModeChange += this.OnTrackingModeChange; Settings.TrackingModeChange += this.OnTrackingModeChange;
m_leapTracking = new GameObject("[LeapTrackingRoot]").AddComponent<LeapTracking>(); m_leapTracking = new GameObject("[LeapTrackingRoot]").AddComponent<LeapTracking>();
m_leapTracking.transform.parent = this.transform; m_leapTracking.transform.parent = this.transform;
OnEnableChange(Settings.Enabled); OnEnableChange(Settings.Enabled);
OnTrackingModeChange(Settings.TrackingMode); OnTrackingModeChange(Settings.TrackingMode);
MelonLoader.MelonCoroutines.Start(WaitForObjects()); MelonLoader.MelonCoroutines.Start(WaitForObjects());
} }
void OnDestroy() void OnDestroy()
{ {
if(Instance == this) if(Instance == this)
Instance = null; Instance = null;
m_leapController.StopConnection(); m_leapController.StopConnection();
m_leapController.Device -= this.OnLeapDeviceInitialized; m_leapController.Device -= this.OnLeapDeviceInitialized;
m_leapController.DeviceFailure -= this.OnLeapDeviceFailure; m_leapController.DeviceFailure -= this.OnLeapDeviceFailure;
m_leapController.DeviceLost -= this.OnLeapDeviceLost; m_leapController.DeviceLost -= this.OnLeapDeviceLost;
m_leapController.Connect -= this.OnLeapServiceConnect; m_leapController.Connect -= this.OnLeapServiceConnect;
m_leapController.Disconnect -= this.OnLeapServiceDisconnect; m_leapController.Disconnect -= this.OnLeapServiceDisconnect;
m_leapController.Dispose(); m_leapController.Dispose();
m_leapController = null; m_leapController = null;
if(m_leapTracking != null) if(m_leapTracking != null)
Object.Destroy(m_leapTracking); Object.Destroy(m_leapTracking);
m_leapTracking = null; m_leapTracking = null;
if(m_leapTracked != null) if(m_leapTracked != null)
Object.Destroy(m_leapTracked); Object.Destroy(m_leapTracked);
m_leapTracked = null; m_leapTracked = null;
if(m_leapInput != null) if(m_leapInput != null)
{ {
if(CVRInputManager.Instance != null) if(CVRInputManager.Instance != null)
CVRInputManager.Instance.DestroyInputModule(m_leapInput); CVRInputManager.Instance.DestroyInputModule(m_leapInput);
else else
m_leapInput.ModuleDestroyed(); m_leapInput.ModuleDestroyed();
} }
m_leapInput = null; m_leapInput = null;
Settings.EnabledChange -= this.OnEnableChange; Settings.EnabledChange -= this.OnEnableChange;
Settings.TrackingModeChange -= this.OnTrackingModeChange; Settings.TrackingModeChange -= this.OnTrackingModeChange;
} }
IEnumerator WaitForObjects() IEnumerator WaitForObjects()
{ {
while(CVRInputManager.Instance == null) while(CVRInputManager.Instance == null)
yield return null; yield return null;
while(PlayerSetup.Instance == null) while(PlayerSetup.Instance == null)
yield return null; yield return null;
while(LeapTracking.Instance == null) while(LeapTracking.Instance == null)
yield return null; yield return null;
m_leapInput = new LeapInput(); m_leapInput = new LeapInput();
CVRInputManager.Instance.AddInputModule(m_leapInput); CVRInputManager.Instance.AddInputModule(m_leapInput);
m_leapTracked = PlayerSetup.Instance.gameObject.AddComponent<LeapTracked>(); m_leapTracked = PlayerSetup.Instance.gameObject.AddComponent<LeapTracked>();
} }
void Update() void Update()
{ {
if(Settings.Enabled) if(Settings.Enabled)
{ {
m_leapData.Reset(); m_leapData.Reset();
if(m_leapController.IsConnected) if(m_leapController.IsConnected)
{ {
Leap.Frame l_frame = m_leapController.Frame(); Leap.Frame l_frame = m_leapController.Frame();
LeapParser.ParseFrame(l_frame, m_leapData); LeapParser.ParseFrame(l_frame, m_leapData);
} }
} }
} }
public LeapParser.LeapData GetLatestData() => m_leapData; public LeapParser.LeapData GetLatestData() => m_leapData;
// Device events // Device events
void OnLeapDeviceInitialized(object p_sender, Leap.DeviceEventArgs p_args) void OnLeapDeviceInitialized(object p_sender, Leap.DeviceEventArgs p_args)
{ {
if(Settings.Enabled) if(Settings.Enabled)
{ {
m_leapController.SubscribeToDeviceEvents(p_args.Device); m_leapController.SubscribeToDeviceEvents(p_args.Device);
UpdateDeviceTrackingMode(); UpdateDeviceTrackingMode();
} }
Utils.ShowHUDNotification("Leap Motion Extension", "Device initialized"); Utils.ShowHUDNotification("Leap Motion Extension", "Device initialized");
} }
void OnLeapDeviceFailure(object p_sender, Leap.DeviceFailureEventArgs p_args) void OnLeapDeviceFailure(object p_sender, Leap.DeviceFailureEventArgs p_args)
{ {
Utils.ShowHUDNotification("Leap Motion Extension", "Device failure", "Code " + p_args.ErrorCode + ": " + p_args.ErrorMessage); Utils.ShowHUDNotification("Leap Motion Extension", "Device failure", "Code " + p_args.ErrorCode + ": " + p_args.ErrorMessage);
} }
void OnLeapDeviceLost(object p_sender, Leap.DeviceEventArgs p_args) void OnLeapDeviceLost(object p_sender, Leap.DeviceEventArgs p_args)
{ {
m_leapController.UnsubscribeFromDeviceEvents(p_args.Device); m_leapController.UnsubscribeFromDeviceEvents(p_args.Device);
Utils.ShowHUDNotification("Leap Motion Extension", "Device lost"); Utils.ShowHUDNotification("Leap Motion Extension", "Device lost");
} }
void OnLeapServiceConnect(object p_sender, Leap.ConnectionEventArgs p_args) void OnLeapServiceConnect(object p_sender, Leap.ConnectionEventArgs p_args)
{ {
Utils.ShowHUDNotification("Leap Motion Extension", "Service connected"); Utils.ShowHUDNotification("Leap Motion Extension", "Service connected");
} }
void OnLeapServiceDisconnect(object p_sender, Leap.ConnectionLostEventArgs p_args) void OnLeapServiceDisconnect(object p_sender, Leap.ConnectionLostEventArgs p_args)
{ {
Utils.ShowHUDNotification("Leap Motion Extension", "Service disconnected"); Utils.ShowHUDNotification("Leap Motion Extension", "Service disconnected");
} }
// Settings // Settings
void OnEnableChange(bool p_state) void OnEnableChange(bool p_state)
{ {
if(p_state) if(p_state)
{ {
m_leapController.StartConnection(); m_leapController.StartConnection();
UpdateDeviceTrackingMode(); UpdateDeviceTrackingMode();
} }
else else
m_leapController.StopConnection(); m_leapController.StopConnection();
} }
void OnTrackingModeChange(Settings.LeapTrackingMode p_mode) void OnTrackingModeChange(Settings.LeapTrackingMode p_mode)
{ {
if(Settings.Enabled) if(Settings.Enabled)
UpdateDeviceTrackingMode(); UpdateDeviceTrackingMode();
} }
// Game events // Game events
internal void OnAvatarClear() internal void OnAvatarClear()
{ {
if(m_leapTracking != null) if(m_leapTracking != null)
m_leapTracking.OnAvatarClear(); m_leapTracking.OnAvatarClear();
if(m_leapTracked != null) if(m_leapTracked != null)
m_leapTracked.OnAvatarClear(); m_leapTracked.OnAvatarClear();
} }
internal void OnAvatarSetup() internal void OnAvatarSetup()
{ {
if(m_leapTracking != null) if(m_leapTracking != null)
m_leapTracking.OnAvatarSetup(); m_leapTracking.OnAvatarSetup();
if(m_leapTracked != null) if(m_leapTracked != null)
m_leapTracked.OnAvatarSetup(); m_leapTracked.OnAvatarSetup();
} }
internal void OnAvatarReinitialize() internal void OnAvatarReinitialize()
{ {
if(m_leapTracked != null) if(m_leapTracked != null)
m_leapTracked.OnAvatarReinitialize(); m_leapTracked.OnAvatarReinitialize();
} }
internal void OnRayScale(float p_scale) internal void OnRayScale(float p_scale)
{ {
m_leapInput?.OnRayScale(p_scale); m_leapInput?.OnRayScale(p_scale);
} }
internal void OnPlayspaceScale(float p_relation) internal void OnPlayspaceScale(float p_relation)
{ {
if(m_leapTracking != null) if(m_leapTracking != null)
m_leapTracking.OnPlayspaceScale(p_relation); m_leapTracking.OnPlayspaceScale(p_relation);
} }
internal void OnPickupGrab(CVRPickupObject p_pickup) internal void OnPickupGrab(CVRPickupObject p_pickup)
{ {
m_leapInput?.OnPickupGrab(p_pickup); m_leapInput?.OnPickupGrab(p_pickup);
} }
// Arbitrary // Arbitrary
void UpdateDeviceTrackingMode() void UpdateDeviceTrackingMode()
{ {
m_leapController.ClearPolicy(Leap.Controller.PolicyFlag.POLICY_OPTIMIZE_SCREENTOP, null); m_leapController.ClearPolicy(Leap.Controller.PolicyFlag.POLICY_OPTIMIZE_SCREENTOP, null);
m_leapController.ClearPolicy(Leap.Controller.PolicyFlag.POLICY_OPTIMIZE_HMD, null); m_leapController.ClearPolicy(Leap.Controller.PolicyFlag.POLICY_OPTIMIZE_HMD, null);
switch(Settings.TrackingMode) switch(Settings.TrackingMode)
{ {
case Settings.LeapTrackingMode.Screentop: case Settings.LeapTrackingMode.Screentop:
m_leapController.SetPolicy(Leap.Controller.PolicyFlag.POLICY_OPTIMIZE_SCREENTOP, null); m_leapController.SetPolicy(Leap.Controller.PolicyFlag.POLICY_OPTIMIZE_SCREENTOP, null);
break; break;
case Settings.LeapTrackingMode.HMD: case Settings.LeapTrackingMode.HMD:
m_leapController.SetPolicy(Leap.Controller.PolicyFlag.POLICY_OPTIMIZE_HMD, null); m_leapController.SetPolicy(Leap.Controller.PolicyFlag.POLICY_OPTIMIZE_HMD, null);
break; break;
} }
} }
} }
} }

View file

@ -1,11 +1,14 @@
using ABI_RC.Core.Player; using ABI_RC.Core.Player;
using ABI_RC.Systems.IK; using ABI_RC.Systems.IK;
using RootMotion.FinalIK; using RootMotion.FinalIK;
using System.Collections;
using System.Collections.Generic;
using UnityEngine; using UnityEngine;
namespace ml_lme namespace ml_lme
{ {
[DisallowMultipleComponent] [DisallowMultipleComponent]
[DefaultExecutionOrder(999999)]
class LeapTracked : MonoBehaviour class LeapTracked : MonoBehaviour
{ {
struct IKInfo struct IKInfo
@ -18,17 +21,64 @@ namespace ml_lme
public Transform m_rightElbowTarget; public Transform m_rightElbowTarget;
} }
struct FingerBoneInfo
{
public LeapHand.FingerBone m_bone;
public Transform m_targetBone;
public Transform m_sourceBone;
public Quaternion m_offset;
}
static readonly Quaternion ms_offsetLeft = Quaternion.Euler(0f, 90f, 0f); static readonly Quaternion ms_offsetLeft = Quaternion.Euler(0f, 90f, 0f);
static readonly Quaternion ms_offsetRight = Quaternion.Euler(0f, 270f, 0f); static readonly Quaternion ms_offsetRight = Quaternion.Euler(0f, 270f, 0f);
static readonly (HumanBodyBones, LeapHand.FingerBone, bool)[] ms_fingerBonesLinks =
{
(HumanBodyBones.LeftThumbProximal, LeapHand.FingerBone.ThumbProximal, true),
(HumanBodyBones.LeftThumbIntermediate, LeapHand.FingerBone.ThumbIntermediate, true),
(HumanBodyBones.LeftThumbDistal, LeapHand.FingerBone.ThumbDistal, true),
(HumanBodyBones.LeftIndexProximal, LeapHand.FingerBone.IndexProximal, true),
(HumanBodyBones.LeftIndexIntermediate, LeapHand.FingerBone.IndexIntermediate, true),
(HumanBodyBones.LeftIndexDistal, LeapHand.FingerBone.IndexDistal, true),
(HumanBodyBones.LeftMiddleProximal, LeapHand.FingerBone.MiddleProximal, true),
(HumanBodyBones.LeftMiddleIntermediate, LeapHand.FingerBone.MiddleIntermediate, true),
(HumanBodyBones.LeftMiddleDistal, LeapHand.FingerBone.MiddleDistal, true),
(HumanBodyBones.LeftRingProximal, LeapHand.FingerBone.RingProximal, true),
(HumanBodyBones.LeftRingIntermediate, LeapHand.FingerBone.RingIntermediate, true),
(HumanBodyBones.LeftRingDistal, LeapHand.FingerBone.RingDistal, true),
(HumanBodyBones.LeftLittleProximal, LeapHand.FingerBone.PinkyProximal, true),
(HumanBodyBones.LeftLittleIntermediate, LeapHand.FingerBone.PinkyIntermediate, true),
(HumanBodyBones.LeftLittleDistal, LeapHand.FingerBone.PinkyDistal, true),
(HumanBodyBones.RightThumbProximal, LeapHand.FingerBone.ThumbProximal, false),
(HumanBodyBones.RightThumbIntermediate, LeapHand.FingerBone.ThumbIntermediate, false),
(HumanBodyBones.RightThumbDistal, LeapHand.FingerBone.ThumbDistal, false),
(HumanBodyBones.RightIndexProximal, LeapHand.FingerBone.IndexProximal, false),
(HumanBodyBones.RightIndexIntermediate, LeapHand.FingerBone.IndexIntermediate, false),
(HumanBodyBones.RightIndexDistal, LeapHand.FingerBone.IndexDistal, false),
(HumanBodyBones.RightMiddleProximal, LeapHand.FingerBone.MiddleProximal, false),
(HumanBodyBones.RightMiddleIntermediate, LeapHand.FingerBone.MiddleIntermediate, false),
(HumanBodyBones.RightMiddleDistal, LeapHand.FingerBone.MiddleDistal, false),
(HumanBodyBones.RightRingProximal, LeapHand.FingerBone.RingProximal, false),
(HumanBodyBones.RightRingIntermediate, LeapHand.FingerBone.RingIntermediate, false),
(HumanBodyBones.RightRingDistal, LeapHand.FingerBone.RingDistal, false),
(HumanBodyBones.RightLittleProximal, LeapHand.FingerBone.PinkyProximal, false),
(HumanBodyBones.RightLittleIntermediate, LeapHand.FingerBone.PinkyIntermediate, false),
(HumanBodyBones.RightLittleDistal, LeapHand.FingerBone.PinkyDistal, false),
};
public static readonly float[] ms_lastLeftFingerBones = new float[20];
public static readonly float[] ms_lastRightFingerBones = new float[20];
bool m_inVR = false; bool m_inVR = false;
VRIK m_vrIK = null; VRIK m_vrIK = null;
Transform m_hips = null;
bool m_enabled = true; bool m_enabled = true;
bool m_fingersOnly = false; bool m_fingersOnly = false;
bool m_trackElbows = true; bool m_trackElbows = true;
Transform m_leftHand = null;
Transform m_rightHand = null;
IKInfo m_vrIKInfo; IKInfo m_vrIKInfo;
ArmIK m_leftArmIK = null; ArmIK m_leftArmIK = null;
ArmIK m_rightArmIK = null; ArmIK m_rightArmIK = null;
@ -39,18 +89,30 @@ namespace ml_lme
bool m_leftTargetActive = false; // VRIK only bool m_leftTargetActive = false; // VRIK only
bool m_rightTargetActive = false; // VRIK only bool m_rightTargetActive = false; // VRIK only
readonly List<FingerBoneInfo> m_leftFingerBones = null;
readonly List<FingerBoneInfo> m_rightFingerBones = null;
Quaternion m_leftWristOffset;
Quaternion m_rightWristOffset;
internal LeapTracked()
{
m_leftFingerBones = new List<FingerBoneInfo>();
m_rightFingerBones = new List<FingerBoneInfo>();
}
// Unity events // Unity events
void Start() void Start()
{ {
m_inVR = Utils.IsInVR(); m_inVR = Utils.IsInVR();
m_leftHandTarget = new GameObject("RotationTarget").transform; m_leftHandTarget = new GameObject("RotationTarget").transform;
m_leftHandTarget.parent = LeapTracking.Instance.GetLeftHand(); m_leftHandTarget.parent = LeapTracking.Instance.GetLeftHand().GetRoot();
m_leftHandTarget.localPosition = Vector3.zero; m_leftHandTarget.localPosition = Vector3.zero;
m_leftHandTarget.localRotation = Quaternion.identity; m_leftHandTarget.localRotation = Quaternion.identity;
m_rightHandTarget = new GameObject("RotationTarget").transform; m_rightHandTarget = new GameObject("RotationTarget").transform;
m_rightHandTarget.parent = LeapTracking.Instance.GetRightHand(); m_rightHandTarget.parent = LeapTracking.Instance.GetRightHand().GetRoot();
m_rightHandTarget.localPosition = Vector3.zero; m_rightHandTarget.localPosition = Vector3.zero;
m_rightHandTarget.localRotation = Quaternion.identity; m_rightHandTarget.localRotation = Quaternion.identity;
@ -114,19 +176,47 @@ namespace ml_lme
void LateUpdate() void LateUpdate()
{ {
if(m_enabled && (m_vrIK == null) && (m_poseHandler != null)) if(m_enabled && (m_poseHandler != null))
{ {
LeapParser.LeapData l_data = LeapManager.Instance.GetLatestData(); LeapParser.LeapData l_data = LeapManager.Instance.GetLatestData();
if(l_data.m_leftHand.m_present)
Vector3 l_hipsLocalPos = m_hips.localPosition; {
Quaternion l_hipsLocalRot = m_hips.localRotation; Transform l_leapWrist = LeapTracking.Instance.GetLeftHand().GetWrist();
Quaternion l_turnBack = (m_leftHand.rotation * m_leftWristOffset) * Quaternion.Inverse(l_leapWrist.rotation);
foreach(var l_info in m_leftFingerBones)
l_info.m_targetBone.rotation = l_turnBack * (l_info.m_sourceBone.rotation * l_info.m_offset);
}
if(l_data.m_rightHand.m_present)
{
Transform l_leapWrist = LeapTracking.Instance.GetRightHand().GetWrist();
Quaternion l_turnBack = (m_rightHand.rotation * m_rightWristOffset) * Quaternion.Inverse(l_leapWrist.rotation);
foreach(var l_info in m_rightFingerBones)
l_info.m_targetBone.rotation = l_turnBack * (l_info.m_sourceBone.rotation * l_info.m_offset);
}
m_poseHandler.GetHumanPose(ref m_pose); m_poseHandler.GetHumanPose(ref m_pose);
UpdateFingers(l_data); if(l_data.m_leftHand.m_present)
m_poseHandler.SetHumanPose(ref m_pose); {
for(int i = 0; i < 5; i++)
m_hips.localPosition = l_hipsLocalPos; {
m_hips.localRotation = l_hipsLocalRot; int l_offset = i * 4;
ms_lastLeftFingerBones[l_offset] = m_pose.muscles[(int)MuscleIndex.LeftThumb1Stretched + l_offset];
ms_lastLeftFingerBones[l_offset + 1] = m_pose.muscles[(int)MuscleIndex.LeftThumb2Stretched + l_offset];
ms_lastLeftFingerBones[l_offset + 2] = m_pose.muscles[(int)MuscleIndex.LeftThumb3Stretched + l_offset];
ms_lastLeftFingerBones[l_offset + 3] = m_pose.muscles[(int)MuscleIndex.LeftThumbSpread + l_offset];
}
}
if(l_data.m_rightHand.m_present)
{
for(int i = 0; i < 5; i++)
{
int l_offset = i * 4;
ms_lastRightFingerBones[l_offset] = m_pose.muscles[(int)MuscleIndex.RightThumb1Stretched + l_offset];
ms_lastRightFingerBones[l_offset + 1] = m_pose.muscles[(int)MuscleIndex.RightThumb2Stretched + l_offset];
ms_lastRightFingerBones[l_offset + 2] = m_pose.muscles[(int)MuscleIndex.RightThumb3Stretched + l_offset];
ms_lastRightFingerBones[l_offset + 3] = m_pose.muscles[(int)MuscleIndex.RightThumbSpread + l_offset];
}
}
} }
} }
@ -134,7 +224,6 @@ namespace ml_lme
internal void OnAvatarClear() internal void OnAvatarClear()
{ {
m_vrIK = null; m_vrIK = null;
m_hips = null;
m_leftArmIK = null; m_leftArmIK = null;
m_rightArmIK = null; m_rightArmIK = null;
m_leftTargetActive = false; m_leftTargetActive = false;
@ -147,6 +236,14 @@ namespace ml_lme
m_leftHandTarget.localRotation = Quaternion.identity; m_leftHandTarget.localRotation = Quaternion.identity;
m_rightHandTarget.localPosition = Vector3.zero; m_rightHandTarget.localPosition = Vector3.zero;
m_rightHandTarget.localRotation = Quaternion.identity; m_rightHandTarget.localRotation = Quaternion.identity;
m_leftFingerBones.Clear();
m_rightFingerBones.Clear();
m_leftHand = null;
m_rightHand = null;
m_leftWristOffset = Quaternion.identity;
m_rightWristOffset = Quaternion.identity;
} }
internal void OnAvatarSetup() internal void OnAvatarSetup()
@ -156,27 +253,31 @@ namespace ml_lme
if(PlayerSetup.Instance._animator.isHuman) if(PlayerSetup.Instance._animator.isHuman)
{ {
m_hips = PlayerSetup.Instance._animator.GetBoneTransform(HumanBodyBones.Hips);
m_poseHandler = new HumanPoseHandler(PlayerSetup.Instance._animator.avatar, PlayerSetup.Instance._animator.transform); m_poseHandler = new HumanPoseHandler(PlayerSetup.Instance._animator.avatar, PlayerSetup.Instance._animator.transform);
m_poseHandler.GetHumanPose(ref m_pose); m_poseHandler.GetHumanPose(ref m_pose);
if(!m_inVR) if(m_inVR)
{
PlayerSetup.Instance._avatar.transform.localPosition = Vector3.zero;
PlayerSetup.Instance._avatar.transform.localRotation = Quaternion.identity;
}
else
PoseHelper.ForceTPose(PlayerSetup.Instance._animator); PoseHelper.ForceTPose(PlayerSetup.Instance._animator);
Transform l_hand = PlayerSetup.Instance._animator.GetBoneTransform(HumanBodyBones.LeftHand); m_leftHand = PlayerSetup.Instance._animator.GetBoneTransform(HumanBodyBones.LeftHand);
if(l_hand != null) m_leftHandTarget.localRotation = ms_offsetLeft * (Quaternion.Inverse(PlayerSetup.Instance._avatar.transform.rotation) * m_leftHand.rotation);
m_leftHandTarget.localRotation = ms_offsetLeft * (PlayerSetup.Instance._avatar.transform.GetMatrix().inverse * l_hand.GetMatrix()).rotation;
l_hand = PlayerSetup.Instance._animator.GetBoneTransform(HumanBodyBones.RightHand); m_rightHand = PlayerSetup.Instance._animator.GetBoneTransform(HumanBodyBones.RightHand);
if(l_hand != null) m_rightHandTarget.localRotation = ms_offsetRight * (Quaternion.Inverse(PlayerSetup.Instance._avatar.transform.rotation) * m_rightHand.rotation);
m_rightHandTarget.localRotation = ms_offsetRight * (PlayerSetup.Instance._avatar.transform.GetMatrix().inverse * l_hand.GetMatrix()).rotation;
ParseFingersBones();
if(m_vrIK != null) if(m_vrIK != null)
{ {
m_vrIK.onPreSolverUpdate.AddListener(this.OnIKPreUpdate); m_vrIK.onPreSolverUpdate.AddListener(this.OnIKPreUpdate);
m_vrIK.onPostSolverUpdate.AddListener(this.OnIKPostUpdate); m_vrIK.onPostSolverUpdate.AddListener(this.OnIKPostUpdate);
} }
else if(!m_inVR) else
SetupArmIK(); SetupArmIK();
} }
} }
@ -195,7 +296,7 @@ namespace ml_lme
m_vrIK.onPreSolverUpdate.AddListener(this.OnIKPreUpdate); m_vrIK.onPreSolverUpdate.AddListener(this.OnIKPreUpdate);
m_vrIK.onPostSolverUpdate.AddListener(this.OnIKPostUpdate); m_vrIK.onPostSolverUpdate.AddListener(this.OnIKPostUpdate);
} }
else if(!m_inVR) else
{ {
PoseHelper.ForceTPose(PlayerSetup.Instance._animator); PoseHelper.ForceTPose(PlayerSetup.Instance._animator);
SetupArmIK(); SetupArmIK();
@ -350,69 +451,33 @@ namespace ml_lme
} }
} }
void UpdateFingers(LeapParser.LeapData p_data) void ParseFingersBones()
{ {
if(p_data.m_leftHand.m_present) LeapTracking.Instance.GetLeftHand().Reset();
LeapTracking.Instance.GetLeftHand().GetWrist().rotation = PlayerSetup.Instance.transform.rotation * ms_offsetRight; // Weird, but that's how it works
m_leftWristOffset = Quaternion.Inverse(m_leftHand.rotation) * LeapTracking.Instance.GetLeftHand().GetWrist().rotation;
LeapTracking.Instance.GetRightHand().Reset();
LeapTracking.Instance.GetRightHand().GetWrist().rotation = PlayerSetup.Instance.transform.rotation * ms_offsetLeft; // Weird, but that's how it works
m_rightWristOffset = Quaternion.Inverse(m_rightHand.rotation) * LeapTracking.Instance.GetRightHand().GetWrist().rotation;
foreach(var l_link in ms_fingerBonesLinks)
{ {
UpdatePoseMuscle(ref m_pose, (int)MuscleIndex.LeftThumb1Stretched, -0.5f - p_data.m_leftHand.m_bends[0]); Transform l_transform = PlayerSetup.Instance._animator.GetBoneTransform(l_link.Item1);
UpdatePoseMuscle(ref m_pose, (int)MuscleIndex.LeftThumb2Stretched, 0.7f - p_data.m_leftHand.m_bends[0] * 2f); if(l_transform != null)
UpdatePoseMuscle(ref m_pose, (int)MuscleIndex.LeftThumb3Stretched, 0.7f - p_data.m_leftHand.m_bends[0] * 2f); {
UpdatePoseMuscle(ref m_pose, (int)MuscleIndex.LeftThumbSpread, -p_data.m_leftHand.m_spreads[0]); FingerBoneInfo l_info = new FingerBoneInfo();
l_info.m_bone = l_link.Item2;
l_info.m_targetBone = l_transform;
l_info.m_sourceBone = (l_link.Item3 ? LeapTracking.Instance.GetLeftHand().GetFingersBone(l_link.Item2) : LeapTracking.Instance.GetRightHand().GetFingersBone(l_link.Item2));
l_info.m_offset = Quaternion.Inverse(l_info.m_sourceBone.rotation) * l_info.m_targetBone.rotation;
UpdatePoseMuscle(ref m_pose, (int)MuscleIndex.LeftIndex1Stretched, 0.5f - p_data.m_leftHand.m_bends[1]); if(l_link.Item3)
UpdatePoseMuscle(ref m_pose, (int)MuscleIndex.LeftIndex2Stretched, 0.7f - p_data.m_leftHand.m_bends[1] * 2f); m_leftFingerBones.Add(l_info);
UpdatePoseMuscle(ref m_pose, (int)MuscleIndex.LeftIndex3Stretched, 0.7f - p_data.m_leftHand.m_bends[1] * 2f); else
UpdatePoseMuscle(ref m_pose, (int)MuscleIndex.LeftIndexSpread, p_data.m_leftHand.m_spreads[1]); m_rightFingerBones.Add(l_info);
}
UpdatePoseMuscle(ref m_pose, (int)MuscleIndex.LeftMiddle1Stretched, 0.5f - p_data.m_leftHand.m_bends[2]);
UpdatePoseMuscle(ref m_pose, (int)MuscleIndex.LeftMiddle2Stretched, 0.7f - p_data.m_leftHand.m_bends[2] * 2f);
UpdatePoseMuscle(ref m_pose, (int)MuscleIndex.LeftMiddle3Stretched, 0.7f - p_data.m_leftHand.m_bends[2] * 2f);
UpdatePoseMuscle(ref m_pose, (int)MuscleIndex.LeftMiddleSpread, p_data.m_leftHand.m_spreads[2]);
UpdatePoseMuscle(ref m_pose, (int)MuscleIndex.LeftRing1Stretched, 0.5f - p_data.m_leftHand.m_bends[3]);
UpdatePoseMuscle(ref m_pose, (int)MuscleIndex.LeftRing2Stretched, 0.7f - p_data.m_leftHand.m_bends[3] * 2f);
UpdatePoseMuscle(ref m_pose, (int)MuscleIndex.LeftRing3Stretched, 0.7f - p_data.m_leftHand.m_bends[3] * 2f);
UpdatePoseMuscle(ref m_pose, (int)MuscleIndex.LeftRingSpread, -p_data.m_leftHand.m_spreads[3]);
UpdatePoseMuscle(ref m_pose, (int)MuscleIndex.LeftLittle1Stretched, 0.5f - p_data.m_leftHand.m_bends[4]);
UpdatePoseMuscle(ref m_pose, (int)MuscleIndex.LeftLittle2Stretched, 0.7f - p_data.m_leftHand.m_bends[4] * 2f);
UpdatePoseMuscle(ref m_pose, (int)MuscleIndex.LeftLittle3Stretched, 0.7f - p_data.m_leftHand.m_bends[4] * 2f);
UpdatePoseMuscle(ref m_pose, (int)MuscleIndex.LeftLittleSpread, -p_data.m_leftHand.m_spreads[4]);
} }
if(p_data.m_rightHand.m_present)
{
UpdatePoseMuscle(ref m_pose, (int)MuscleIndex.RightThumb1Stretched, -0.5f - p_data.m_rightHand.m_bends[0]);
UpdatePoseMuscle(ref m_pose, (int)MuscleIndex.RightThumb2Stretched, 0.7f - p_data.m_rightHand.m_bends[0] * 2f);
UpdatePoseMuscle(ref m_pose, (int)MuscleIndex.RightThumb3Stretched, 0.7f - p_data.m_rightHand.m_bends[0] * 2f);
UpdatePoseMuscle(ref m_pose, (int)MuscleIndex.RightThumbSpread, -p_data.m_rightHand.m_spreads[0]);
UpdatePoseMuscle(ref m_pose, (int)MuscleIndex.RightIndex1Stretched, 0.5f - p_data.m_rightHand.m_bends[1]);
UpdatePoseMuscle(ref m_pose, (int)MuscleIndex.RightIndex2Stretched, 0.7f - p_data.m_rightHand.m_bends[1] * 2f);
UpdatePoseMuscle(ref m_pose, (int)MuscleIndex.RightIndex3Stretched, 0.7f - p_data.m_rightHand.m_bends[1] * 2f);
UpdatePoseMuscle(ref m_pose, (int)MuscleIndex.RightIndexSpread, p_data.m_rightHand.m_spreads[1]);
UpdatePoseMuscle(ref m_pose, (int)MuscleIndex.RightMiddle1Stretched, 0.5f - p_data.m_rightHand.m_bends[2]);
UpdatePoseMuscle(ref m_pose, (int)MuscleIndex.RightMiddle2Stretched, 0.7f - p_data.m_rightHand.m_bends[2] * 2f);
UpdatePoseMuscle(ref m_pose, (int)MuscleIndex.RightMiddle3Stretched, 0.7f - p_data.m_rightHand.m_bends[2] * 2f);
UpdatePoseMuscle(ref m_pose, (int)MuscleIndex.RightMiddleSpread, p_data.m_rightHand.m_spreads[2]);
UpdatePoseMuscle(ref m_pose, (int)MuscleIndex.RightRing1Stretched, 0.5f - p_data.m_rightHand.m_bends[3]);
UpdatePoseMuscle(ref m_pose, (int)MuscleIndex.RightRing2Stretched, 0.7f - p_data.m_rightHand.m_bends[3] * 2f);
UpdatePoseMuscle(ref m_pose, (int)MuscleIndex.RightRing3Stretched, 0.7f - p_data.m_rightHand.m_bends[3] * 2f);
UpdatePoseMuscle(ref m_pose, (int)MuscleIndex.RightRingSpread, -p_data.m_rightHand.m_spreads[3]);
UpdatePoseMuscle(ref m_pose, (int)MuscleIndex.RightLittle1Stretched, 0.5f - p_data.m_rightHand.m_bends[4]);
UpdatePoseMuscle(ref m_pose, (int)MuscleIndex.RightLittle2Stretched, 0.7f - p_data.m_rightHand.m_bends[4] * 2f);
UpdatePoseMuscle(ref m_pose, (int)MuscleIndex.RightLittle3Stretched, 0.7f - p_data.m_rightHand.m_bends[4] * 2f);
UpdatePoseMuscle(ref m_pose, (int)MuscleIndex.RightLittleSpread, -p_data.m_rightHand.m_spreads[4]);
}
}
static void UpdatePoseMuscle(ref HumanPose p_pose, int p_index, float p_value)
{
if(p_pose.muscles.Length > p_index)
p_pose.muscles[p_index] = p_value;
} }
} }
} }

View file

@ -1,302 +1,280 @@
using ABI_RC.Core.Player; using ABI_RC.Core.Player;
using ABI_RC.Systems.VRModeSwitch; using ABI_RC.Systems.VRModeSwitch;
using System.Collections; using System.Collections;
using UnityEngine; using UnityEngine;
namespace ml_lme namespace ml_lme
{ {
[DisallowMultipleComponent] [DisallowMultipleComponent]
class LeapTracking : MonoBehaviour class LeapTracking : MonoBehaviour
{ {
public static LeapTracking Instance { get; private set; } = null; public static LeapTracking Instance { get; private set; } = null;
static Quaternion ms_dummyRotation = Quaternion.identity; static Quaternion ms_dummyRotation = Quaternion.identity;
static readonly Quaternion ms_hmdRotation = new Quaternion(0f, 0.7071068f, 0.7071068f, 0f); static readonly Quaternion ms_hmdRotation = new Quaternion(0f, 0.7071068f, 0.7071068f, 0f);
static readonly Quaternion ms_screentopRotation = new Quaternion(0f, 0f, -1f, 0f); static readonly Quaternion ms_screentopRotation = new Quaternion(0f, 0f, -1f, 0f);
bool m_inVR = false; bool m_inVR = false;
GameObject m_leapHandLeft = null; GameObject m_leapHands = null;
GameObject m_leapHandRight = null; LeapHand m_leapHandLeft = null;
GameObject m_leapElbowLeft = null; LeapHand m_leapHandRight = null;
GameObject m_leapElbowRight = null; GameObject m_leapElbowLeft = null;
GameObject m_leapControllerModel = null; GameObject m_leapElbowRight = null;
GameObject m_visualHands = null; GameObject m_leapControllerModel = null;
VisualHand m_visualHandLeft = null;
VisualHand m_visualHandRight = null; float m_scaleRelation = 1f;
float m_scaleRelation = 1f; void Start()
{
void Start() if(Instance == null)
{ Instance = this;
if(Instance == null)
Instance = this; m_inVR = Utils.IsInVR();
m_inVR = Utils.IsInVR(); m_leapElbowLeft = new GameObject("LeapElbowLeft");
m_leapElbowLeft.transform.parent = this.transform;
m_leapHandLeft = new GameObject("LeapHandLeft"); m_leapElbowLeft.transform.localPosition = Vector3.zero;
m_leapHandLeft.transform.parent = this.transform; m_leapElbowLeft.transform.localRotation = Quaternion.identity;
m_leapHandLeft.transform.localPosition = Vector3.zero;
m_leapHandLeft.transform.localRotation = Quaternion.identity; m_leapElbowRight = new GameObject("LeapElbowRight");
m_leapElbowRight.transform.parent = this.transform;
m_leapHandRight = new GameObject("LeapHandRight"); m_leapElbowRight.transform.localPosition = Vector3.zero;
m_leapHandRight.transform.parent = this.transform; m_leapElbowRight.transform.localRotation = Quaternion.identity;
m_leapHandRight.transform.localPosition = Vector3.zero;
m_leapHandRight.transform.localRotation = Quaternion.identity; m_leapControllerModel = AssetsHandler.GetAsset("assets/models/leapmotion/leap_motion_1_0.obj");
if(m_leapControllerModel != null)
m_leapElbowLeft = new GameObject("LeapElbowLeft"); {
m_leapElbowLeft.transform.parent = this.transform; m_leapControllerModel.name = "LeapModel";
m_leapElbowLeft.transform.localPosition = Vector3.zero; m_leapControllerModel.transform.parent = this.transform;
m_leapElbowLeft.transform.localRotation = Quaternion.identity; m_leapControllerModel.transform.localPosition = Vector3.zero;
m_leapControllerModel.transform.localRotation = Quaternion.identity;
m_leapElbowRight = new GameObject("LeapElbowRight"); }
m_leapElbowRight.transform.parent = this.transform;
m_leapElbowRight.transform.localPosition = Vector3.zero; m_leapHands = AssetsHandler.GetAsset("assets/models/leaphands/leaphands.prefab");
m_leapElbowRight.transform.localRotation = Quaternion.identity; if(m_leapHands != null)
{
m_leapControllerModel = AssetsHandler.GetAsset("assets/models/leapmotion/leap_motion_1_0.obj"); m_leapHands.name = "LeapHands";
if(m_leapControllerModel != null) m_leapHands.transform.parent = this.transform;
{ m_leapHands.transform.localPosition = Vector3.zero;
m_leapControllerModel.name = "LeapModel"; m_leapHands.transform.localRotation = Quaternion.identity;
m_leapControllerModel.transform.parent = this.transform;
m_leapControllerModel.transform.localPosition = Vector3.zero; m_leapHandLeft = new LeapHand(m_leapHands.transform.Find("HandL"), true);
m_leapControllerModel.transform.localRotation = Quaternion.identity; m_leapHandRight = new LeapHand(m_leapHands.transform.Find("HandR"), false);
} }
m_visualHands = AssetsHandler.GetAsset("assets/models/hands/leaphands.prefab"); Settings.DesktopOffsetChange += this.OnDesktopOffsetChange;
if(m_visualHands != null) Settings.ModelVisibilityChange += this.OnModelVisibilityChange;
{ Settings.VisualHandsChange += this.OnVisualHandsChange;
m_visualHands.name = "VisualHands"; Settings.TrackingModeChange += this.OnTrackingModeChange;
m_visualHands.transform.parent = this.transform; Settings.RootAngleChange += this.OnRootAngleChange;
m_visualHands.transform.localPosition = Vector3.zero; Settings.HeadAttachChange += this.OnHeadAttachChange;
m_visualHands.transform.localRotation = Quaternion.identity; Settings.HeadOffsetChange += this.OnHeadOffsetChange;
m_visualHandLeft = new VisualHand(m_visualHands.transform.Find("HandL"), true); MelonLoader.MelonCoroutines.Start(WaitForLocalPlayer());
m_visualHandRight = new VisualHand(m_visualHands.transform.Find("HandR"), false);
} OnModelVisibilityChange(Settings.ModelVisibility);
OnVisualHandsChange(Settings.VisualHands);
Settings.DesktopOffsetChange += this.OnDesktopOffsetChange; OnTrackingModeChange(Settings.TrackingMode);
Settings.ModelVisibilityChange += this.OnModelVisibilityChange; OnRootAngleChange(Settings.RootAngle);
Settings.VisualHandsChange += this.OnVisualHandsChange;
Settings.TrackingModeChange += this.OnTrackingModeChange; VRModeSwitchEvents.OnInitializeXR.AddListener(this.OnModeSwitch);
Settings.RootAngleChange += this.OnRootAngleChange; VRModeSwitchEvents.OnDeinitializeXR.AddListener(this.OnModeSwitch);
Settings.HeadAttachChange += this.OnHeadAttachChange; }
Settings.HeadOffsetChange += this.OnHeadOffsetChange;
IEnumerator WaitForLocalPlayer()
MelonLoader.MelonCoroutines.Start(WaitForLocalPlayer()); {
while(PlayerSetup.Instance == null)
OnModelVisibilityChange(Settings.ModelVisibility); yield return null;
OnVisualHandsChange(Settings.VisualHands);
OnTrackingModeChange(Settings.TrackingMode); OnHeadAttachChange(Settings.HeadAttach);
OnRootAngleChange(Settings.RootAngle); }
VRModeSwitchEvents.OnInitializeXR.AddListener(this.OnModeSwitch); void OnDestroy()
VRModeSwitchEvents.OnDeinitializeXR.AddListener(this.OnModeSwitch); {
} if(Instance == this)
Instance = null;
IEnumerator WaitForLocalPlayer()
{ if(m_leapHands != null)
while(PlayerSetup.Instance == null) Object.Destroy(m_leapHands);
yield return null; m_leapHands = null;
m_leapHandLeft = null;
OnHeadAttachChange(Settings.HeadAttach); m_leapHandRight = null;
}
if(m_leapElbowLeft != null)
void OnDestroy() Object.Destroy(m_leapElbowLeft);
{ m_leapElbowLeft = null;
if(Instance == this)
Instance = null; if(m_leapElbowRight != null)
Object.Destroy(m_leapElbowRight);
if(m_leapHandLeft != null) m_leapElbowRight = null;
Object.Destroy(m_leapHandLeft);
m_leapHandLeft = null; if(m_leapControllerModel != null)
Object.Destroy(m_leapControllerModel);
if(m_leapHandRight != null) m_leapControllerModel = null;
Object.Destroy(m_leapHandRight);
m_leapHandRight = null; Settings.DesktopOffsetChange -= this.OnDesktopOffsetChange;
Settings.ModelVisibilityChange -= this.OnModelVisibilityChange;
if(m_leapElbowLeft != null) Settings.VisualHandsChange -= this.OnVisualHandsChange;
Object.Destroy(m_leapElbowLeft); Settings.TrackingModeChange -= this.OnTrackingModeChange;
m_leapElbowLeft = null; Settings.RootAngleChange -= this.OnRootAngleChange;
Settings.HeadAttachChange -= this.OnHeadAttachChange;
if(m_leapElbowRight != null) Settings.HeadOffsetChange -= this.OnHeadOffsetChange;
Object.Destroy(m_leapElbowRight);
m_leapElbowRight = null; VRModeSwitchEvents.OnInitializeXR.RemoveListener(this.OnModeSwitch);
VRModeSwitchEvents.OnDeinitializeXR.RemoveListener(this.OnModeSwitch);
if(m_leapControllerModel != null) }
Object.Destroy(m_leapControllerModel);
m_leapControllerModel = null; void Update()
{
if(m_visualHands != null) if(Settings.Enabled)
Object.Destroy(m_visualHands); {
m_visualHands = null; LeapParser.LeapData l_data = LeapManager.Instance.GetLatestData();
m_visualHandLeft = null; if(l_data.m_leftHand.m_present)
m_visualHandRight = null; {
OrientationAdjustment(ref l_data.m_leftHand.m_position, ref l_data.m_leftHand.m_rotation, Settings.TrackingMode);
Settings.DesktopOffsetChange -= this.OnDesktopOffsetChange; for(int i = 0; i < 20; i++)
Settings.ModelVisibilityChange -= this.OnModelVisibilityChange; OrientationAdjustment(ref l_data.m_leftHand.m_fingerPosition[i], ref l_data.m_leftHand.m_fingerRotation[i], Settings.TrackingMode);
Settings.VisualHandsChange -= this.OnVisualHandsChange;
Settings.TrackingModeChange -= this.OnTrackingModeChange; m_leapHandLeft.GetRoot().localPosition = l_data.m_leftHand.m_position;
Settings.RootAngleChange -= this.OnRootAngleChange; m_leapHandLeft.GetRoot().localRotation = l_data.m_leftHand.m_rotation;
Settings.HeadAttachChange -= this.OnHeadAttachChange;
Settings.HeadOffsetChange -= this.OnHeadOffsetChange; OrientationAdjustment(ref l_data.m_leftHand.m_elbowPosition, ref ms_dummyRotation, Settings.TrackingMode);
m_leapElbowLeft.transform.localPosition = l_data.m_leftHand.m_elbowPosition;
VRModeSwitchEvents.OnInitializeXR.RemoveListener(this.OnModeSwitch);
VRModeSwitchEvents.OnDeinitializeXR.RemoveListener(this.OnModeSwitch); m_leapHandLeft?.Update(l_data.m_leftHand);
} }
void Update() if(l_data.m_rightHand.m_present)
{ {
if(Settings.Enabled) OrientationAdjustment(ref l_data.m_rightHand.m_position, ref l_data.m_rightHand.m_rotation, Settings.TrackingMode);
{ for(int i = 0; i < 20; i++)
LeapParser.LeapData l_data = LeapManager.Instance.GetLatestData(); OrientationAdjustment(ref l_data.m_rightHand.m_fingerPosition[i], ref l_data.m_rightHand.m_fingerRotation[i], Settings.TrackingMode);
if(l_data.m_leftHand.m_present) m_leapHandRight.GetRoot().localPosition = l_data.m_rightHand.m_position;
{ m_leapHandRight.GetRoot().localRotation = l_data.m_rightHand.m_rotation;
OrientationAdjustment(ref l_data.m_leftHand.m_position, ref l_data.m_leftHand.m_rotation, Settings.TrackingMode);
for(int i = 0; i < 20; i++) OrientationAdjustment(ref l_data.m_rightHand.m_elbowPosition, ref ms_dummyRotation, Settings.TrackingMode);
OrientationAdjustment(ref l_data.m_leftHand.m_fingerPosition[i], ref l_data.m_leftHand.m_fingerRotation[i], Settings.TrackingMode); m_leapElbowRight.transform.localPosition = l_data.m_rightHand.m_elbowPosition;
m_leapHandLeft.transform.localPosition = l_data.m_leftHand.m_position; m_leapHandRight?.Update(l_data.m_rightHand);
m_leapHandLeft.transform.localRotation = l_data.m_leftHand.m_rotation; }
}
OrientationAdjustment(ref l_data.m_leftHand.m_elbowPosition, ref ms_dummyRotation, Settings.TrackingMode); }
m_leapElbowLeft.transform.localPosition = l_data.m_leftHand.m_elbowPosition;
public LeapHand GetLeftHand() => m_leapHandLeft;
if(Settings.VisualHands) public LeapHand GetRightHand() => m_leapHandRight;
m_visualHandLeft?.Update(l_data.m_leftHand); public Transform GetLeftElbow() => m_leapElbowLeft.transform;
} public Transform GetRightElbow() => m_leapElbowRight.transform;
if(l_data.m_rightHand.m_present) // Settings
{ void OnDesktopOffsetChange(Vector3 p_offset)
OrientationAdjustment(ref l_data.m_rightHand.m_position, ref l_data.m_rightHand.m_rotation, Settings.TrackingMode); {
for(int i = 0; i < 20; i++) if(!Settings.HeadAttach)
OrientationAdjustment(ref l_data.m_rightHand.m_fingerPosition[i], ref l_data.m_rightHand.m_fingerRotation[i], Settings.TrackingMode); this.transform.localPosition = p_offset * (!m_inVR ? m_scaleRelation : 1f);
}
m_leapHandRight.transform.localPosition = l_data.m_rightHand.m_position;
m_leapHandRight.transform.localRotation = l_data.m_rightHand.m_rotation; void OnModelVisibilityChange(bool p_state)
{
OrientationAdjustment(ref l_data.m_rightHand.m_elbowPosition, ref ms_dummyRotation, Settings.TrackingMode); m_leapControllerModel.SetActive(p_state);
m_leapElbowRight.transform.localPosition = l_data.m_rightHand.m_elbowPosition; }
if(Settings.VisualHands) void OnVisualHandsChange(bool p_state)
m_visualHandRight?.Update(l_data.m_rightHand); {
} m_leapHandLeft?.SetMeshActive(p_state);
} m_leapHandRight?.SetMeshActive(p_state);
} }
public Transform GetLeftHand() => m_leapHandLeft.transform; void OnTrackingModeChange(Settings.LeapTrackingMode p_mode)
public Transform GetRightHand() => m_leapHandRight.transform; {
public Transform GetLeftElbow() => m_leapElbowLeft.transform; switch(p_mode)
public Transform GetRightElbow() => m_leapElbowRight.transform; {
case Settings.LeapTrackingMode.Screentop:
// Settings m_leapControllerModel.transform.localRotation = Quaternion.Euler(0f, 0f, 180f);
void OnDesktopOffsetChange(Vector3 p_offset) break;
{ case Settings.LeapTrackingMode.Desktop:
if(!Settings.HeadAttach) m_leapControllerModel.transform.localRotation = Quaternion.identity;
this.transform.localPosition = p_offset * (!m_inVR ? m_scaleRelation : 1f); break;
} case Settings.LeapTrackingMode.HMD:
m_leapControllerModel.transform.localRotation = Quaternion.Euler(270f, 180f, 0f);
void OnModelVisibilityChange(bool p_state) break;
{ }
m_leapControllerModel.SetActive(p_state); }
}
void OnRootAngleChange(Vector3 p_angle)
void OnVisualHandsChange(bool p_state) {
{ this.transform.localRotation = Quaternion.Euler(p_angle);
m_visualHands.SetActive(p_state); }
}
void OnHeadAttachChange(bool p_state)
void OnTrackingModeChange(Settings.LeapTrackingMode p_mode) {
{ if(!m_inVR)
switch(p_mode) {
{ this.transform.parent = (p_state ? PlayerSetup.Instance.desktopCamera.transform : PlayerSetup.Instance.desktopCameraRig.transform);
case Settings.LeapTrackingMode.Screentop: this.transform.localPosition = (p_state ? Settings.HeadOffset : Settings.DesktopOffset) * m_scaleRelation;
m_leapControllerModel.transform.localRotation = Quaternion.Euler(0f, 0f, 180f); }
break; else
case Settings.LeapTrackingMode.Desktop: {
m_leapControllerModel.transform.localRotation = Quaternion.identity; this.transform.parent = (p_state ? PlayerSetup.Instance.vrCamera.transform : PlayerSetup.Instance.vrCameraRig.transform);
break; this.transform.localPosition = (p_state ? Settings.HeadOffset : Settings.DesktopOffset);
case Settings.LeapTrackingMode.HMD: }
m_leapControllerModel.transform.localRotation = Quaternion.Euler(270f, 180f, 0f);
break; this.transform.localScale = Vector3.one * (!m_inVR ? m_scaleRelation : 1f);
} this.transform.localRotation = Quaternion.Euler(Settings.RootAngle);
} }
void OnRootAngleChange(Vector3 p_angle) void OnHeadOffsetChange(Vector3 p_offset)
{ {
this.transform.localRotation = Quaternion.Euler(p_angle); if(Settings.HeadAttach)
} this.transform.localPosition = p_offset * (!m_inVR ? m_scaleRelation : 1f);
}
void OnHeadAttachChange(bool p_state)
{ // Game events
if(!m_inVR) internal void OnAvatarClear()
{ {
this.transform.parent = (p_state ? PlayerSetup.Instance.desktopCamera.transform : PlayerSetup.Instance.desktopCameraRig.transform); m_scaleRelation = 1f;
this.transform.localPosition = (p_state ? Settings.HeadOffset : Settings.DesktopOffset) * m_scaleRelation; OnHeadAttachChange(Settings.HeadAttach);
} }
else
{ internal void OnAvatarSetup()
this.transform.parent = (p_state ? PlayerSetup.Instance.vrCamera.transform : PlayerSetup.Instance.vrCameraRig.transform); {
this.transform.localPosition = (p_state ? Settings.HeadOffset : Settings.DesktopOffset); m_inVR = Utils.IsInVR();
} OnHeadAttachChange(Settings.HeadAttach);
}
this.transform.localScale = Vector3.one * (!m_inVR ? m_scaleRelation : 1f);
this.transform.localRotation = Quaternion.Euler(Settings.RootAngle); internal void OnPlayspaceScale(float p_relation)
} {
m_scaleRelation = p_relation;
void OnHeadOffsetChange(Vector3 p_offset) OnHeadAttachChange(Settings.HeadAttach);
{ }
if(Settings.HeadAttach)
this.transform.localPosition = p_offset * (!m_inVR ? m_scaleRelation : 1f); void OnModeSwitch()
} {
m_inVR = Utils.IsInVR();
// Game events OnHeadAttachChange(Settings.HeadAttach);
internal void OnAvatarClear() }
{
m_scaleRelation = 1f; // Utils
OnHeadAttachChange(Settings.HeadAttach); static void OrientationAdjustment(ref Vector3 p_pos, ref Quaternion p_rot, Settings.LeapTrackingMode p_mode)
} {
switch(p_mode)
internal void OnAvatarSetup() {
{ case Settings.LeapTrackingMode.Screentop:
m_inVR = Utils.IsInVR(); {
OnHeadAttachChange(Settings.HeadAttach); p_pos.x *= -1f;
} p_pos.y *= -1f;
p_rot = (ms_screentopRotation * p_rot);
internal void OnPlayspaceScale(float p_relation) }
{ break;
m_scaleRelation = p_relation;
OnHeadAttachChange(Settings.HeadAttach); case Settings.LeapTrackingMode.HMD:
} {
p_pos.x *= -1f;
void OnModeSwitch() Utils.Swap(ref p_pos.y, ref p_pos.z);
{ p_rot = (ms_hmdRotation * p_rot);
m_inVR = Utils.IsInVR(); }
OnHeadAttachChange(Settings.HeadAttach); break;
} }
}
// Utils }
static void OrientationAdjustment(ref Vector3 p_pos, ref Quaternion p_rot, Settings.LeapTrackingMode p_mode) }
{
switch(p_mode)
{
case Settings.LeapTrackingMode.Screentop:
{
p_pos.x *= -1f;
p_pos.y *= -1f;
p_rot = (ms_screentopRotation * p_rot);
}
break;
case Settings.LeapTrackingMode.HMD:
{
p_pos.x *= -1f;
Utils.Swap(ref p_pos.y, ref p_pos.z);
p_rot = (ms_hmdRotation * p_rot);
}
break;
}
}
}
}

View file

@ -1,346 +1,346 @@
using ABI_RC.Core.InteractionSystem; using ABI_RC.Core.InteractionSystem;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using UnityEngine; using UnityEngine;
namespace ml_lme namespace ml_lme
{ {
static class Settings static class Settings
{ {
public enum LeapTrackingMode public enum LeapTrackingMode
{ {
Screentop = 0, Screentop = 0,
Desktop, Desktop,
HMD HMD
} }
enum ModSetting enum ModSetting
{ {
Enabled, Enabled,
DesktopX, DesktopX,
DesktopY, DesktopY,
DesktopZ, DesktopZ,
FingersOnly, FingersOnly,
Model, Model,
Mode, Mode,
AngleX, AngleX,
AngleY, AngleY,
AngleZ, AngleZ,
Head, Head,
HeadX, HeadX,
HeadY, HeadY,
HeadZ, HeadZ,
TrackElbows, TrackElbows,
Interaction, Interaction,
Gestures, Gestures,
InteractThreadhold, InteractThreadhold,
GripThreadhold, GripThreadhold,
VisualHands VisualHands
}; };
public static bool Enabled { get; private set; } = false; public static bool Enabled { get; private set; } = false;
public static Vector3 DesktopOffset { get; private set; } = new Vector3(0f, -0.45f, 0.3f); public static Vector3 DesktopOffset { get; private set; } = new Vector3(0f, -0.45f, 0.3f);
public static bool FingersOnly { get; private set; } = false; public static bool FingersOnly { get; private set; } = false;
public static bool ModelVisibility { get; private set; } = false; public static bool ModelVisibility { get; private set; } = false;
public static LeapTrackingMode TrackingMode { get; private set; } = LeapTrackingMode.Desktop; public static LeapTrackingMode TrackingMode { get; private set; } = LeapTrackingMode.Desktop;
public static Vector3 RootAngle { get; private set; } = Vector3.zero; public static Vector3 RootAngle { get; private set; } = Vector3.zero;
public static bool HeadAttach { get; private set; } = false; public static bool HeadAttach { get; private set; } = false;
public static Vector3 HeadOffset { get; private set; } = new Vector3(0f, -0.3f, 0.15f); public static Vector3 HeadOffset { get; private set; } = new Vector3(0f, -0.3f, 0.15f);
public static bool TrackElbows { get; private set; } = true; public static bool TrackElbows { get; private set; } = true;
public static bool Interaction { get; private set; } = true; public static bool Interaction { get; private set; } = true;
public static bool Gestures { get; private set; } = false; public static bool Gestures { get; private set; } = false;
public static float InteractThreadhold { get; private set; } = 0.8f; public static float InteractThreadhold { get; private set; } = 0.8f;
public static float GripThreadhold { get; private set; } = 0.4f; public static float GripThreadhold { get; private set; } = 0.4f;
public static bool VisualHands { get; private set; } = false; public static bool VisualHands { get; private set; } = false;
static MelonLoader.MelonPreferences_Category ms_category = null; static MelonLoader.MelonPreferences_Category ms_category = null;
static List<MelonLoader.MelonPreferences_Entry> ms_entries = null; static List<MelonLoader.MelonPreferences_Entry> ms_entries = null;
static public event Action<bool> EnabledChange; static public event Action<bool> EnabledChange;
static public event Action<Vector3> DesktopOffsetChange; static public event Action<Vector3> DesktopOffsetChange;
static public event Action<bool> FingersOnlyChange; static public event Action<bool> FingersOnlyChange;
static public event Action<bool> ModelVisibilityChange; static public event Action<bool> ModelVisibilityChange;
static public event Action<LeapTrackingMode> TrackingModeChange; static public event Action<LeapTrackingMode> TrackingModeChange;
static public event Action<Vector3> RootAngleChange; static public event Action<Vector3> RootAngleChange;
static public event Action<bool> HeadAttachChange; static public event Action<bool> HeadAttachChange;
static public event Action<Vector3> HeadOffsetChange; static public event Action<Vector3> HeadOffsetChange;
static public event Action<bool> TrackElbowsChange; static public event Action<bool> TrackElbowsChange;
static public event Action<bool> InteractionChange; static public event Action<bool> InteractionChange;
static public event Action<bool> GesturesChange; static public event Action<bool> GesturesChange;
static public event Action<float> InteractThreadholdChange; static public event Action<float> InteractThreadholdChange;
static public event Action<float> GripThreadholdChange; static public event Action<float> GripThreadholdChange;
static public event Action<bool> VisualHandsChange; static public event Action<bool> VisualHandsChange;
internal static void Init() internal static void Init()
{ {
ms_category = MelonLoader.MelonPreferences.CreateCategory("LME", null, true); ms_category = MelonLoader.MelonPreferences.CreateCategory("LME", null, true);
ms_entries = new List<MelonLoader.MelonPreferences_Entry>() ms_entries = new List<MelonLoader.MelonPreferences_Entry>()
{ {
ms_category.CreateEntry(ModSetting.Enabled.ToString(), Enabled), ms_category.CreateEntry(ModSetting.Enabled.ToString(), Enabled),
ms_category.CreateEntry(ModSetting.DesktopX.ToString(), (int)(DesktopOffset.x * 100f)), ms_category.CreateEntry(ModSetting.DesktopX.ToString(), (int)(DesktopOffset.x * 100f)),
ms_category.CreateEntry(ModSetting.DesktopY.ToString(), (int)(DesktopOffset.y * 100f)), ms_category.CreateEntry(ModSetting.DesktopY.ToString(), (int)(DesktopOffset.y * 100f)),
ms_category.CreateEntry(ModSetting.DesktopZ.ToString(), (int)(DesktopOffset.z * 100f)), ms_category.CreateEntry(ModSetting.DesktopZ.ToString(), (int)(DesktopOffset.z * 100f)),
ms_category.CreateEntry(ModSetting.FingersOnly.ToString(), FingersOnly), ms_category.CreateEntry(ModSetting.FingersOnly.ToString(), FingersOnly),
ms_category.CreateEntry(ModSetting.Model.ToString(), ModelVisibility), ms_category.CreateEntry(ModSetting.Model.ToString(), ModelVisibility),
ms_category.CreateEntry(ModSetting.Mode.ToString(), (int)TrackingMode), ms_category.CreateEntry(ModSetting.Mode.ToString(), (int)TrackingMode),
ms_category.CreateEntry(ModSetting.AngleX.ToString(), (int)(RootAngle.x * 100f)), ms_category.CreateEntry(ModSetting.AngleX.ToString(), (int)(RootAngle.x * 100f)),
ms_category.CreateEntry(ModSetting.AngleY.ToString(), (int)(RootAngle.y * 100f)), ms_category.CreateEntry(ModSetting.AngleY.ToString(), (int)(RootAngle.y * 100f)),
ms_category.CreateEntry(ModSetting.AngleZ.ToString(), (int)(RootAngle.z * 100f)), ms_category.CreateEntry(ModSetting.AngleZ.ToString(), (int)(RootAngle.z * 100f)),
ms_category.CreateEntry(ModSetting.Head.ToString(), HeadAttach), ms_category.CreateEntry(ModSetting.Head.ToString(), HeadAttach),
ms_category.CreateEntry(ModSetting.HeadX.ToString(), (int)(HeadOffset.x * 100f)), ms_category.CreateEntry(ModSetting.HeadX.ToString(), (int)(HeadOffset.x * 100f)),
ms_category.CreateEntry(ModSetting.HeadY.ToString(), (int)(HeadOffset.y * 100f)), ms_category.CreateEntry(ModSetting.HeadY.ToString(), (int)(HeadOffset.y * 100f)),
ms_category.CreateEntry(ModSetting.HeadZ.ToString(), (int)(HeadOffset.z * 100f)), ms_category.CreateEntry(ModSetting.HeadZ.ToString(), (int)(HeadOffset.z * 100f)),
ms_category.CreateEntry(ModSetting.TrackElbows.ToString(), TrackElbows), ms_category.CreateEntry(ModSetting.TrackElbows.ToString(), TrackElbows),
ms_category.CreateEntry(ModSetting.Interaction.ToString(), Interaction), ms_category.CreateEntry(ModSetting.Interaction.ToString(), Interaction),
ms_category.CreateEntry(ModSetting.Gestures.ToString(), Gestures), ms_category.CreateEntry(ModSetting.Gestures.ToString(), Gestures),
ms_category.CreateEntry(ModSetting.InteractThreadhold.ToString(), (int)(InteractThreadhold * 100f)), ms_category.CreateEntry(ModSetting.InteractThreadhold.ToString(), (int)(InteractThreadhold * 100f)),
ms_category.CreateEntry(ModSetting.GripThreadhold.ToString(), (int)(GripThreadhold * 100f)), ms_category.CreateEntry(ModSetting.GripThreadhold.ToString(), (int)(GripThreadhold * 100f)),
ms_category.CreateEntry(ModSetting.VisualHands.ToString(), VisualHands) ms_category.CreateEntry(ModSetting.VisualHands.ToString(), VisualHands)
}; };
Load(); Load();
MelonLoader.MelonCoroutines.Start(WaitMainMenuUi()); MelonLoader.MelonCoroutines.Start(WaitMainMenuUi());
} }
static System.Collections.IEnumerator WaitMainMenuUi() static System.Collections.IEnumerator WaitMainMenuUi()
{ {
while(ViewManager.Instance == null) while(ViewManager.Instance == null)
yield return null; yield return null;
while(ViewManager.Instance.gameMenuView == null) while(ViewManager.Instance.gameMenuView == null)
yield return null; yield return null;
while(ViewManager.Instance.gameMenuView.Listener == null) while(ViewManager.Instance.gameMenuView.Listener == null)
yield return null; yield return null;
ViewManager.Instance.gameMenuView.Listener.ReadyForBindings += () => ViewManager.Instance.gameMenuView.Listener.ReadyForBindings += () =>
{ {
ViewManager.Instance.gameMenuView.View.BindCall("OnToggleUpdate_" + ms_category.Identifier, new Action<string, string>(OnToggleUpdate)); ViewManager.Instance.gameMenuView.View.BindCall("OnToggleUpdate_" + ms_category.Identifier, new Action<string, string>(OnToggleUpdate));
ViewManager.Instance.gameMenuView.View.BindCall("OnSliderUpdate_" + ms_category.Identifier, new Action<string, string>(OnSliderUpdate)); ViewManager.Instance.gameMenuView.View.BindCall("OnSliderUpdate_" + ms_category.Identifier, new Action<string, string>(OnSliderUpdate));
ViewManager.Instance.gameMenuView.View.BindCall("OnDropdownUpdate_" + ms_category.Identifier, new Action<string, string>(OnDropdownUpdate)); ViewManager.Instance.gameMenuView.View.BindCall("OnDropdownUpdate_" + ms_category.Identifier, new Action<string, string>(OnDropdownUpdate));
}; };
ViewManager.Instance.gameMenuView.Listener.FinishLoad += (_) => ViewManager.Instance.gameMenuView.Listener.FinishLoad += (_) =>
{ {
ViewManager.Instance.gameMenuView.View.ExecuteScript(ResourcesHandler.GetEmbeddedResource("mods_extension.js")); ViewManager.Instance.gameMenuView.View.ExecuteScript(ResourcesHandler.GetEmbeddedResource("mods_extension.js"));
ViewManager.Instance.gameMenuView.View.ExecuteScript(ResourcesHandler.GetEmbeddedResource("mod_menu.js")); ViewManager.Instance.gameMenuView.View.ExecuteScript(ResourcesHandler.GetEmbeddedResource("mod_menu.js"));
foreach(var l_entry in ms_entries) foreach(var l_entry in ms_entries)
ViewManager.Instance.gameMenuView.View.TriggerEvent("updateModSetting", ms_category.Identifier, l_entry.DisplayName, l_entry.GetValueAsString()); ViewManager.Instance.gameMenuView.View.TriggerEvent("updateModSetting", ms_category.Identifier, l_entry.DisplayName, l_entry.GetValueAsString());
}; };
} }
static void Load() static void Load()
{ {
Enabled = (bool)ms_entries[(int)ModSetting.Enabled].BoxedValue; Enabled = (bool)ms_entries[(int)ModSetting.Enabled].BoxedValue;
DesktopOffset = new Vector3( DesktopOffset = new Vector3(
(int)ms_entries[(int)ModSetting.DesktopX].BoxedValue, (int)ms_entries[(int)ModSetting.DesktopX].BoxedValue,
(int)ms_entries[(int)ModSetting.DesktopY].BoxedValue, (int)ms_entries[(int)ModSetting.DesktopY].BoxedValue,
(int)ms_entries[(int)ModSetting.DesktopZ].BoxedValue (int)ms_entries[(int)ModSetting.DesktopZ].BoxedValue
) * 0.01f; ) * 0.01f;
FingersOnly = (bool)ms_entries[(int)ModSetting.FingersOnly].BoxedValue; FingersOnly = (bool)ms_entries[(int)ModSetting.FingersOnly].BoxedValue;
ModelVisibility = (bool)ms_entries[(int)ModSetting.Model].BoxedValue; ModelVisibility = (bool)ms_entries[(int)ModSetting.Model].BoxedValue;
TrackingMode = (LeapTrackingMode)(int)ms_entries[(int)ModSetting.Mode].BoxedValue; TrackingMode = (LeapTrackingMode)(int)ms_entries[(int)ModSetting.Mode].BoxedValue;
RootAngle = new Vector3( RootAngle = new Vector3(
(int)ms_entries[(int)ModSetting.AngleX].BoxedValue, (int)ms_entries[(int)ModSetting.AngleX].BoxedValue,
(int)ms_entries[(int)ModSetting.AngleY].BoxedValue, (int)ms_entries[(int)ModSetting.AngleY].BoxedValue,
(int)ms_entries[(int)ModSetting.AngleZ].BoxedValue (int)ms_entries[(int)ModSetting.AngleZ].BoxedValue
); );
HeadAttach = (bool)ms_entries[(int)ModSetting.Head].BoxedValue; HeadAttach = (bool)ms_entries[(int)ModSetting.Head].BoxedValue;
HeadOffset = new Vector3( HeadOffset = new Vector3(
(int)ms_entries[(int)ModSetting.HeadX].BoxedValue, (int)ms_entries[(int)ModSetting.HeadX].BoxedValue,
(int)ms_entries[(int)ModSetting.HeadY].BoxedValue, (int)ms_entries[(int)ModSetting.HeadY].BoxedValue,
(int)ms_entries[(int)ModSetting.HeadZ].BoxedValue (int)ms_entries[(int)ModSetting.HeadZ].BoxedValue
) * 0.01f; ) * 0.01f;
TrackElbows = (bool)ms_entries[(int)ModSetting.TrackElbows].BoxedValue; TrackElbows = (bool)ms_entries[(int)ModSetting.TrackElbows].BoxedValue;
Interaction = (bool)ms_entries[(int)ModSetting.Interaction].BoxedValue; Interaction = (bool)ms_entries[(int)ModSetting.Interaction].BoxedValue;
Gestures = (bool)ms_entries[(int)ModSetting.Gestures].BoxedValue; Gestures = (bool)ms_entries[(int)ModSetting.Gestures].BoxedValue;
InteractThreadhold = (int)ms_entries[(int)ModSetting.InteractThreadhold].BoxedValue * 0.01f; InteractThreadhold = (int)ms_entries[(int)ModSetting.InteractThreadhold].BoxedValue * 0.01f;
GripThreadhold = (int)ms_entries[(int)ModSetting.GripThreadhold].BoxedValue * 0.01f; GripThreadhold = (int)ms_entries[(int)ModSetting.GripThreadhold].BoxedValue * 0.01f;
VisualHands = (bool)ms_entries[(int)ModSetting.VisualHands].BoxedValue; VisualHands = (bool)ms_entries[(int)ModSetting.VisualHands].BoxedValue;
} }
static void OnToggleUpdate(string p_name, string p_value) static void OnToggleUpdate(string p_name, string p_value)
{ {
if(Enum.TryParse(p_name, out ModSetting l_setting)) if(Enum.TryParse(p_name, out ModSetting l_setting))
{ {
switch(l_setting) switch(l_setting)
{ {
case ModSetting.Enabled: case ModSetting.Enabled:
{ {
Enabled = bool.Parse(p_value); Enabled = bool.Parse(p_value);
EnabledChange?.Invoke(Enabled); EnabledChange?.Invoke(Enabled);
} }
break; break;
case ModSetting.FingersOnly: case ModSetting.FingersOnly:
{ {
FingersOnly = bool.Parse(p_value); FingersOnly = bool.Parse(p_value);
FingersOnlyChange?.Invoke(FingersOnly); FingersOnlyChange?.Invoke(FingersOnly);
} }
break; break;
case ModSetting.Model: case ModSetting.Model:
{ {
ModelVisibility = bool.Parse(p_value); ModelVisibility = bool.Parse(p_value);
ModelVisibilityChange?.Invoke(ModelVisibility); ModelVisibilityChange?.Invoke(ModelVisibility);
} }
break; break;
case ModSetting.Head: case ModSetting.Head:
{ {
HeadAttach = bool.Parse(p_value); HeadAttach = bool.Parse(p_value);
HeadAttachChange?.Invoke(HeadAttach); HeadAttachChange?.Invoke(HeadAttach);
} }
break; break;
case ModSetting.TrackElbows: case ModSetting.TrackElbows:
{ {
TrackElbows = bool.Parse(p_value); TrackElbows = bool.Parse(p_value);
TrackElbowsChange?.Invoke(TrackElbows); TrackElbowsChange?.Invoke(TrackElbows);
} }
break; break;
case ModSetting.Interaction: case ModSetting.Interaction:
{ {
Interaction = bool.Parse(p_value); Interaction = bool.Parse(p_value);
InteractionChange?.Invoke(Interaction); InteractionChange?.Invoke(Interaction);
} }
break; break;
case ModSetting.Gestures: case ModSetting.Gestures:
{ {
Gestures = bool.Parse(p_value); Gestures = bool.Parse(p_value);
GesturesChange?.Invoke(Gestures); GesturesChange?.Invoke(Gestures);
} }
break; break;
case ModSetting.VisualHands: case ModSetting.VisualHands:
{ {
VisualHands = bool.Parse(p_value); VisualHands = bool.Parse(p_value);
VisualHandsChange?.Invoke(VisualHands); VisualHandsChange?.Invoke(VisualHands);
} }
break; break;
} }
ms_entries[(int)l_setting].BoxedValue = bool.Parse(p_value); ms_entries[(int)l_setting].BoxedValue = bool.Parse(p_value);
} }
} }
static void OnSliderUpdate(string p_name, string p_value) static void OnSliderUpdate(string p_name, string p_value)
{ {
if(Enum.TryParse(p_name, out ModSetting l_setting)) if(Enum.TryParse(p_name, out ModSetting l_setting))
{ {
switch(l_setting) switch(l_setting)
{ {
case ModSetting.DesktopX: case ModSetting.DesktopX:
{ {
Vector3 l_current = DesktopOffset; Vector3 l_current = DesktopOffset;
l_current.x = int.Parse(p_value) * 0.01f; l_current.x = int.Parse(p_value) * 0.01f;
DesktopOffset = l_current; DesktopOffset = l_current;
DesktopOffsetChange?.Invoke(l_current); DesktopOffsetChange?.Invoke(l_current);
} }
break; break;
case ModSetting.DesktopY: case ModSetting.DesktopY:
{ {
Vector3 l_current = DesktopOffset; Vector3 l_current = DesktopOffset;
l_current.y = int.Parse(p_value) * 0.01f; l_current.y = int.Parse(p_value) * 0.01f;
DesktopOffset = l_current; DesktopOffset = l_current;
DesktopOffsetChange?.Invoke(l_current); DesktopOffsetChange?.Invoke(l_current);
} }
break; break;
case ModSetting.DesktopZ: case ModSetting.DesktopZ:
{ {
Vector3 l_current = DesktopOffset; Vector3 l_current = DesktopOffset;
l_current.z = int.Parse(p_value) * 0.01f; l_current.z = int.Parse(p_value) * 0.01f;
DesktopOffset = l_current; DesktopOffset = l_current;
DesktopOffsetChange?.Invoke(l_current); DesktopOffsetChange?.Invoke(l_current);
} }
break; break;
case ModSetting.AngleX: case ModSetting.AngleX:
{ {
Vector3 l_current = RootAngle; Vector3 l_current = RootAngle;
l_current.x = int.Parse(p_value); l_current.x = int.Parse(p_value);
RootAngle = l_current; RootAngle = l_current;
RootAngleChange?.Invoke(l_current); RootAngleChange?.Invoke(l_current);
} }
break; break;
case ModSetting.AngleY: case ModSetting.AngleY:
{ {
Vector3 l_current = RootAngle; Vector3 l_current = RootAngle;
l_current.y = int.Parse(p_value); l_current.y = int.Parse(p_value);
RootAngle = l_current; RootAngle = l_current;
RootAngleChange?.Invoke(l_current); RootAngleChange?.Invoke(l_current);
} }
break; break;
case ModSetting.AngleZ: case ModSetting.AngleZ:
{ {
Vector3 l_current = RootAngle; Vector3 l_current = RootAngle;
l_current.z = int.Parse(p_value); l_current.z = int.Parse(p_value);
RootAngle = l_current; RootAngle = l_current;
RootAngleChange?.Invoke(l_current); RootAngleChange?.Invoke(l_current);
} }
break; break;
case ModSetting.HeadX: case ModSetting.HeadX:
{ {
Vector3 l_current = HeadOffset; Vector3 l_current = HeadOffset;
l_current.x = int.Parse(p_value) * 0.01f; l_current.x = int.Parse(p_value) * 0.01f;
HeadOffset = l_current; HeadOffset = l_current;
HeadOffsetChange?.Invoke(l_current); HeadOffsetChange?.Invoke(l_current);
} }
break; break;
case ModSetting.HeadY: case ModSetting.HeadY:
{ {
Vector3 l_current = HeadOffset; Vector3 l_current = HeadOffset;
l_current.y = int.Parse(p_value) * 0.01f; l_current.y = int.Parse(p_value) * 0.01f;
HeadOffset = l_current; HeadOffset = l_current;
HeadOffsetChange?.Invoke(l_current); HeadOffsetChange?.Invoke(l_current);
} }
break; break;
case ModSetting.HeadZ: case ModSetting.HeadZ:
{ {
Vector3 l_current = HeadOffset; Vector3 l_current = HeadOffset;
l_current.z = int.Parse(p_value) * 0.01f; l_current.z = int.Parse(p_value) * 0.01f;
HeadOffset = l_current; HeadOffset = l_current;
HeadOffsetChange?.Invoke(l_current); HeadOffsetChange?.Invoke(l_current);
} }
break; break;
case ModSetting.InteractThreadhold: case ModSetting.InteractThreadhold:
{ {
InteractThreadhold = int.Parse(p_value) * 0.01f; InteractThreadhold = int.Parse(p_value) * 0.01f;
InteractThreadholdChange?.Invoke(InteractThreadhold); InteractThreadholdChange?.Invoke(InteractThreadhold);
} }
break; break;
case ModSetting.GripThreadhold: case ModSetting.GripThreadhold:
{ {
GripThreadhold = int.Parse(p_value) * 0.01f; GripThreadhold = int.Parse(p_value) * 0.01f;
GripThreadholdChange?.Invoke(GripThreadhold); GripThreadholdChange?.Invoke(GripThreadhold);
} }
break; break;
} }
ms_entries[(int)l_setting].BoxedValue = int.Parse(p_value); ms_entries[(int)l_setting].BoxedValue = int.Parse(p_value);
} }
} }
static void OnDropdownUpdate(string p_name, string p_value) static void OnDropdownUpdate(string p_name, string p_value)
{ {
if(Enum.TryParse(p_name, out ModSetting l_setting)) if(Enum.TryParse(p_name, out ModSetting l_setting))
{ {
switch(l_setting) switch(l_setting)
{ {
case ModSetting.Mode: case ModSetting.Mode:
{ {
TrackingMode = (LeapTrackingMode)int.Parse(p_value); TrackingMode = (LeapTrackingMode)int.Parse(p_value);
TrackingModeChange?.Invoke(TrackingMode); TrackingModeChange?.Invoke(TrackingMode);
} }
break; break;
} }
ms_entries[(int)l_setting].BoxedValue = int.Parse(p_value); ms_entries[(int)l_setting].BoxedValue = int.Parse(p_value);
} }
} }
} }
} }

View file

@ -1,68 +0,0 @@
using UnityEngine;
namespace ml_lme
{
class VisualHand
{
readonly Transform m_wrist = null;
readonly Transform[] m_fingers = null;
public VisualHand(Transform p_root, bool p_left)
{
if(p_root != null)
{
m_wrist = p_root.Find(p_left ? "LeftHand/Wrist" : "RightHand/Wrist");
if(m_wrist != null)
{
m_fingers = new Transform[20];
m_fingers[0] = null; // Actual thumb-meta, look at Leap Motion docs, dummy
m_fingers[1] = m_wrist.Find("thumb_meta");
m_fingers[2] = m_wrist.Find("thumb_meta/thumb_a");
m_fingers[3] = m_wrist.Find("thumb_meta/thumb_a/thumb_b");
m_fingers[4] = m_wrist.Find("index_meta");
m_fingers[5] = m_wrist.Find("index_meta/index_a");
m_fingers[6] = m_wrist.Find("index_meta/index_a/index_b");
m_fingers[7] = m_wrist.Find("index_meta/index_a/index_b/index_c");
m_fingers[8] = m_wrist.Find("middle_meta");
m_fingers[9] = m_wrist.Find("middle_meta/middle_a");
m_fingers[10] = m_wrist.Find("middle_meta/middle_a/middle_b");
m_fingers[11] = m_wrist.Find("middle_meta/middle_a/middle_b/middle_c");
m_fingers[12] = m_wrist.Find("ring_meta");
m_fingers[13] = m_wrist.Find("ring_meta/ring_a");
m_fingers[14] = m_wrist.Find("ring_meta/ring_a/ring_b");
m_fingers[15] = m_wrist.Find("ring_meta/ring_a/ring_b/ring_c");
m_fingers[16] = m_wrist.Find("pinky_meta");
m_fingers[17] = m_wrist.Find("pinky_meta/pinky_a");
m_fingers[18] = m_wrist.Find("pinky_meta/pinky_a/pinky_b");
m_fingers[19] = m_wrist.Find("pinky_meta/pinky_a/pinky_b/pinky_c");
}
}
}
public void Update(LeapParser.HandData p_data)
{
if(m_wrist != null)
{
m_wrist.position = p_data.m_position;
m_wrist.rotation = p_data.m_rotation;
for(int i = 0; i < 20; i++)
{
if(m_fingers[i] != null)
{
//m_fingers[i].position = p_data.m_fingerPosition[i];
m_fingers[i].rotation = p_data.m_fingerRotation[i];
}
}
m_wrist.localPosition = p_data.m_position;
m_wrist.localRotation = p_data.m_rotation;
}
}
}
}

View file

@ -11,8 +11,8 @@
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<DebugType>none</DebugType> <DebugType>embedded</DebugType>
<DebugSymbols>false</DebugSymbols> <DebugSymbols>true</DebugSymbols>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>

View file

@ -1,162 +1,162 @@
{ {
let l_block = document.createElement('div'); let l_block = document.createElement('div');
l_block.innerHTML = ` l_block.innerHTML = `
<div class ="settings-subcategory"> <div class ="settings-subcategory">
<div class ="subcategory-name">Leap Motion tracking</div> <div class ="subcategory-name">Leap Motion tracking</div>
<div class ="subcategory-description"></div> <div class ="subcategory-description"></div>
</div> </div>
<div class ="row-wrapper"> <div class ="row-wrapper">
<div class ="option-caption">Enable tracking: </div> <div class ="option-caption">Enable tracking: </div>
<div class ="option-input"> <div class ="option-input">
<div id="Enabled" class ="inp_toggle no-scroll" data-current="false"></div> <div id="Enabled" class ="inp_toggle no-scroll" data-current="false"></div>
</div> </div>
</div> </div>
<div class ="row-wrapper"> <div class ="row-wrapper">
<div class ="option-caption">Tracking mode: </div> <div class ="option-caption">Tracking mode: </div>
<div class ="option-input"> <div class ="option-input">
<div id="Mode" class ="inp_dropdown no-scroll" data-options="0:Screentop,1:Desktop,2:HMD" data-current="1"></div> <div id="Mode" class ="inp_dropdown no-scroll" data-options="0:Screentop,1:Desktop,2:HMD" data-current="1"></div>
</div> </div>
</div> </div>
<div class ="row-wrapper"> <div class ="row-wrapper">
<div class ="option-caption">Desktop offset X: </div> <div class ="option-caption">Desktop offset X: </div>
<div class ="option-input"> <div class ="option-input">
<div id="DesktopX" class ="inp_slider no-scroll" data-min="-100" data-max="100" data-current="0"></div> <div id="DesktopX" class ="inp_slider no-scroll" data-min="-100" data-max="100" data-current="0"></div>
</div> </div>
</div> </div>
<div class ="row-wrapper"> <div class ="row-wrapper">
<div class ="option-caption">Desktop offset Y: </div> <div class ="option-caption">Desktop offset Y: </div>
<div class ="option-input"> <div class ="option-input">
<div id="DesktopY" class ="inp_slider no-scroll" data-min="-100" data-max="100" data-current="-45"></div> <div id="DesktopY" class ="inp_slider no-scroll" data-min="-100" data-max="100" data-current="-45"></div>
</div> </div>
</div> </div>
<div class ="row-wrapper"> <div class ="row-wrapper">
<div class ="option-caption">Desktop offset Z: </div> <div class ="option-caption">Desktop offset Z: </div>
<div class ="option-input"> <div class ="option-input">
<div id="DesktopZ" class ="inp_slider no-scroll" data-min="-100" data-max="100" data-current="30"></div> <div id="DesktopZ" class ="inp_slider no-scroll" data-min="-100" data-max="100" data-current="30"></div>
</div> </div>
</div> </div>
<div class ="row-wrapper"> <div class ="row-wrapper">
<div class ="option-caption">Attach to head: </div> <div class ="option-caption">Attach to head: </div>
<div class ="option-input"> <div class ="option-input">
<div id="Head" class ="inp_toggle no-scroll" data-current="false"></div> <div id="Head" class ="inp_toggle no-scroll" data-current="false"></div>
</div> </div>
</div> </div>
<div class ="row-wrapper"> <div class ="row-wrapper">
<div class ="option-caption">Head offset X: </div> <div class ="option-caption">Head offset X: </div>
<div class ="option-input"> <div class ="option-input">
<div id="HeadX" class ="inp_slider no-scroll" data-min="-100" data-max="100" data-current="0"></div> <div id="HeadX" class ="inp_slider no-scroll" data-min="-100" data-max="100" data-current="0"></div>
</div> </div>
</div> </div>
<div class ="row-wrapper"> <div class ="row-wrapper">
<div class ="option-caption">Head offset Y: </div> <div class ="option-caption">Head offset Y: </div>
<div class ="option-input"> <div class ="option-input">
<div id="HeadY" class ="inp_slider no-scroll" data-min="-100" data-max="100" data-current="-30"></div> <div id="HeadY" class ="inp_slider no-scroll" data-min="-100" data-max="100" data-current="-30"></div>
</div> </div>
</div> </div>
<div class ="row-wrapper"> <div class ="row-wrapper">
<div class ="option-caption">Head offset Z: </div> <div class ="option-caption">Head offset Z: </div>
<div class ="option-input"> <div class ="option-input">
<div id="HeadZ" class ="inp_slider no-scroll" data-min="-100" data-max="100" data-current="15"></div> <div id="HeadZ" class ="inp_slider no-scroll" data-min="-100" data-max="100" data-current="15"></div>
</div> </div>
</div> </div>
<div class ="row-wrapper"> <div class ="row-wrapper">
<div class ="option-caption">Offset angle X: </div> <div class ="option-caption">Offset angle X: </div>
<div class ="option-input"> <div class ="option-input">
<div id="AngleX" class ="inp_slider no-scroll" data-min="-180" data-max="180" data-current="0"></div> <div id="AngleX" class ="inp_slider no-scroll" data-min="-180" data-max="180" data-current="0"></div>
</div> </div>
</div> </div>
<div class ="row-wrapper"> <div class ="row-wrapper">
<div class ="option-caption">Offset angle Y: </div> <div class ="option-caption">Offset angle Y: </div>
<div class ="option-input"> <div class ="option-input">
<div id="AngleY" class ="inp_slider no-scroll" data-min="-180" data-max="180" data-current="0"></div> <div id="AngleY" class ="inp_slider no-scroll" data-min="-180" data-max="180" data-current="0"></div>
</div> </div>
</div> </div>
<div class ="row-wrapper"> <div class ="row-wrapper">
<div class ="option-caption">Offset angle Z: </div> <div class ="option-caption">Offset angle Z: </div>
<div class ="option-input"> <div class ="option-input">
<div id="AngleZ" class ="inp_slider no-scroll" data-min="-180" data-max="180" data-current="0"></div> <div id="AngleZ" class ="inp_slider no-scroll" data-min="-180" data-max="180" data-current="0"></div>
</div> </div>
</div> </div>
<div class ="row-wrapper"> <div class ="row-wrapper">
<div class ="option-caption">Track elbows: </div> <div class ="option-caption">Track elbows: </div>
<div class ="option-input"> <div class ="option-input">
<div id="TrackElbows" class ="inp_toggle no-scroll" data-current="true"></div> <div id="TrackElbows" class ="inp_toggle no-scroll" data-current="true"></div>
</div> </div>
</div> </div>
<div class ="row-wrapper"> <div class ="row-wrapper">
<div class ="option-caption">Fingers tracking only: </div> <div class ="option-caption">Fingers tracking only: </div>
<div class ="option-input"> <div class ="option-input">
<div id="FingersOnly" class ="inp_toggle no-scroll" data-current="false"></div> <div id="FingersOnly" class ="inp_toggle no-scroll" data-current="false"></div>
</div> </div>
</div> </div>
<div class ="row-wrapper"> <div class ="row-wrapper">
<div class ="option-caption">Model visibility: </div> <div class ="option-caption">Model visibility: </div>
<div class ="option-input"> <div class ="option-input">
<div id="Model" class ="inp_toggle no-scroll" data-current="false"></div> <div id="Model" class ="inp_toggle no-scroll" data-current="false"></div>
</div> </div>
</div> </div>
<div class ="row-wrapper"> <div class ="row-wrapper">
<div class ="option-caption">Visualize hands: </div> <div class ="option-caption">Visualize hands: </div>
<div class ="option-input"> <div class ="option-input">
<div id="VisualHands" class ="inp_toggle no-scroll" data-current="false"></div> <div id="VisualHands" class ="inp_toggle no-scroll" data-current="false"></div>
</div> </div>
</div> </div>
<div class ="row-wrapper"> <div class ="row-wrapper">
<div class ="option-caption">Interaction input: </div> <div class ="option-caption">Interaction input: </div>
<div class ="option-input"> <div class ="option-input">
<div id="Interaction" class ="inp_toggle no-scroll" data-current="false"></div> <div id="Interaction" class ="inp_toggle no-scroll" data-current="false"></div>
</div> </div>
</div> </div>
<div class ="row-wrapper"> <div class ="row-wrapper">
<div class ="option-caption">Recognize gestures: </div> <div class ="option-caption">Recognize gestures: </div>
<div class ="option-input"> <div class ="option-input">
<div id="Gestures" class ="inp_toggle no-scroll" data-current="false"></div> <div id="Gestures" class ="inp_toggle no-scroll" data-current="false"></div>
</div> </div>
</div> </div>
<div class ="row-wrapper"> <div class ="row-wrapper">
<div class ="option-caption">Interact gesture threadhold: </div> <div class ="option-caption">Interact gesture threadhold: </div>
<div class ="option-input"> <div class ="option-input">
<div id="InteractThreadhold" class ="inp_slider no-scroll" data-min="0" data-max="100" data-current="80"></div> <div id="InteractThreadhold" class ="inp_slider no-scroll" data-min="0" data-max="100" data-current="80"></div>
</div> </div>
</div> </div>
<div class ="row-wrapper"> <div class ="row-wrapper">
<div class ="option-caption">Grip gesture threadhold: </div> <div class ="option-caption">Grip gesture threadhold: </div>
<div class ="option-input"> <div class ="option-input">
<div id="GripThreadhold" class ="inp_slider no-scroll" data-min="0" data-max="100" data-current="40"></div> <div id="GripThreadhold" class ="inp_slider no-scroll" data-min="0" data-max="100" data-current="40"></div>
</div> </div>
</div> </div>
`; `;
document.getElementById('settings-implementation').appendChild(l_block); document.getElementById('settings-implementation').appendChild(l_block);
// Toggles // Toggles
for (let l_toggle of l_block.querySelectorAll('.inp_toggle')) for (let l_toggle of l_block.querySelectorAll('.inp_toggle'))
modsExtension.addSetting('LME', l_toggle.id, modsExtension.createToggle(l_toggle, 'OnToggleUpdate_LME')); modsExtension.addSetting('LME', l_toggle.id, modsExtension.createToggle(l_toggle, 'OnToggleUpdate_LME'));
// Sliders // Sliders
for (let l_slider of l_block.querySelectorAll('.inp_slider')) for (let l_slider of l_block.querySelectorAll('.inp_slider'))
modsExtension.addSetting('LME', l_slider.id, modsExtension.createSlider(l_slider, 'OnSliderUpdate_LME')); modsExtension.addSetting('LME', l_slider.id, modsExtension.createSlider(l_slider, 'OnSliderUpdate_LME'));
// Dropdowns // Dropdowns
for (let l_dropdown of l_block.querySelectorAll('.inp_dropdown')) for (let l_dropdown of l_block.querySelectorAll('.inp_dropdown'))
modsExtension.addSetting('LME', l_dropdown.id, modsExtension.createDropdown(l_dropdown, 'OnDropdownUpdate_LME')); modsExtension.addSetting('LME', l_dropdown.id, modsExtension.createDropdown(l_dropdown, 'OnDropdownUpdate_LME'));
} }

View file

@ -84,26 +84,56 @@ namespace ml_pmc
ref readonly float[] l_curls = ref m_puppetParser.GetFingerCurls(); ref readonly float[] l_curls = ref m_puppetParser.GetFingerCurls();
ref readonly float[] l_spreads = ref m_puppetParser.GetFingerSpreads(); ref readonly float[] l_spreads = ref m_puppetParser.GetFingerSpreads();
CVRInputManager.Instance.fingerCurlLeftThumb = l_curls[l_mirror ? 5 : 0]; // Left hand
CVRInputManager.Instance.fingerCurlLeftIndex = l_curls[l_mirror ? 6 : 1]; CVRInputManager.Instance.finger1StretchedLeftThumb = l_curls[l_mirror ? 15 : 0];
CVRInputManager.Instance.fingerCurlLeftMiddle = l_curls[l_mirror ? 7 : 2]; CVRInputManager.Instance.finger2StretchedLeftThumb = l_curls[l_mirror ? 16 : 1];
CVRInputManager.Instance.fingerCurlLeftRing = l_curls[l_mirror ? 8 : 3]; CVRInputManager.Instance.finger3StretchedLeftThumb = l_curls[l_mirror ? 17 : 2];
CVRInputManager.Instance.fingerCurlLeftPinky = l_curls[l_mirror ? 9 : 4];
CVRInputManager.Instance.fingerCurlRightThumb = l_curls[l_mirror ? 0 : 5];
CVRInputManager.Instance.fingerCurlRightIndex = l_curls[l_mirror ? 1 : 6];
CVRInputManager.Instance.fingerCurlRightMiddle = l_curls[l_mirror ? 2 : 7];
CVRInputManager.Instance.fingerCurlRightRing = l_curls[l_mirror ? 3 : 8];
CVRInputManager.Instance.fingerCurlRightPinky = l_curls[l_mirror ? 4 : 9];
CVRInputManager.Instance.fingerSpreadLeftThumb = l_spreads[l_mirror ? 5 : 0]; CVRInputManager.Instance.fingerSpreadLeftThumb = l_spreads[l_mirror ? 5 : 0];
CVRInputManager.Instance.finger1StretchedLeftIndex = l_curls[l_mirror ? 18 : 3];
CVRInputManager.Instance.finger2StretchedLeftIndex = l_curls[l_mirror ? 19 : 4];
CVRInputManager.Instance.finger3StretchedLeftIndex = l_curls[l_mirror ? 20 : 5];
CVRInputManager.Instance.fingerSpreadLeftIndex = l_spreads[l_mirror ? 6 : 1]; CVRInputManager.Instance.fingerSpreadLeftIndex = l_spreads[l_mirror ? 6 : 1];
CVRInputManager.Instance.finger1StretchedLeftMiddle = l_curls[l_mirror ? 21 : 6];
CVRInputManager.Instance.finger2StretchedLeftMiddle = l_curls[l_mirror ? 22 : 7];
CVRInputManager.Instance.finger3StretchedLeftMiddle = l_curls[l_mirror ? 23 : 8];
CVRInputManager.Instance.fingerSpreadLeftMiddle = l_spreads[l_mirror ? 7 : 2]; CVRInputManager.Instance.fingerSpreadLeftMiddle = l_spreads[l_mirror ? 7 : 2];
CVRInputManager.Instance.finger1StretchedLeftRing = l_curls[l_mirror ? 24 : 9];
CVRInputManager.Instance.finger2StretchedLeftRing = l_curls[l_mirror ? 25 : 10];
CVRInputManager.Instance.finger3StretchedLeftRing = l_curls[l_mirror ? 26 : 11];
CVRInputManager.Instance.fingerSpreadLeftRing = l_spreads[l_mirror ? 8 : 3]; CVRInputManager.Instance.fingerSpreadLeftRing = l_spreads[l_mirror ? 8 : 3];
CVRInputManager.Instance.finger1StretchedLeftPinky = l_curls[l_mirror ? 27 : 12];
CVRInputManager.Instance.finger2StretchedLeftPinky = l_curls[l_mirror ? 28 : 13];
CVRInputManager.Instance.finger3StretchedLeftPinky = l_curls[l_mirror ? 29 : 14];
CVRInputManager.Instance.fingerSpreadLeftPinky = l_spreads[l_mirror ? 9 : 4]; CVRInputManager.Instance.fingerSpreadLeftPinky = l_spreads[l_mirror ? 9 : 4];
// Right hand
CVRInputManager.Instance.finger1StretchedRightThumb = l_curls[l_mirror ? 0 : 15];
CVRInputManager.Instance.finger2StretchedRightThumb = l_curls[l_mirror ? 1 : 16];
CVRInputManager.Instance.finger3StretchedRightThumb = l_curls[l_mirror ? 2 : 17];
CVRInputManager.Instance.fingerSpreadRightThumb = l_spreads[l_mirror ? 0 : 5]; CVRInputManager.Instance.fingerSpreadRightThumb = l_spreads[l_mirror ? 0 : 5];
CVRInputManager.Instance.finger1StretchedRightIndex = l_curls[l_mirror ? 3 : 18];
CVRInputManager.Instance.finger2StretchedRightIndex = l_curls[l_mirror ? 4 : 19];
CVRInputManager.Instance.finger3StretchedRightIndex = l_curls[l_mirror ? 5 : 20];
CVRInputManager.Instance.fingerSpreadRightIndex = l_spreads[l_mirror ? 1 : 6]; CVRInputManager.Instance.fingerSpreadRightIndex = l_spreads[l_mirror ? 1 : 6];
CVRInputManager.Instance.finger1StretchedRightMiddle = l_curls[l_mirror ? 6 : 21];
CVRInputManager.Instance.finger2StretchedRightMiddle = l_curls[l_mirror ? 7 : 22];
CVRInputManager.Instance.finger3StretchedRightMiddle = l_curls[l_mirror ? 8 : 23];
CVRInputManager.Instance.fingerSpreadRightMiddle = l_spreads[l_mirror ? 2 : 7]; CVRInputManager.Instance.fingerSpreadRightMiddle = l_spreads[l_mirror ? 2 : 7];
CVRInputManager.Instance.finger1StretchedRightRing = l_curls[l_mirror ? 9 : 24];
CVRInputManager.Instance.finger2StretchedRightRing = l_curls[l_mirror ? 10 : 25];
CVRInputManager.Instance.finger3StretchedRightRing = l_curls[l_mirror ? 11 : 26];
CVRInputManager.Instance.fingerSpreadRightRing = l_spreads[l_mirror ? 3 : 8]; CVRInputManager.Instance.fingerSpreadRightRing = l_spreads[l_mirror ? 3 : 8];
CVRInputManager.Instance.finger1StretchedRightPinky = l_curls[l_mirror ? 12 : 27];
CVRInputManager.Instance.finger2StretchedRightPinky = l_curls[l_mirror ? 13 : 28];
CVRInputManager.Instance.finger3StretchedRightPinky = l_curls[l_mirror ? 14 : 29];
CVRInputManager.Instance.fingerSpreadRightPinky = l_spreads[l_mirror ? 4 : 9]; CVRInputManager.Instance.fingerSpreadRightPinky = l_spreads[l_mirror ? 4 : 9];
} }
else else
@ -341,27 +371,69 @@ namespace ml_pmc
if(!CVRInputManager.Instance.individualFingerTracking) if(!CVRInputManager.Instance.individualFingerTracking)
{ {
CVRInputManager.Instance.fingerCurlLeftThumb = 0f; // Left hand
CVRInputManager.Instance.fingerCurlLeftIndex = 0f; CVRInputManager.Instance.finger1StretchedLeftThumb = -0.5f;
CVRInputManager.Instance.fingerCurlLeftMiddle = 0f; CVRInputManager.Instance.finger2StretchedLeftThumb = 0.7f;
CVRInputManager.Instance.fingerCurlLeftRing = 0f; CVRInputManager.Instance.finger3StretchedLeftThumb = 0.7f;
CVRInputManager.Instance.fingerCurlLeftPinky = 0f; CVRInputManager.Instance.fingerSpreadLeftThumb = 0f;
CVRInputManager.Instance.fingerCurlRightThumb = 0f;
CVRInputManager.Instance.fingerCurlRightIndex = 0f;
CVRInputManager.Instance.fingerCurlRightMiddle = 0f;
CVRInputManager.Instance.fingerCurlRightRing = 0f;
CVRInputManager.Instance.fingerCurlRightPinky = 0f;
CVRInputManager.Instance.fingerSpreadLeftThumb = 0.5f; CVRInputManager.Instance.finger1StretchedLeftIndex = 0.5f;
CVRInputManager.Instance.fingerSpreadLeftIndex = 0.5f; CVRInputManager.Instance.finger2StretchedLeftIndex = 0.7f;
CVRInputManager.Instance.fingerSpreadLeftMiddle = 0.5f; CVRInputManager.Instance.finger3StretchedLeftIndex = 0.7f;
CVRInputManager.Instance.fingerSpreadLeftRing = 0.5f; CVRInputManager.Instance.fingerSpreadLeftIndex = 0f;
CVRInputManager.Instance.fingerSpreadLeftPinky = 0.5f;
CVRInputManager.Instance.fingerSpreadRightThumb = 0.5f; CVRInputManager.Instance.finger1StretchedLeftMiddle = 0.5f;
CVRInputManager.Instance.fingerSpreadRightIndex = 0.5f; CVRInputManager.Instance.finger2StretchedLeftMiddle = 0.7f;
CVRInputManager.Instance.fingerSpreadRightMiddle = 0.5f; CVRInputManager.Instance.finger3StretchedLeftMiddle = 0.7f;
CVRInputManager.Instance.fingerSpreadRightRing = 0.5f; CVRInputManager.Instance.fingerSpreadLeftMiddle = 0f;
CVRInputManager.Instance.fingerSpreadRightPinky = 0.5f;
CVRInputManager.Instance.finger1StretchedLeftRing = 0.5f;
CVRInputManager.Instance.finger2StretchedLeftRing = 0.7f;
CVRInputManager.Instance.finger3StretchedLeftRing = 0.7f;
CVRInputManager.Instance.fingerSpreadLeftRing = 0f;
CVRInputManager.Instance.finger1StretchedLeftPinky = 0.5f;
CVRInputManager.Instance.finger2StretchedLeftPinky = 0.7f;
CVRInputManager.Instance.finger3StretchedLeftPinky = 0.7f;
CVRInputManager.Instance.fingerSpreadLeftPinky = 0f;
CVRInputManager.Instance.fingerFullCurlNormalizedLeftThumb = 0f;
CVRInputManager.Instance.fingerFullCurlNormalizedLeftIndex = 0f;
CVRInputManager.Instance.fingerFullCurlNormalizedLeftMiddle = 0f;
CVRInputManager.Instance.fingerFullCurlNormalizedLeftRing = 0f;
CVRInputManager.Instance.fingerFullCurlNormalizedLeftPinky = 0f;
// Right hand
CVRInputManager.Instance.finger1StretchedRightThumb = -0.5f;
CVRInputManager.Instance.finger2StretchedRightThumb = 0.7f;
CVRInputManager.Instance.finger3StretchedRightThumb = 0.7f;
CVRInputManager.Instance.fingerSpreadRightThumb = 0f;
CVRInputManager.Instance.finger1StretchedRightIndex = 0.5f;
CVRInputManager.Instance.finger2StretchedRightIndex = 0.7f;
CVRInputManager.Instance.finger3StretchedRightIndex = 0.7f;
CVRInputManager.Instance.fingerSpreadRightIndex = 0f;
CVRInputManager.Instance.finger1StretchedRightMiddle = 0.5f;
CVRInputManager.Instance.finger2StretchedRightMiddle = 0.7f;
CVRInputManager.Instance.finger3StretchedRightMiddle = 0.7f;
CVRInputManager.Instance.fingerSpreadRightMiddle = 0f;
CVRInputManager.Instance.finger1StretchedRightRing = 0.5f;
CVRInputManager.Instance.finger2StretchedRightRing = 0.7f;
CVRInputManager.Instance.finger3StretchedRightRing = 0.7f;
CVRInputManager.Instance.fingerSpreadRightRing = 0f;
CVRInputManager.Instance.finger1StretchedRightPinky = 0.5f;
CVRInputManager.Instance.finger2StretchedRightPinky = 0.7f;
CVRInputManager.Instance.finger3StretchedRightPinky = 0.7f;
CVRInputManager.Instance.fingerSpreadRightPinky = 0f;
CVRInputManager.Instance.fingerFullCurlNormalizedRightThumb = 0f;
CVRInputManager.Instance.fingerFullCurlNormalizedRightIndex = 0f;
CVRInputManager.Instance.fingerFullCurlNormalizedRightMiddle = 0f;
CVRInputManager.Instance.fingerFullCurlNormalizedRightRing = 0f;
CVRInputManager.Instance.fingerFullCurlNormalizedRightPinky = 0f;
} }
} }
} }

View file

@ -1,108 +1,136 @@
using ABI_RC.Core.Player; using ABI_RC.Core.Player;
using UnityEngine; using UnityEngine;
namespace ml_pmc namespace ml_pmc
{ {
[DisallowMultipleComponent] [DisallowMultipleComponent]
class PuppetParser : MonoBehaviour class PuppetParser : MonoBehaviour
{ {
internal PuppetMaster m_puppetMaster = null; internal PuppetMaster m_puppetMaster = null;
Animator m_animator = null; Animator m_animator = null;
AnimatorCullingMode m_cullMode; AnimatorCullingMode m_cullMode;
HumanPoseHandler m_poseHandler = null; HumanPoseHandler m_poseHandler = null;
HumanPose m_pose; HumanPose m_pose;
Matrix4x4 m_matrix = Matrix4x4.identity; Matrix4x4 m_matrix = Matrix4x4.identity;
Matrix4x4 m_offset = Matrix4x4.identity; Matrix4x4 m_offset = Matrix4x4.identity;
bool m_sitting = false; bool m_sitting = false;
float m_leftGesture = 0f; float m_leftGesture = 0f;
float m_rightGesture = 0f; float m_rightGesture = 0f;
bool m_fingerTracking = false; bool m_fingerTracking = false;
readonly float[] m_fingerCurls = null; readonly float[] m_fingerCurls = null;
readonly float[] m_fingerSpreads = null; readonly float[] m_fingerSpreads = null;
internal PuppetParser() internal PuppetParser()
{ {
m_fingerCurls = new float[10]; m_fingerCurls = new float[30];
m_fingerSpreads = new float[10]; m_fingerSpreads = new float[10];
} }
// Unity events // Unity events
void Start() void Start()
{ {
m_animator = this.GetComponent<Animator>(); m_animator = this.GetComponent<Animator>();
m_cullMode = m_animator.cullingMode; m_cullMode = m_animator.cullingMode;
m_animator.cullingMode = AnimatorCullingMode.AlwaysAnimate; m_animator.cullingMode = AnimatorCullingMode.AlwaysAnimate;
m_poseHandler = new HumanPoseHandler(m_animator.avatar, m_animator.transform); m_poseHandler = new HumanPoseHandler(m_animator.avatar, m_animator.transform);
m_poseHandler.GetHumanPose(ref m_pose); m_poseHandler.GetHumanPose(ref m_pose);
m_matrix = this.transform.GetMatrix(); m_matrix = this.transform.GetMatrix();
} }
void OnDestroy() void OnDestroy()
{ {
m_puppetMaster = null; m_puppetMaster = null;
if(m_animator != null) if(m_animator != null)
m_animator.cullingMode = m_cullMode; m_animator.cullingMode = m_cullMode;
m_animator = null; m_animator = null;
m_poseHandler?.Dispose(); m_poseHandler?.Dispose();
m_poseHandler = null; m_poseHandler = null;
} }
void Update() void Update()
{ {
if(m_puppetMaster != null) if(m_puppetMaster != null)
{ {
m_sitting = m_puppetMaster.PlayerAvatarMovementDataInput.AnimatorSitting; m_sitting = m_puppetMaster.PlayerAvatarMovementDataInput.AnimatorSitting;
m_leftGesture = m_puppetMaster.PlayerAvatarMovementDataInput.AnimatorGestureLeft; m_leftGesture = m_puppetMaster.PlayerAvatarMovementDataInput.AnimatorGestureLeft;
m_rightGesture = m_puppetMaster.PlayerAvatarMovementDataInput.AnimatorGestureRight; m_rightGesture = m_puppetMaster.PlayerAvatarMovementDataInput.AnimatorGestureRight;
m_fingerTracking = m_puppetMaster.PlayerAvatarMovementDataInput.IndexUseIndividualFingers; m_fingerTracking = m_puppetMaster.PlayerAvatarMovementDataInput.UseIndividualFingers;
if(m_fingerTracking) if(m_fingerTracking)
{ {
m_fingerCurls[0] = m_puppetMaster.PlayerAvatarMovementDataInput.LeftThumbCurl; m_fingerCurls[0] = m_puppetMaster.PlayerAvatarMovementDataInput.LeftThumb1Stretched;
m_fingerCurls[1] = m_puppetMaster.PlayerAvatarMovementDataInput.LeftIndexCurl; m_fingerCurls[1] = m_puppetMaster.PlayerAvatarMovementDataInput.LeftThumb2Stretched;
m_fingerCurls[2] = m_puppetMaster.PlayerAvatarMovementDataInput.LeftMiddleCurl; m_fingerCurls[2] = m_puppetMaster.PlayerAvatarMovementDataInput.LeftThumb3Stretched;
m_fingerCurls[3] = m_puppetMaster.PlayerAvatarMovementDataInput.LeftRingCurl; m_fingerSpreads[0] = m_puppetMaster.PlayerAvatarMovementDataInput.LeftThumbSpread;
m_fingerCurls[4] = m_puppetMaster.PlayerAvatarMovementDataInput.LeftPinkyCurl;
m_fingerCurls[5] = m_puppetMaster.PlayerAvatarMovementDataInput.RightThumbCurl; m_fingerCurls[3] = m_puppetMaster.PlayerAvatarMovementDataInput.LeftIndex1Stretched;
m_fingerCurls[6] = m_puppetMaster.PlayerAvatarMovementDataInput.RightIndexCurl; m_fingerCurls[4] = m_puppetMaster.PlayerAvatarMovementDataInput.LeftIndex2Stretched;
m_fingerCurls[7] = m_puppetMaster.PlayerAvatarMovementDataInput.RightMiddleCurl; m_fingerCurls[5] = m_puppetMaster.PlayerAvatarMovementDataInput.LeftIndex3Stretched;
m_fingerCurls[8] = m_puppetMaster.PlayerAvatarMovementDataInput.RightRingCurl; m_fingerSpreads[1] = m_puppetMaster.PlayerAvatarMovementDataInput.LeftIndexSpread;
m_fingerCurls[9] = m_puppetMaster.PlayerAvatarMovementDataInput.RightPinkyCurl;
m_fingerCurls[6] = m_puppetMaster.PlayerAvatarMovementDataInput.LeftMiddle1Stretched;
m_fingerSpreads[0] = m_puppetMaster.PlayerAvatarMovementDataInput.LeftThumbSpread; m_fingerCurls[7] = m_puppetMaster.PlayerAvatarMovementDataInput.LeftMiddle2Stretched;
m_fingerSpreads[1] = m_puppetMaster.PlayerAvatarMovementDataInput.LeftIndexSpread; m_fingerCurls[8] = m_puppetMaster.PlayerAvatarMovementDataInput.LeftMiddle3Stretched;
m_fingerSpreads[2] = m_puppetMaster.PlayerAvatarMovementDataInput.LeftMiddleSpread; m_fingerSpreads[2] = m_puppetMaster.PlayerAvatarMovementDataInput.LeftMiddleSpread;
m_fingerSpreads[3] = m_puppetMaster.PlayerAvatarMovementDataInput.LeftRingSpread;
m_fingerSpreads[4] = m_puppetMaster.PlayerAvatarMovementDataInput.LeftPinkySpread; m_fingerCurls[9] = m_puppetMaster.PlayerAvatarMovementDataInput.LeftRing1Stretched;
m_fingerSpreads[5] = m_puppetMaster.PlayerAvatarMovementDataInput.RightThumbSpread; m_fingerCurls[10] = m_puppetMaster.PlayerAvatarMovementDataInput.LeftRing2Stretched;
m_fingerSpreads[6] = m_puppetMaster.PlayerAvatarMovementDataInput.RightIndexSpread; m_fingerCurls[11] = m_puppetMaster.PlayerAvatarMovementDataInput.LeftRing3Stretched;
m_fingerSpreads[7] = m_puppetMaster.PlayerAvatarMovementDataInput.RightMiddleSpread; m_fingerSpreads[3] = m_puppetMaster.PlayerAvatarMovementDataInput.LeftRingSpread;
m_fingerSpreads[8] = m_puppetMaster.PlayerAvatarMovementDataInput.RightRingSpread;
m_fingerSpreads[9] = m_puppetMaster.PlayerAvatarMovementDataInput.RightPinkySpread; m_fingerCurls[12] = m_puppetMaster.PlayerAvatarMovementDataInput.LeftPinky1Stretched;
} m_fingerCurls[13] = m_puppetMaster.PlayerAvatarMovementDataInput.LeftPinky2Stretched;
m_fingerCurls[14] = m_puppetMaster.PlayerAvatarMovementDataInput.LeftPinky3Stretched;
Matrix4x4 l_current = this.transform.GetMatrix(); m_fingerSpreads[4] = m_puppetMaster.PlayerAvatarMovementDataInput.LeftPinkySpread;
m_offset = m_matrix.inverse * l_current;
m_matrix = l_current; m_fingerCurls[15] = m_puppetMaster.PlayerAvatarMovementDataInput.RightThumb1Stretched;
} m_fingerCurls[16] = m_puppetMaster.PlayerAvatarMovementDataInput.RightThumb2Stretched;
} m_fingerCurls[17] = m_puppetMaster.PlayerAvatarMovementDataInput.RightThumb3Stretched;
m_fingerSpreads[5] = m_puppetMaster.PlayerAvatarMovementDataInput.RightThumbSpread;
void LateUpdate()
{ m_fingerCurls[18] = m_puppetMaster.PlayerAvatarMovementDataInput.RightIndex1Stretched;
if((m_animator != null) && (m_poseHandler != null)) m_fingerCurls[19] = m_puppetMaster.PlayerAvatarMovementDataInput.RightIndex2Stretched;
m_poseHandler.GetHumanPose(ref m_pose); m_fingerCurls[20] = m_puppetMaster.PlayerAvatarMovementDataInput.RightIndex3Stretched;
} m_fingerSpreads[6] = m_puppetMaster.PlayerAvatarMovementDataInput.RightIndexSpread;
public ref HumanPose GetPose() => ref m_pose; m_fingerCurls[21] = m_puppetMaster.PlayerAvatarMovementDataInput.RightMiddle1Stretched;
public ref Matrix4x4 GetLastOffset() => ref m_offset; m_fingerCurls[22] = m_puppetMaster.PlayerAvatarMovementDataInput.RightMiddle2Stretched;
public bool IsSitting() => m_sitting; m_fingerCurls[23] = m_puppetMaster.PlayerAvatarMovementDataInput.RightMiddle3Stretched;
public float GetLeftGesture() => m_leftGesture; m_fingerSpreads[7] = m_puppetMaster.PlayerAvatarMovementDataInput.RightMiddleSpread;
public float GetRightGesture() => m_rightGesture;
public bool HasFingerTracking() => m_fingerTracking; m_fingerCurls[24] = m_puppetMaster.PlayerAvatarMovementDataInput.RightRing1Stretched;
public ref readonly float[] GetFingerCurls() => ref m_fingerCurls; m_fingerCurls[25] = m_puppetMaster.PlayerAvatarMovementDataInput.RightRing2Stretched;
public ref readonly float[] GetFingerSpreads() => ref m_fingerSpreads; m_fingerCurls[26] = m_puppetMaster.PlayerAvatarMovementDataInput.RightRing3Stretched;
} m_fingerSpreads[8] = m_puppetMaster.PlayerAvatarMovementDataInput.RightRingSpread;
}
m_fingerCurls[27] = m_puppetMaster.PlayerAvatarMovementDataInput.RightPinky1Stretched;
m_fingerCurls[28] = m_puppetMaster.PlayerAvatarMovementDataInput.RightPinky2Stretched;
m_fingerCurls[29] = m_puppetMaster.PlayerAvatarMovementDataInput.RightPinky3Stretched;
m_fingerSpreads[9] = m_puppetMaster.PlayerAvatarMovementDataInput.RightPinkySpread;
}
Matrix4x4 l_current = this.transform.GetMatrix();
m_offset = m_matrix.inverse * l_current;
m_matrix = l_current;
}
}
void LateUpdate()
{
if((m_animator != null) && (m_poseHandler != null))
m_poseHandler.GetHumanPose(ref m_pose);
}
public ref HumanPose GetPose() => ref m_pose;
public ref Matrix4x4 GetLastOffset() => ref m_offset;
public bool IsSitting() => m_sitting;
public float GetLeftGesture() => m_leftGesture;
public float GetRightGesture() => m_rightGesture;
public bool HasFingerTracking() => m_fingerTracking;
public ref readonly float[] GetFingerCurls() => ref m_fingerCurls;
public ref readonly float[] GetFingerSpreads() => ref m_fingerSpreads;
}
}