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

Fixes for 24/06/2025 nightly build

Browse source
This commit is contained in:
SDraw 2025-06-24 21:45:18 +03:00
parent 0902edd560
commit 40b683d33c
No known key found for this signature in database
GPG key ID: BB95B4DAB2BB8BB5
18 changed files with 93 additions and 86 deletions
Download patch file Download diff file Expand all files Collapse all files

24
ml_pam/ArmMover.cs
View file

@ -68,7 +68,7 @@ namespace ml_pam
void Start()
{
m_camera = PlayerSetup.Instance.GetActiveCamera().transform;
m_camera = PlayerSetup.Instance.activeCam.transform;
m_root = new GameObject("Root").transform;
m_root.parent = this.transform;
@ -353,14 +353,14 @@ namespace ml_pam
void OnAvatarSetup()
{
m_camera = PlayerSetup.Instance.GetActiveCamera().transform;
m_camera = PlayerSetup.Instance.activeCam.transform;
if(PlayerSetup.Instance._animator.isHuman)
if(PlayerSetup.Instance.Animator.isHuman)
{
m_vrIK = PlayerSetup.Instance._animator.GetComponent<VRIK>();
m_vrIK = PlayerSetup.Instance.Animator.GetComponent<VRIK>();
Utils.SetAvatarTPose();
Animator l_animator = PlayerSetup.Instance._animator;
Animator l_animator = PlayerSetup.Instance.Animator;
Matrix4x4 l_avatarMatrixInv = l_animator.transform.GetMatrix().inverse; // Animator and avatar are on same game object
Transform l_leftHand = l_animator.GetBoneTransform(HumanBodyBones.LeftHand);
@ -395,8 +395,8 @@ namespace ml_pam
}
}
m_leftHandParameter = new AvatarBoolParameter("LeftHandExtended", PlayerSetup.Instance.animatorManager);
m_rightHandParameter = new AvatarBoolParameter("RightHandExtended", PlayerSetup.Instance.animatorManager);
m_leftHandParameter = new AvatarBoolParameter("LeftHandExtended", PlayerSetup.Instance.AnimatorManager);
m_rightHandParameter = new AvatarBoolParameter("RightHandExtended", PlayerSetup.Instance.AnimatorManager);
OnEnabledChanged(Settings.Enabled);
OnGrabOffsetChanged(Settings.GrabOffset);
@ -406,7 +406,7 @@ namespace ml_pam
void OnAvatarReuse()
{
// Old VRIK is destroyed by game
m_vrIK = PlayerSetup.Instance._animator.GetComponent<VRIK>();
m_vrIK = PlayerSetup.Instance.Animator.GetComponent<VRIK>();
if(Utils.IsInVR())
RemoveArmIK();
@ -470,7 +470,7 @@ namespace ml_pam
{
try
{
m_camera = PlayerSetup.Instance.GetActiveCamera().transform;
m_camera = PlayerSetup.Instance.activeCam.transform;
this.enabled = !Utils.IsInVR();
}
catch(System.Exception e)
@ -482,7 +482,7 @@ namespace ml_pam
// Arbitrary
void SetupArmIK()
{
Animator l_animator = PlayerSetup.Instance._animator;
Animator l_animator = PlayerSetup.Instance.Animator;
Transform l_chest = l_animator.GetBoneTransform(HumanBodyBones.UpperChest);
if(l_chest == null)
@ -490,7 +490,7 @@ namespace ml_pam
if(l_chest == null)
l_chest = l_animator.GetBoneTransform(HumanBodyBones.Spine);
m_armIKLeft = PlayerSetup.Instance._avatar.AddComponent<ArmIK>();
m_armIKLeft = PlayerSetup.Instance.AvatarObject.AddComponent<ArmIK>();
m_armIKLeft.solver.isLeft = true;
m_armIKLeft.solver.SetChain(
l_chest,
@ -507,7 +507,7 @@ namespace ml_pam
m_armIKLeft.solver.IKRotationWeight = 0f;
m_armIKLeft.enabled = false;
m_armIKRight = PlayerSetup.Instance._avatar.AddComponent<ArmIK>();
m_armIKRight = PlayerSetup.Instance.AvatarObject.AddComponent<ArmIK>();
m_armIKRight.solver.isLeft = false;
m_armIKRight.solver.SetChain(
l_chest,

4
ml_pam/Utils.cs
View file

@ -18,8 +18,8 @@ namespace ml_pam
public static void SetAvatarTPose()
{
IKSystem.Instance.SetAvatarPose(IKSystem.AvatarPose.TPose);
PlayerSetup.Instance._avatar.transform.localPosition = Vector3.zero;
PlayerSetup.Instance._avatar.transform.localRotation = Quaternion.identity;
PlayerSetup.Instance.AvatarTransform.localPosition = Vector3.zero;
PlayerSetup.Instance.AvatarTransform.localRotation = Quaternion.identity;
}
// Extensions