mirror of
https://github.com/hanetzer/sdraw_mods_cvr.git
synced 2025-09-03 18:39:23 +00:00
Update to game build 2024r174ex3
Bones oriented fingers tracking
This commit is contained in:
SDraw
parent
60259c94c4
commit
b547512b69
12 changed files with 1677 additions and 1395 deletions
129
ml_lme/LeapHand.cs
Normal file
129
ml_lme/LeapHand.cs
Normal 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);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -34,7 +34,7 @@ namespace ml_lme
|
|||
|
||||
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.generalMask = -269;
|
||||
m_handRayLeft.isInteractionRay = true;
|
||||
|
|
@ -56,7 +56,7 @@ namespace ml_lme
|
|||
m_lineLeft.receiveShadows = false;
|
||||
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.generalMask = -269;
|
||||
m_handRayRight.isInteractionRay = true;
|
||||
|
|
@ -176,36 +176,36 @@ namespace ml_lme
|
|||
base._inputManager.gestureLeftRaw = 0f;
|
||||
|
||||
// Finger Point & Finger Gun
|
||||
if((base._inputManager.fingerCurlLeftIndex < 0.2f) && (base._inputManager.fingerCurlLeftMiddle > 0.75f) &&
|
||||
(base._inputManager.fingerCurlLeftRing > 0.75f) && (base._inputManager.fingerCurlLeftPinky > 0.75f))
|
||||
if((base._inputManager.fingerFullCurlNormalizedLeftIndex < 0.2f) && (base._inputManager.fingerFullCurlNormalizedLeftMiddle > 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
|
||||
if((base._inputManager.fingerCurlLeftIndex < 0.2f) && (base._inputManager.fingerCurlLeftMiddle < 0.2f) &&
|
||||
(base._inputManager.fingerCurlLeftRing > 0.75f) && (base._inputManager.fingerCurlLeftPinky > 0.75f))
|
||||
if((base._inputManager.fingerFullCurlNormalizedLeftIndex < 0.2f) && (base._inputManager.fingerFullCurlNormalizedLeftMiddle < 0.2f) &&
|
||||
(base._inputManager.fingerFullCurlNormalizedLeftRing > 0.75f) && (base._inputManager.fingerFullCurlNormalizedLeftPinky > 0.75f))
|
||||
{
|
||||
base._inputManager.gestureLeftRaw = 5f;
|
||||
}
|
||||
|
||||
// Rock and Roll
|
||||
if((base._inputManager.fingerCurlLeftIndex < 0.2f) && (base._inputManager.fingerCurlLeftMiddle > 0.75f) &&
|
||||
(base._inputManager.fingerCurlLeftRing > 0.75f) && (base._inputManager.fingerCurlLeftPinky < 0.5f))
|
||||
if((base._inputManager.fingerFullCurlNormalizedLeftIndex < 0.2f) && (base._inputManager.fingerFullCurlNormalizedLeftMiddle > 0.75f) &&
|
||||
(base._inputManager.fingerFullCurlNormalizedLeftRing > 0.75f) && (base._inputManager.fingerFullCurlNormalizedLeftPinky < 0.5f))
|
||||
{
|
||||
base._inputManager.gestureLeftRaw = 6f;
|
||||
}
|
||||
|
||||
// Fist & Thumbs Up
|
||||
if((base._inputManager.fingerCurlLeftIndex > 0.5f) && (base._inputManager.fingerCurlLeftMiddle > 0.5f) &&
|
||||
(base._inputManager.fingerCurlLeftRing > 0.5f) && (base._inputManager.fingerCurlLeftPinky > 0.5f))
|
||||
if((base._inputManager.fingerFullCurlNormalizedLeftIndex > 0.5f) && (base._inputManager.fingerFullCurlNormalizedLeftMiddle > 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
|
||||
if((base._inputManager.fingerCurlLeftIndex < 0.2f) && (base._inputManager.fingerCurlLeftMiddle < 0.2f) &&
|
||||
(base._inputManager.fingerCurlLeftRing < 0.2f) && (base._inputManager.fingerCurlLeftPinky < 0.2f))
|
||||
if((base._inputManager.fingerFullCurlNormalizedLeftIndex < 0.2f) && (base._inputManager.fingerFullCurlNormalizedLeftMiddle < 0.2f) &&
|
||||
(base._inputManager.fingerFullCurlNormalizedLeftRing < 0.2f) && (base._inputManager.fingerFullCurlNormalizedLeftPinky < 0.2f))
|
||||
{
|
||||
base._inputManager.gestureLeftRaw = -1f;
|
||||
}
|
||||
|
|
@ -236,36 +236,36 @@ namespace ml_lme
|
|||
base._inputManager.gestureRightRaw = 0f;
|
||||
|
||||
// Finger Point & Finger Gun
|
||||
if((base._inputManager.fingerCurlRightIndex < 0.2f) && (base._inputManager.fingerCurlRightMiddle > 0.75f) &&
|
||||
(base._inputManager.fingerCurlRightRing > 0.75f) && (base._inputManager.fingerCurlRightPinky > 0.75f))
|
||||
if((base._inputManager.fingerFullCurlNormalizedRightIndex < 0.2f) && (base._inputManager.fingerFullCurlNormalizedRightMiddle > 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
|
||||
if((base._inputManager.fingerCurlRightIndex < 0.2f) && (base._inputManager.fingerCurlRightMiddle < 0.2f) &&
|
||||
(base._inputManager.fingerCurlRightRing > 0.75f) && (base._inputManager.fingerCurlRightPinky > 0.75f))
|
||||
if((base._inputManager.fingerFullCurlNormalizedRightIndex < 0.2f) && (base._inputManager.fingerFullCurlNormalizedRightMiddle < 0.2f) &&
|
||||
(base._inputManager.fingerFullCurlNormalizedRightRing > 0.75f) && (base._inputManager.fingerFullCurlNormalizedRightPinky > 0.75f))
|
||||
{
|
||||
base._inputManager.gestureRightRaw = 5f;
|
||||
}
|
||||
|
||||
// Rock and Roll
|
||||
if((base._inputManager.fingerCurlRightIndex < 0.2f) && (base._inputManager.fingerCurlRightMiddle > 0.75f) &&
|
||||
(base._inputManager.fingerCurlRightRing > 0.75f) && (base._inputManager.fingerCurlRightPinky < 0.5f))
|
||||
if((base._inputManager.fingerFullCurlNormalizedRightIndex < 0.2f) && (base._inputManager.fingerFullCurlNormalizedRightMiddle > 0.75f) &&
|
||||
(base._inputManager.fingerFullCurlNormalizedRightRing > 0.75f) && (base._inputManager.fingerFullCurlNormalizedRightPinky < 0.5f))
|
||||
{
|
||||
base._inputManager.gestureRightRaw = 6f;
|
||||
}
|
||||
|
||||
// Fist & Thumbs Up
|
||||
if((base._inputManager.fingerCurlRightIndex > 0.5f) && (base._inputManager.fingerCurlRightMiddle > 0.5f) &&
|
||||
(base._inputManager.fingerCurlRightRing > 0.5f) && (base._inputManager.fingerCurlRightPinky > 0.5f))
|
||||
if((base._inputManager.fingerFullCurlNormalizedRightIndex > 0.5f) && (base._inputManager.fingerFullCurlNormalizedRightMiddle > 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
|
||||
if((base._inputManager.fingerCurlRightIndex < 0.2f) && (base._inputManager.fingerCurlRightMiddle < 0.2f) &&
|
||||
(base._inputManager.fingerCurlRightRing < 0.2f) && (base._inputManager.fingerCurlRightPinky < 0.2f))
|
||||
if((base._inputManager.fingerFullCurlNormalizedRightIndex < 0.2f) && (base._inputManager.fingerFullCurlNormalizedRightMiddle < 0.2f) &&
|
||||
(base._inputManager.fingerFullCurlNormalizedRightRing < 0.2f) && (base._inputManager.fingerFullCurlNormalizedRightPinky < 0.2f))
|
||||
{
|
||||
base._inputManager.gestureRightRaw = -1f;
|
||||
}
|
||||
|
|
@ -466,33 +466,71 @@ namespace ml_lme
|
|||
// Arbitrary
|
||||
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)
|
||||
{
|
||||
base._inputManager.fingerCurlLeftThumb = p_hand.m_bends[0];
|
||||
base._inputManager.fingerCurlLeftIndex = p_hand.m_bends[1];
|
||||
base._inputManager.fingerCurlLeftMiddle = p_hand.m_bends[2];
|
||||
base._inputManager.fingerCurlLeftRing = p_hand.m_bends[3];
|
||||
base._inputManager.fingerCurlLeftPinky = p_hand.m_bends[4];
|
||||
base._inputManager.fingerSpreadLeftThumb = 1f - (p_hand.m_spreads[0] * 0.5f + 0.5f);
|
||||
base._inputManager.fingerSpreadLeftIndex = 1f - (p_hand.m_spreads[1] * 0.5f + 0.5f);
|
||||
base._inputManager.fingerSpreadLeftMiddle = 1f - (p_hand.m_spreads[2] * 0.5f + 0.5f);
|
||||
base._inputManager.fingerSpreadLeftRing = 1f - (p_hand.m_spreads[3] * 0.5f + 0.5f);
|
||||
base._inputManager.fingerSpreadLeftPinky = 1f - (p_hand.m_spreads[4] * 0.5f + 0.5f);
|
||||
base._inputManager.finger1StretchedLeftThumb = LeapTracked.ms_lastLeftFingerBones[0];
|
||||
base._inputManager.finger2StretchedLeftThumb = LeapTracked.ms_lastLeftFingerBones[1];
|
||||
base._inputManager.finger3StretchedLeftThumb = LeapTracked.ms_lastLeftFingerBones[2];
|
||||
base._inputManager.fingerSpreadLeftThumb = LeapTracked.ms_lastLeftFingerBones[3];
|
||||
|
||||
base._inputManager.finger1StretchedLeftIndex = LeapTracked.ms_lastLeftFingerBones[4];
|
||||
base._inputManager.finger2StretchedLeftIndex = LeapTracked.ms_lastLeftFingerBones[5];
|
||||
base._inputManager.finger3StretchedLeftIndex = LeapTracked.ms_lastLeftFingerBones[6];
|
||||
base._inputManager.fingerSpreadLeftIndex = LeapTracked.ms_lastLeftFingerBones[7];
|
||||
|
||||
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
|
||||
{
|
||||
base._inputManager.fingerCurlRightThumb = p_hand.m_bends[0];
|
||||
base._inputManager.fingerCurlRightIndex = p_hand.m_bends[1];
|
||||
base._inputManager.fingerCurlRightMiddle = p_hand.m_bends[2];
|
||||
base._inputManager.fingerCurlRightRing = p_hand.m_bends[3];
|
||||
base._inputManager.fingerCurlRightPinky = p_hand.m_bends[4];
|
||||
base._inputManager.fingerSpreadRightThumb = 1f - (p_hand.m_spreads[0] * 0.5f + 0.5f);
|
||||
base._inputManager.fingerSpreadRightIndex = 1f - (p_hand.m_spreads[1] * 0.5f + 0.5f);
|
||||
base._inputManager.fingerSpreadRightMiddle = 1f - (p_hand.m_spreads[2] * 0.5f + 0.5f);
|
||||
base._inputManager.fingerSpreadRightRing = 1f - (p_hand.m_spreads[3] * 0.5f + 0.5f);
|
||||
base._inputManager.fingerSpreadRightPinky = 1f - (p_hand.m_spreads[4] * 0.5f + 0.5f);
|
||||
base._inputManager.finger1StretchedRightThumb = LeapTracked.ms_lastRightFingerBones[0];
|
||||
base._inputManager.finger2StretchedRightThumb = LeapTracked.ms_lastRightFingerBones[1];
|
||||
base._inputManager.finger3StretchedRightThumb = LeapTracked.ms_lastRightFingerBones[2];
|
||||
base._inputManager.fingerSpreadRightThumb = LeapTracked.ms_lastRightFingerBones[3];
|
||||
|
||||
base._inputManager.finger1StretchedRightIndex = LeapTracked.ms_lastRightFingerBones[4];
|
||||
base._inputManager.finger2StretchedRightIndex = LeapTracked.ms_lastRightFingerBones[5];
|
||||
base._inputManager.finger3StretchedRightIndex = LeapTracked.ms_lastRightFingerBones[6];
|
||||
base._inputManager.fingerSpreadRightIndex = LeapTracked.ms_lastRightFingerBones[7];
|
||||
|
||||
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)
|
||||
{
|
||||
base._inputManager.fingerCurlLeftThumb = 0f;
|
||||
base._inputManager.fingerCurlLeftIndex = 0f;
|
||||
base._inputManager.fingerCurlLeftMiddle = 0f;
|
||||
base._inputManager.fingerCurlLeftRing = 0f;
|
||||
base._inputManager.fingerCurlLeftPinky = 0f;
|
||||
base._inputManager.fingerSpreadLeftThumb = 0.5f;
|
||||
base._inputManager.fingerSpreadLeftIndex = 0.5f;
|
||||
base._inputManager.fingerSpreadLeftMiddle = 0.5f;
|
||||
base._inputManager.fingerSpreadLeftRing = 0.5f;
|
||||
base._inputManager.fingerSpreadLeftPinky = 0.5f;
|
||||
base._inputManager.finger1StretchedLeftThumb = -0.5f;
|
||||
base._inputManager.finger2StretchedLeftThumb = 0.7f;
|
||||
base._inputManager.finger3StretchedLeftThumb = 0.7f;
|
||||
base._inputManager.fingerSpreadLeftThumb = 0f;
|
||||
|
||||
base._inputManager.finger1StretchedLeftIndex = 0.5f;
|
||||
base._inputManager.finger2StretchedLeftIndex = 0.7f;
|
||||
base._inputManager.finger3StretchedLeftIndex = 0.7f;
|
||||
base._inputManager.fingerSpreadLeftIndex = 0f;
|
||||
|
||||
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
|
||||
{
|
||||
base._inputManager.fingerCurlRightThumb = 0f;
|
||||
base._inputManager.fingerCurlRightIndex = 0f;
|
||||
base._inputManager.fingerCurlRightMiddle = 0f;
|
||||
base._inputManager.fingerCurlRightRing = 0f;
|
||||
base._inputManager.fingerCurlRightPinky = 0f;
|
||||
base._inputManager.fingerSpreadRightThumb = 0.5f;
|
||||
base._inputManager.fingerSpreadRightIndex = 0.5f;
|
||||
base._inputManager.fingerSpreadRightMiddle = 0.5f;
|
||||
base._inputManager.fingerSpreadRightRing = 0.5f;
|
||||
base._inputManager.fingerSpreadRightPinky = 0.5f;
|
||||
base._inputManager.finger1StretchedRightThumb = -0.5f;
|
||||
base._inputManager.finger2StretchedRightThumb = 0.7f;
|
||||
base._inputManager.finger3StretchedRightThumb = 0.7f;
|
||||
base._inputManager.fingerSpreadRightThumb = 0f;
|
||||
|
||||
base._inputManager.finger1StretchedRightIndex = 0.5f;
|
||||
base._inputManager.finger2StretchedRightIndex = 0.7f;
|
||||
base._inputManager.finger3StretchedRightIndex = 0.7f;
|
||||
base._inputManager.fingerSpreadRightIndex = 0f;
|
||||
|
||||
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;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,11 +1,14 @@
|
|||
using ABI_RC.Core.Player;
|
||||
using ABI_RC.Systems.IK;
|
||||
using RootMotion.FinalIK;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
|
||||
namespace ml_lme
|
||||
{
|
||||
[DisallowMultipleComponent]
|
||||
[DefaultExecutionOrder(999999)]
|
||||
class LeapTracked : MonoBehaviour
|
||||
{
|
||||
struct IKInfo
|
||||
|
|
@ -18,17 +21,64 @@ namespace ml_lme
|
|||
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_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;
|
||||
VRIK m_vrIK = null;
|
||||
Transform m_hips = null;
|
||||
|
||||
bool m_enabled = true;
|
||||
bool m_fingersOnly = false;
|
||||
bool m_trackElbows = true;
|
||||
|
||||
Transform m_leftHand = null;
|
||||
Transform m_rightHand = null;
|
||||
IKInfo m_vrIKInfo;
|
||||
ArmIK m_leftArmIK = null;
|
||||
ArmIK m_rightArmIK = null;
|
||||
|
|
@ -39,18 +89,30 @@ namespace ml_lme
|
|||
bool m_leftTargetActive = 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
|
||||
void Start()
|
||||
{
|
||||
m_inVR = Utils.IsInVR();
|
||||
|
||||
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.localRotation = Quaternion.identity;
|
||||
|
||||
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.localRotation = Quaternion.identity;
|
||||
|
||||
|
|
@ -114,19 +176,47 @@ namespace ml_lme
|
|||
|
||||
void LateUpdate()
|
||||
{
|
||||
if(m_enabled && (m_vrIK == null) && (m_poseHandler != null))
|
||||
if(m_enabled && (m_poseHandler != null))
|
||||
{
|
||||
LeapParser.LeapData l_data = LeapManager.Instance.GetLatestData();
|
||||
|
||||
Vector3 l_hipsLocalPos = m_hips.localPosition;
|
||||
Quaternion l_hipsLocalRot = m_hips.localRotation;
|
||||
if(l_data.m_leftHand.m_present)
|
||||
{
|
||||
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);
|
||||
UpdateFingers(l_data);
|
||||
m_poseHandler.SetHumanPose(ref m_pose);
|
||||
|
||||
m_hips.localPosition = l_hipsLocalPos;
|
||||
m_hips.localRotation = l_hipsLocalRot;
|
||||
if(l_data.m_leftHand.m_present)
|
||||
{
|
||||
for(int i = 0; i < 5; i++)
|
||||
{
|
||||
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()
|
||||
{
|
||||
m_vrIK = null;
|
||||
m_hips = null;
|
||||
m_leftArmIK = null;
|
||||
m_rightArmIK = null;
|
||||
m_leftTargetActive = false;
|
||||
|
|
@ -147,6 +236,14 @@ namespace ml_lme
|
|||
m_leftHandTarget.localRotation = Quaternion.identity;
|
||||
m_rightHandTarget.localPosition = Vector3.zero;
|
||||
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()
|
||||
|
|
@ -156,27 +253,31 @@ namespace ml_lme
|
|||
|
||||
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.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);
|
||||
|
||||
Transform l_hand = PlayerSetup.Instance._animator.GetBoneTransform(HumanBodyBones.LeftHand);
|
||||
if(l_hand != null)
|
||||
m_leftHandTarget.localRotation = ms_offsetLeft * (PlayerSetup.Instance._avatar.transform.GetMatrix().inverse * l_hand.GetMatrix()).rotation;
|
||||
m_leftHand = PlayerSetup.Instance._animator.GetBoneTransform(HumanBodyBones.LeftHand);
|
||||
m_leftHandTarget.localRotation = ms_offsetLeft * (Quaternion.Inverse(PlayerSetup.Instance._avatar.transform.rotation) * m_leftHand.rotation);
|
||||
|
||||
l_hand = PlayerSetup.Instance._animator.GetBoneTransform(HumanBodyBones.RightHand);
|
||||
if(l_hand != null)
|
||||
m_rightHandTarget.localRotation = ms_offsetRight * (PlayerSetup.Instance._avatar.transform.GetMatrix().inverse * l_hand.GetMatrix()).rotation;
|
||||
m_rightHand = PlayerSetup.Instance._animator.GetBoneTransform(HumanBodyBones.RightHand);
|
||||
m_rightHandTarget.localRotation = ms_offsetRight * (Quaternion.Inverse(PlayerSetup.Instance._avatar.transform.rotation) * m_rightHand.rotation);
|
||||
|
||||
ParseFingersBones();
|
||||
|
||||
if(m_vrIK != null)
|
||||
{
|
||||
m_vrIK.onPreSolverUpdate.AddListener(this.OnIKPreUpdate);
|
||||
m_vrIK.onPostSolverUpdate.AddListener(this.OnIKPostUpdate);
|
||||
}
|
||||
else if(!m_inVR)
|
||||
else
|
||||
SetupArmIK();
|
||||
}
|
||||
}
|
||||
|
|
@ -195,7 +296,7 @@ namespace ml_lme
|
|||
m_vrIK.onPreSolverUpdate.AddListener(this.OnIKPreUpdate);
|
||||
m_vrIK.onPostSolverUpdate.AddListener(this.OnIKPostUpdate);
|
||||
}
|
||||
else if(!m_inVR)
|
||||
else
|
||||
{
|
||||
PoseHelper.ForceTPose(PlayerSetup.Instance._animator);
|
||||
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]);
|
||||
UpdatePoseMuscle(ref m_pose, (int)MuscleIndex.LeftThumb2Stretched, 0.7f - p_data.m_leftHand.m_bends[0] * 2f);
|
||||
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]);
|
||||
Transform l_transform = PlayerSetup.Instance._animator.GetBoneTransform(l_link.Item1);
|
||||
if(l_transform != null)
|
||||
{
|
||||
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]);
|
||||
UpdatePoseMuscle(ref m_pose, (int)MuscleIndex.LeftIndex2Stretched, 0.7f - p_data.m_leftHand.m_bends[1] * 2f);
|
||||
UpdatePoseMuscle(ref m_pose, (int)MuscleIndex.LeftIndex3Stretched, 0.7f - p_data.m_leftHand.m_bends[1] * 2f);
|
||||
UpdatePoseMuscle(ref m_pose, (int)MuscleIndex.LeftIndexSpread, p_data.m_leftHand.m_spreads[1]);
|
||||
|
||||
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(l_link.Item3)
|
||||
m_leftFingerBones.Add(l_info);
|
||||
else
|
||||
m_rightFingerBones.Add(l_info);
|
||||
}
|
||||
}
|
||||
|
||||
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;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -15,14 +15,12 @@ namespace ml_lme
|
|||
|
||||
bool m_inVR = false;
|
||||
|
||||
GameObject m_leapHandLeft = null;
|
||||
GameObject m_leapHandRight = null;
|
||||
GameObject m_leapHands = null;
|
||||
LeapHand m_leapHandLeft = null;
|
||||
LeapHand m_leapHandRight = null;
|
||||
GameObject m_leapElbowLeft = null;
|
||||
GameObject m_leapElbowRight = null;
|
||||
GameObject m_leapControllerModel = null;
|
||||
GameObject m_visualHands = null;
|
||||
VisualHand m_visualHandLeft = null;
|
||||
VisualHand m_visualHandRight = null;
|
||||
|
||||
float m_scaleRelation = 1f;
|
||||
|
||||
|
|
@ -33,16 +31,6 @@ namespace ml_lme
|
|||
|
||||
m_inVR = Utils.IsInVR();
|
||||
|
||||
m_leapHandLeft = new GameObject("LeapHandLeft");
|
||||
m_leapHandLeft.transform.parent = this.transform;
|
||||
m_leapHandLeft.transform.localPosition = Vector3.zero;
|
||||
m_leapHandLeft.transform.localRotation = Quaternion.identity;
|
||||
|
||||
m_leapHandRight = new GameObject("LeapHandRight");
|
||||
m_leapHandRight.transform.parent = this.transform;
|
||||
m_leapHandRight.transform.localPosition = Vector3.zero;
|
||||
m_leapHandRight.transform.localRotation = Quaternion.identity;
|
||||
|
||||
m_leapElbowLeft = new GameObject("LeapElbowLeft");
|
||||
m_leapElbowLeft.transform.parent = this.transform;
|
||||
m_leapElbowLeft.transform.localPosition = Vector3.zero;
|
||||
|
|
@ -62,16 +50,16 @@ namespace ml_lme
|
|||
m_leapControllerModel.transform.localRotation = Quaternion.identity;
|
||||
}
|
||||
|
||||
m_visualHands = AssetsHandler.GetAsset("assets/models/hands/leaphands.prefab");
|
||||
if(m_visualHands != null)
|
||||
m_leapHands = AssetsHandler.GetAsset("assets/models/leaphands/leaphands.prefab");
|
||||
if(m_leapHands != null)
|
||||
{
|
||||
m_visualHands.name = "VisualHands";
|
||||
m_visualHands.transform.parent = this.transform;
|
||||
m_visualHands.transform.localPosition = Vector3.zero;
|
||||
m_visualHands.transform.localRotation = Quaternion.identity;
|
||||
m_leapHands.name = "LeapHands";
|
||||
m_leapHands.transform.parent = this.transform;
|
||||
m_leapHands.transform.localPosition = Vector3.zero;
|
||||
m_leapHands.transform.localRotation = Quaternion.identity;
|
||||
|
||||
m_visualHandLeft = new VisualHand(m_visualHands.transform.Find("HandL"), true);
|
||||
m_visualHandRight = new VisualHand(m_visualHands.transform.Find("HandR"), false);
|
||||
m_leapHandLeft = new LeapHand(m_leapHands.transform.Find("HandL"), true);
|
||||
m_leapHandRight = new LeapHand(m_leapHands.transform.Find("HandR"), false);
|
||||
}
|
||||
|
||||
Settings.DesktopOffsetChange += this.OnDesktopOffsetChange;
|
||||
|
|
@ -106,12 +94,10 @@ namespace ml_lme
|
|||
if(Instance == this)
|
||||
Instance = null;
|
||||
|
||||
if(m_leapHandLeft != null)
|
||||
Object.Destroy(m_leapHandLeft);
|
||||
if(m_leapHands != null)
|
||||
Object.Destroy(m_leapHands);
|
||||
m_leapHands = null;
|
||||
m_leapHandLeft = null;
|
||||
|
||||
if(m_leapHandRight != null)
|
||||
Object.Destroy(m_leapHandRight);
|
||||
m_leapHandRight = null;
|
||||
|
||||
if(m_leapElbowLeft != null)
|
||||
|
|
@ -126,13 +112,6 @@ namespace ml_lme
|
|||
Object.Destroy(m_leapControllerModel);
|
||||
m_leapControllerModel = null;
|
||||
|
||||
if(m_visualHands != null)
|
||||
Object.Destroy(m_visualHands);
|
||||
m_visualHands = null;
|
||||
|
||||
m_visualHandLeft = null;
|
||||
m_visualHandRight = null;
|
||||
|
||||
Settings.DesktopOffsetChange -= this.OnDesktopOffsetChange;
|
||||
Settings.ModelVisibilityChange -= this.OnModelVisibilityChange;
|
||||
Settings.VisualHandsChange -= this.OnVisualHandsChange;
|
||||
|
|
@ -157,14 +136,13 @@ namespace ml_lme
|
|||
for(int i = 0; i < 20; i++)
|
||||
OrientationAdjustment(ref l_data.m_leftHand.m_fingerPosition[i], ref l_data.m_leftHand.m_fingerRotation[i], Settings.TrackingMode);
|
||||
|
||||
m_leapHandLeft.transform.localPosition = l_data.m_leftHand.m_position;
|
||||
m_leapHandLeft.transform.localRotation = l_data.m_leftHand.m_rotation;
|
||||
m_leapHandLeft.GetRoot().localPosition = l_data.m_leftHand.m_position;
|
||||
m_leapHandLeft.GetRoot().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;
|
||||
|
||||
if(Settings.VisualHands)
|
||||
m_visualHandLeft?.Update(l_data.m_leftHand);
|
||||
m_leapHandLeft?.Update(l_data.m_leftHand);
|
||||
}
|
||||
|
||||
if(l_data.m_rightHand.m_present)
|
||||
|
|
@ -173,20 +151,19 @@ namespace ml_lme
|
|||
for(int i = 0; i < 20; i++)
|
||||
OrientationAdjustment(ref l_data.m_rightHand.m_fingerPosition[i], ref l_data.m_rightHand.m_fingerRotation[i], Settings.TrackingMode);
|
||||
|
||||
m_leapHandRight.transform.localPosition = l_data.m_rightHand.m_position;
|
||||
m_leapHandRight.transform.localRotation = l_data.m_rightHand.m_rotation;
|
||||
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_rightHand.m_elbowPosition, ref ms_dummyRotation, Settings.TrackingMode);
|
||||
m_leapElbowRight.transform.localPosition = l_data.m_rightHand.m_elbowPosition;
|
||||
|
||||
if(Settings.VisualHands)
|
||||
m_visualHandRight?.Update(l_data.m_rightHand);
|
||||
m_leapHandRight?.Update(l_data.m_rightHand);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public Transform GetLeftHand() => m_leapHandLeft.transform;
|
||||
public Transform GetRightHand() => m_leapHandRight.transform;
|
||||
public LeapHand GetLeftHand() => m_leapHandLeft;
|
||||
public LeapHand GetRightHand() => m_leapHandRight;
|
||||
public Transform GetLeftElbow() => m_leapElbowLeft.transform;
|
||||
public Transform GetRightElbow() => m_leapElbowRight.transform;
|
||||
|
||||
|
|
@ -204,7 +181,8 @@ namespace ml_lme
|
|||
|
||||
void OnVisualHandsChange(bool p_state)
|
||||
{
|
||||
m_visualHands.SetActive(p_state);
|
||||
m_leapHandLeft?.SetMeshActive(p_state);
|
||||
m_leapHandRight?.SetMeshActive(p_state);
|
||||
}
|
||||
|
||||
void OnTrackingModeChange(Settings.LeapTrackingMode p_mode)
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -11,8 +11,8 @@
|
|||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
||||
<DebugType>none</DebugType>
|
||||
<DebugSymbols>false</DebugSymbols>
|
||||
<DebugType>embedded</DebugType>
|
||||
<DebugSymbols>true</DebugSymbols>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -84,26 +84,56 @@ namespace ml_pmc
|
|||
ref readonly float[] l_curls = ref m_puppetParser.GetFingerCurls();
|
||||
ref readonly float[] l_spreads = ref m_puppetParser.GetFingerSpreads();
|
||||
|
||||
CVRInputManager.Instance.fingerCurlLeftThumb = l_curls[l_mirror ? 5 : 0];
|
||||
CVRInputManager.Instance.fingerCurlLeftIndex = l_curls[l_mirror ? 6 : 1];
|
||||
CVRInputManager.Instance.fingerCurlLeftMiddle = l_curls[l_mirror ? 7 : 2];
|
||||
CVRInputManager.Instance.fingerCurlLeftRing = l_curls[l_mirror ? 8 : 3];
|
||||
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];
|
||||
|
||||
// Left hand
|
||||
CVRInputManager.Instance.finger1StretchedLeftThumb = l_curls[l_mirror ? 15 : 0];
|
||||
CVRInputManager.Instance.finger2StretchedLeftThumb = l_curls[l_mirror ? 16 : 1];
|
||||
CVRInputManager.Instance.finger3StretchedLeftThumb = l_curls[l_mirror ? 17 : 2];
|
||||
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.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.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.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];
|
||||
|
||||
// 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.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.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.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.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];
|
||||
}
|
||||
else
|
||||
|
|
@ -341,27 +371,69 @@ namespace ml_pmc
|
|||
|
||||
if(!CVRInputManager.Instance.individualFingerTracking)
|
||||
{
|
||||
CVRInputManager.Instance.fingerCurlLeftThumb = 0f;
|
||||
CVRInputManager.Instance.fingerCurlLeftIndex = 0f;
|
||||
CVRInputManager.Instance.fingerCurlLeftMiddle = 0f;
|
||||
CVRInputManager.Instance.fingerCurlLeftRing = 0f;
|
||||
CVRInputManager.Instance.fingerCurlLeftPinky = 0f;
|
||||
CVRInputManager.Instance.fingerCurlRightThumb = 0f;
|
||||
CVRInputManager.Instance.fingerCurlRightIndex = 0f;
|
||||
CVRInputManager.Instance.fingerCurlRightMiddle = 0f;
|
||||
CVRInputManager.Instance.fingerCurlRightRing = 0f;
|
||||
CVRInputManager.Instance.fingerCurlRightPinky = 0f;
|
||||
// Left hand
|
||||
CVRInputManager.Instance.finger1StretchedLeftThumb = -0.5f;
|
||||
CVRInputManager.Instance.finger2StretchedLeftThumb = 0.7f;
|
||||
CVRInputManager.Instance.finger3StretchedLeftThumb = 0.7f;
|
||||
CVRInputManager.Instance.fingerSpreadLeftThumb = 0f;
|
||||
|
||||
CVRInputManager.Instance.fingerSpreadLeftThumb = 0.5f;
|
||||
CVRInputManager.Instance.fingerSpreadLeftIndex = 0.5f;
|
||||
CVRInputManager.Instance.fingerSpreadLeftMiddle = 0.5f;
|
||||
CVRInputManager.Instance.fingerSpreadLeftRing = 0.5f;
|
||||
CVRInputManager.Instance.fingerSpreadLeftPinky = 0.5f;
|
||||
CVRInputManager.Instance.fingerSpreadRightThumb = 0.5f;
|
||||
CVRInputManager.Instance.fingerSpreadRightIndex = 0.5f;
|
||||
CVRInputManager.Instance.fingerSpreadRightMiddle = 0.5f;
|
||||
CVRInputManager.Instance.fingerSpreadRightRing = 0.5f;
|
||||
CVRInputManager.Instance.fingerSpreadRightPinky = 0.5f;
|
||||
CVRInputManager.Instance.finger1StretchedLeftIndex = 0.5f;
|
||||
CVRInputManager.Instance.finger2StretchedLeftIndex = 0.7f;
|
||||
CVRInputManager.Instance.finger3StretchedLeftIndex = 0.7f;
|
||||
CVRInputManager.Instance.fingerSpreadLeftIndex = 0f;
|
||||
|
||||
CVRInputManager.Instance.finger1StretchedLeftMiddle = 0.5f;
|
||||
CVRInputManager.Instance.finger2StretchedLeftMiddle = 0.7f;
|
||||
CVRInputManager.Instance.finger3StretchedLeftMiddle = 0.7f;
|
||||
CVRInputManager.Instance.fingerSpreadLeftMiddle = 0f;
|
||||
|
||||
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;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ namespace ml_pmc
|
|||
|
||||
internal PuppetParser()
|
||||
{
|
||||
m_fingerCurls = new float[10];
|
||||
m_fingerCurls = new float[30];
|
||||
m_fingerSpreads = new float[10];
|
||||
}
|
||||
|
||||
|
|
@ -58,29 +58,57 @@ namespace ml_pmc
|
|||
m_sitting = m_puppetMaster.PlayerAvatarMovementDataInput.AnimatorSitting;
|
||||
m_leftGesture = m_puppetMaster.PlayerAvatarMovementDataInput.AnimatorGestureLeft;
|
||||
m_rightGesture = m_puppetMaster.PlayerAvatarMovementDataInput.AnimatorGestureRight;
|
||||
m_fingerTracking = m_puppetMaster.PlayerAvatarMovementDataInput.IndexUseIndividualFingers;
|
||||
m_fingerTracking = m_puppetMaster.PlayerAvatarMovementDataInput.UseIndividualFingers;
|
||||
if(m_fingerTracking)
|
||||
{
|
||||
m_fingerCurls[0] = m_puppetMaster.PlayerAvatarMovementDataInput.LeftThumbCurl;
|
||||
m_fingerCurls[1] = m_puppetMaster.PlayerAvatarMovementDataInput.LeftIndexCurl;
|
||||
m_fingerCurls[2] = m_puppetMaster.PlayerAvatarMovementDataInput.LeftMiddleCurl;
|
||||
m_fingerCurls[3] = m_puppetMaster.PlayerAvatarMovementDataInput.LeftRingCurl;
|
||||
m_fingerCurls[4] = m_puppetMaster.PlayerAvatarMovementDataInput.LeftPinkyCurl;
|
||||
m_fingerCurls[5] = m_puppetMaster.PlayerAvatarMovementDataInput.RightThumbCurl;
|
||||
m_fingerCurls[6] = m_puppetMaster.PlayerAvatarMovementDataInput.RightIndexCurl;
|
||||
m_fingerCurls[7] = m_puppetMaster.PlayerAvatarMovementDataInput.RightMiddleCurl;
|
||||
m_fingerCurls[8] = m_puppetMaster.PlayerAvatarMovementDataInput.RightRingCurl;
|
||||
m_fingerCurls[9] = m_puppetMaster.PlayerAvatarMovementDataInput.RightPinkyCurl;
|
||||
|
||||
m_fingerCurls[0] = m_puppetMaster.PlayerAvatarMovementDataInput.LeftThumb1Stretched;
|
||||
m_fingerCurls[1] = m_puppetMaster.PlayerAvatarMovementDataInput.LeftThumb2Stretched;
|
||||
m_fingerCurls[2] = m_puppetMaster.PlayerAvatarMovementDataInput.LeftThumb3Stretched;
|
||||
m_fingerSpreads[0] = m_puppetMaster.PlayerAvatarMovementDataInput.LeftThumbSpread;
|
||||
|
||||
m_fingerCurls[3] = m_puppetMaster.PlayerAvatarMovementDataInput.LeftIndex1Stretched;
|
||||
m_fingerCurls[4] = m_puppetMaster.PlayerAvatarMovementDataInput.LeftIndex2Stretched;
|
||||
m_fingerCurls[5] = m_puppetMaster.PlayerAvatarMovementDataInput.LeftIndex3Stretched;
|
||||
m_fingerSpreads[1] = m_puppetMaster.PlayerAvatarMovementDataInput.LeftIndexSpread;
|
||||
|
||||
m_fingerCurls[6] = m_puppetMaster.PlayerAvatarMovementDataInput.LeftMiddle1Stretched;
|
||||
m_fingerCurls[7] = m_puppetMaster.PlayerAvatarMovementDataInput.LeftMiddle2Stretched;
|
||||
m_fingerCurls[8] = m_puppetMaster.PlayerAvatarMovementDataInput.LeftMiddle3Stretched;
|
||||
m_fingerSpreads[2] = m_puppetMaster.PlayerAvatarMovementDataInput.LeftMiddleSpread;
|
||||
|
||||
m_fingerCurls[9] = m_puppetMaster.PlayerAvatarMovementDataInput.LeftRing1Stretched;
|
||||
m_fingerCurls[10] = m_puppetMaster.PlayerAvatarMovementDataInput.LeftRing2Stretched;
|
||||
m_fingerCurls[11] = m_puppetMaster.PlayerAvatarMovementDataInput.LeftRing3Stretched;
|
||||
m_fingerSpreads[3] = m_puppetMaster.PlayerAvatarMovementDataInput.LeftRingSpread;
|
||||
|
||||
m_fingerCurls[12] = m_puppetMaster.PlayerAvatarMovementDataInput.LeftPinky1Stretched;
|
||||
m_fingerCurls[13] = m_puppetMaster.PlayerAvatarMovementDataInput.LeftPinky2Stretched;
|
||||
m_fingerCurls[14] = m_puppetMaster.PlayerAvatarMovementDataInput.LeftPinky3Stretched;
|
||||
m_fingerSpreads[4] = m_puppetMaster.PlayerAvatarMovementDataInput.LeftPinkySpread;
|
||||
|
||||
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;
|
||||
|
||||
m_fingerCurls[18] = m_puppetMaster.PlayerAvatarMovementDataInput.RightIndex1Stretched;
|
||||
m_fingerCurls[19] = m_puppetMaster.PlayerAvatarMovementDataInput.RightIndex2Stretched;
|
||||
m_fingerCurls[20] = m_puppetMaster.PlayerAvatarMovementDataInput.RightIndex3Stretched;
|
||||
m_fingerSpreads[6] = m_puppetMaster.PlayerAvatarMovementDataInput.RightIndexSpread;
|
||||
|
||||
m_fingerCurls[21] = m_puppetMaster.PlayerAvatarMovementDataInput.RightMiddle1Stretched;
|
||||
m_fingerCurls[22] = m_puppetMaster.PlayerAvatarMovementDataInput.RightMiddle2Stretched;
|
||||
m_fingerCurls[23] = m_puppetMaster.PlayerAvatarMovementDataInput.RightMiddle3Stretched;
|
||||
m_fingerSpreads[7] = m_puppetMaster.PlayerAvatarMovementDataInput.RightMiddleSpread;
|
||||
|
||||
m_fingerCurls[24] = m_puppetMaster.PlayerAvatarMovementDataInput.RightRing1Stretched;
|
||||
m_fingerCurls[25] = m_puppetMaster.PlayerAvatarMovementDataInput.RightRing2Stretched;
|
||||
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;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue