kneesox/sdraw_mods_cvr
1
0
Fork 0
mirror of https://github.com/hanetzer/sdraw_mods_cvr.git synced 2025-09-05 03:19:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Preserve crouch and prone

Browse source 
Code simplification and possible pose copying fix
Reworked finger tracking
This commit is contained in:
SDraw 2023-08-05 21:58:29 +03:00
parent 4608f9f7bf
commit 1efcb8aaee
No known key found for this signature in database
GPG key ID: BB95B4DAB2BB8BB5
19 changed files with 194 additions and 206 deletions
Download patch file Download diff file Expand all files Collapse all files

104
ml_pmc/PuppetParser.cs
View file

@ -6,18 +6,12 @@ namespace ml_pmc
[DisallowMultipleComponent]
class PuppetParser : MonoBehaviour
{
static readonly Vector4 ms_pointVector = new Vector4(0f, 0f, 0f, 1f);
PuppetMaster m_puppetMaster = null;
internal PuppetMaster m_puppetMaster = null;
Animator m_animator = null;
AnimatorCullingMode m_cullMode;
float m_armatureScale = 1f;
float m_armatureHeight = 0f;
bool m_waitAnimator = true;
HumanPoseHandler m_poseHandler = null;
HumanPose m_pose;
bool m_poseParsed = false;
Matrix4x4 m_matrix = Matrix4x4.identity;
Matrix4x4 m_offset = Matrix4x4.identity;
@ -27,26 +21,34 @@ namespace ml_pmc
float m_rightGesture = 0f;
bool m_fingerTracking = false;
float[] m_fingerCurls = null;
float[] m_fingerSpreads = null;
internal PuppetParser()
{
m_fingerCurls = new float[10];
m_fingerSpreads = new float[10];
}
// Unity events
void Start()
{
m_puppetMaster = this.GetComponent<PuppetMaster>();
m_animator = this.GetComponent<Animator>();
m_cullMode = m_animator.cullingMode;
m_animator.cullingMode = AnimatorCullingMode.AlwaysAnimate;
m_poseHandler = new HumanPoseHandler(m_animator.avatar, m_animator.transform);
m_poseHandler.GetHumanPose(ref m_pose);
m_matrix = this.transform.GetMatrix();
StartCoroutine(WaitForAnimator());
}
void OnDestroy()
{
m_puppetMaster = null;
if(m_animator != null)
m_animator.cullingMode = m_cullMode;
m_animator = null;
m_poseHandler?.Dispose();
m_poseHandler = null;
}
void Update()
@ -69,88 +71,38 @@ namespace ml_pmc
m_fingerCurls[7] = m_puppetMaster.PlayerAvatarMovementDataInput.RightMiddleCurl;
m_fingerCurls[8] = m_puppetMaster.PlayerAvatarMovementDataInput.RightRingCurl;
m_fingerCurls[9] = m_puppetMaster.PlayerAvatarMovementDataInput.RightPinkyCurl;
}
}
if(!ReferenceEquals(m_animator, null))
{
if(m_animator != null)
{
Matrix4x4 l_current = this.transform.GetMatrix();
m_offset = m_matrix.inverse * l_current;
m_matrix = l_current;
m_fingerSpreads[0] = m_puppetMaster.PlayerAvatarMovementDataInput.LeftThumbSpread;
m_fingerSpreads[1] = m_puppetMaster.PlayerAvatarMovementDataInput.LeftIndexSpread;
m_fingerSpreads[2] = m_puppetMaster.PlayerAvatarMovementDataInput.LeftMiddleSpread;
m_fingerSpreads[3] = m_puppetMaster.PlayerAvatarMovementDataInput.LeftRingSpread;
m_fingerSpreads[4] = m_puppetMaster.PlayerAvatarMovementDataInput.LeftPinkySpread;
m_fingerSpreads[5] = m_puppetMaster.PlayerAvatarMovementDataInput.RightThumbSpread;
m_fingerSpreads[6] = m_puppetMaster.PlayerAvatarMovementDataInput.RightIndexSpread;
m_fingerSpreads[7] = m_puppetMaster.PlayerAvatarMovementDataInput.RightMiddleSpread;
m_fingerSpreads[8] = m_puppetMaster.PlayerAvatarMovementDataInput.RightRingSpread;
m_fingerSpreads[9] = m_puppetMaster.PlayerAvatarMovementDataInput.RightPinkySpread;
}
else
Reset();
Matrix4x4 l_current = this.transform.GetMatrix();
m_offset = m_matrix.inverse * l_current;
m_matrix = l_current;
}
}
void LateUpdate()
{
if(m_animator != null)
{
if((m_animator != null) && (m_poseHandler != null))
m_poseHandler.GetHumanPose(ref m_pose);
m_pose.bodyPosition *= m_armatureScale;
m_pose.bodyPosition.y += m_armatureHeight;
m_poseParsed = true;
}
}
// Arbitrary
System.Collections.IEnumerator WaitForAnimator()
{
while(m_puppetMaster.avatarObject == null)
yield return null;
while(m_animator == null)
{
m_animator = m_puppetMaster.avatarObject.GetComponent<Animator>();
yield return null;
}
if(m_animator.isHuman)
{
m_cullMode = m_animator.cullingMode;
m_animator.cullingMode = AnimatorCullingMode.AlwaysAnimate;
Transform l_hips = m_animator.GetBoneTransform(HumanBodyBones.Hips);
if((l_hips != null) && (l_hips.parent != null))
{
m_armatureScale = l_hips.parent.localScale.y;
m_armatureHeight = ((m_puppetMaster.transform.GetMatrix().inverse * l_hips.parent.GetMatrix()) * ms_pointVector).y;
}
m_poseHandler = new HumanPoseHandler(m_animator.avatar, m_animator.transform);
m_matrix = this.transform.GetMatrix();
}
else
Reset();
m_waitAnimator = false;
}
void Reset()
{
m_animator = null;
m_poseHandler?.Dispose();
m_poseHandler = null;
m_pose = new HumanPose();
m_poseParsed = false;
m_offset = Matrix4x4.identity;
m_sitting = false;
m_leftGesture = 0f;
m_rightGesture = 0f;
}
public bool IsWaitingAnimator() => m_waitAnimator;
public bool HasAnimator() => !ReferenceEquals(m_animator, null);
public ref HumanPose GetPose() => ref m_pose;
public bool IsPoseParsed() => m_poseParsed;
public ref Matrix4x4 GetOffset() => ref m_offset;
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 float[] GetFingerCurls() => ref m_fingerCurls;
public ref float[] GetFingerSpreads() => ref m_fingerSpreads;
}
}