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

Minor fixes

Browse source
This commit is contained in:
SDraw 2023-08-09 22:32:55 +03:00
parent a5d93643fa
commit bb94c3f038
No known key found for this signature in database
GPG key ID: BB95B4DAB2BB8BB5
6 changed files with 28 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ml_amt/Main.cs
View file

@ -55,12 +55,6 @@ namespace ml_amt
yield return null; yield return null;
m_localTweaker = PlayerSetup.Instance.gameObject.AddComponent<MotionTweaker>(); m_localTweaker = PlayerSetup.Instance.gameObject.AddComponent<MotionTweaker>();
m_localTweaker.SetCrouchLimit(Settings.CrouchLimit);
m_localTweaker.SetProneLimit(Settings.ProneLimit);
m_localTweaker.SetIKOverrideFly(Settings.IKOverrideFly);
m_localTweaker.SetIKOverrideJump(Settings.IKOverrideJump);
m_localTweaker.SetDetectEmotes(Settings.DetectEmotes);
m_localTweaker.SetFollowHips(Settings.FollowHips);
} }
public override void OnDeinitializeMelon() public override void OnDeinitializeMelon()

22
ml_amt/MotionTweaker.cs
View file

@ -62,6 +62,13 @@ namespace ml_amt
{ {
m_inVR = Utils.IsInVR(); m_inVR = Utils.IsInVR();
SetCrouchLimit(Settings.CrouchLimit);
SetProneLimit(Settings.ProneLimit);
SetIKOverrideFly(Settings.IKOverrideFly);
SetIKOverrideJump(Settings.IKOverrideJump);
SetDetectEmotes(Settings.DetectEmotes);
SetFollowHips(Settings.FollowHips);
Settings.CrouchLimitChange += this.SetCrouchLimit; Settings.CrouchLimitChange += this.SetCrouchLimit;
Settings.ProneLimitChange += this.SetProneLimit; Settings.ProneLimitChange += this.SetProneLimit;
Settings.IKOverrideFlyChange += this.SetIKOverrideFly; Settings.IKOverrideFlyChange += this.SetIKOverrideFly;
@ -69,9 +76,6 @@ namespace ml_amt
Settings.DetectEmotesChange += this.SetDetectEmotes; Settings.DetectEmotesChange += this.SetDetectEmotes;
Settings.FollowHipsChange += this.SetFollowHips; Settings.FollowHipsChange += this.SetFollowHips;
Settings.MassCenterChange += this.OnMassCenterChange; Settings.MassCenterChange += this.OnMassCenterChange;
SetCrouchLimit(Settings.CrouchLimit);
SetProneLimit(Settings.ProneLimit);
} }
void OnDestroy() void OnDestroy()
@ -135,8 +139,8 @@ namespace ml_amt
m_ikLimits = null; m_ikLimits = null;
m_parameters.Clear(); m_parameters.Clear();
PlayerSetup.Instance.avatarCrouchLimit = Mathf.Max(Mathf.Clamp01(Settings.CrouchLimit), Mathf.Clamp01(Settings.CrouchLimit)); PlayerSetup.Instance.avatarCrouchLimit = Mathf.Clamp01(Settings.CrouchLimit);
PlayerSetup.Instance.avatarProneLimit = Mathf.Min(Mathf.Clamp01(Settings.CrouchLimit), Mathf.Clamp01(Settings.CrouchLimit)); PlayerSetup.Instance.avatarProneLimit = Mathf.Clamp01(Settings.ProneLimit);
} }
internal void OnSetupAvatar() internal void OnSetupAvatar()
@ -288,12 +292,12 @@ namespace ml_amt
internal void SetCrouchLimit(float p_value) internal void SetCrouchLimit(float p_value)
{ {
if(m_ikLimits == null) if(m_ikLimits == null)
PlayerSetup.Instance.avatarCrouchLimit = Mathf.Max(Mathf.Clamp01(p_value), PlayerSetup.Instance.avatarProneLimit); PlayerSetup.Instance.avatarCrouchLimit = Mathf.Clamp01(p_value);
} }
internal void SetProneLimit(float p_value) internal void SetProneLimit(float p_value)
{ {
if(m_ikLimits == null) if(m_ikLimits == null)
PlayerSetup.Instance.avatarProneLimit = Mathf.Min(Mathf.Clamp01(p_value), PlayerSetup.Instance.avatarCrouchLimit); PlayerSetup.Instance.avatarProneLimit = Mathf.Clamp01(p_value);
} }
internal void SetIKOverrideFly(bool p_state) internal void SetIKOverrideFly(bool p_state)
{ {
@ -328,8 +332,8 @@ namespace ml_amt
if(m_ikLimits != null) if(m_ikLimits != null)
{ {
Vector3 l_values = m_ikLimits.localPosition; Vector3 l_values = m_ikLimits.localPosition;
PlayerSetup.Instance.avatarCrouchLimit = Mathf.Max(Mathf.Clamp01(l_values.x), Mathf.Clamp01(l_values.y)); PlayerSetup.Instance.avatarCrouchLimit = Mathf.Clamp01(l_values.x);
PlayerSetup.Instance.avatarProneLimit = Mathf.Min(Mathf.Clamp01(l_values.x), Mathf.Clamp01(l_values.y)); PlayerSetup.Instance.avatarProneLimit = Mathf.Clamp01(l_values.y);
} }
} }

2
ml_amt/Properties/AssemblyInfo.cs
View file

@ -1,4 +1,4 @@
[assembly: MelonLoader.MelonInfo(typeof(ml_amt.AvatarMotionTweaker), "AvatarMotionTweaker", "1.2.9", "SDraw", "https://github.com/SDraw/ml_mods_cvr")] [assembly: MelonLoader.MelonInfo(typeof(ml_amt.AvatarMotionTweaker), "AvatarMotionTweaker", "1.3.0", "SDraw", "https://github.com/SDraw/ml_mods_cvr")]
[assembly: MelonLoader.MelonGame(null, "ChilloutVR")] [assembly: MelonLoader.MelonGame(null, "ChilloutVR")]
[assembly: MelonLoader.MelonOptionalDependencies("ml_prm", "ml_pmc")] [assembly: MelonLoader.MelonOptionalDependencies("ml_prm", "ml_pmc")]
[assembly: MelonLoader.MelonPlatform(MelonLoader.MelonPlatformAttribute.CompatiblePlatforms.WINDOWS_X64)] [assembly: MelonLoader.MelonPlatform(MelonLoader.MelonPlatformAttribute.CompatiblePlatforms.WINDOWS_X64)]

2
ml_amt/Settings.cs
View file

@ -55,8 +55,8 @@ namespace ml_amt
ms_category.CreateEntry(ModSetting.IKOverrideJump.ToString(), IKOverrideJump), ms_category.CreateEntry(ModSetting.IKOverrideJump.ToString(), IKOverrideJump),
ms_category.CreateEntry(ModSetting.DetectEmotes.ToString(), DetectEmotes), ms_category.CreateEntry(ModSetting.DetectEmotes.ToString(), DetectEmotes),
ms_category.CreateEntry(ModSetting.FollowHips.ToString(), FollowHips), ms_category.CreateEntry(ModSetting.FollowHips.ToString(), FollowHips),
ms_category.CreateEntry(ModSetting.MassCenter.ToString(), MassCenter),
ms_category.CreateEntry(ModSetting.ScaledJump.ToString(), ScaledJump), ms_category.CreateEntry(ModSetting.ScaledJump.ToString(), ScaledJump),
ms_category.CreateEntry(ModSetting.MassCenter.ToString(), MassCenter),
ms_category.CreateEntry(ModSetting.OverrideFix.ToString(), OverrideFix) ms_category.CreateEntry(ModSetting.OverrideFix.ToString(), OverrideFix)
}; };

2
ml_amt/ml_amt.csproj
View file

@ -6,7 +6,7 @@
<Company>None</Company> <Company>None</Company>
<Product>AvatarMotionTweaker</Product> <Product>AvatarMotionTweaker</Product>
<PackageId>AvatarMotionTweaker</PackageId> <PackageId>AvatarMotionTweaker</PackageId>
<Version>1.2.9</Version> <Version>1.3.0</Version>
<Platforms>x64</Platforms> <Platforms>x64</Platforms>
<AssemblyName>ml_amt</AssemblyName> <AssemblyName>ml_amt</AssemblyName>
</PropertyGroup> </PropertyGroup>

20
ml_pmc/PoseCopycat.cs
View file

@ -159,6 +159,14 @@ namespace ml_pmc
// Patches // Patches
internal void OnAvatarClear() internal void OnAvatarClear()
{ {
if(m_active)
{
RestoreIK();
RestoreFingerTracking();
OnActivityChange?.Invoke(false);
}
m_active = false;
m_inVr = Utils.IsInVR(); m_inVr = Utils.IsInVR();
if(m_puppetParser != null) if(m_puppetParser != null)
@ -172,10 +180,6 @@ namespace ml_pmc
m_poseHandler?.Dispose(); m_poseHandler?.Dispose();
m_poseHandler = null; m_poseHandler = null;
if(m_active)
OnActivityChange?.Invoke(false);
m_active = false;
m_distanceLimit = float.MaxValue; m_distanceLimit = float.MaxValue;
m_fingerTracking = false; m_fingerTracking = false;
m_pose = new HumanPose(); m_pose = new HumanPose();
@ -283,16 +287,16 @@ namespace ml_pmc
void OverrideIK() void OverrideIK()
{ {
if((m_vrIk != null) && !BodySystem.isCalibrating) if(!BodySystem.isCalibrating)
BodySystem.TrackingPositionWeight = 0f; BodySystem.TrackingPositionWeight = 0f;
} }
void RestoreIK() void RestoreIK()
{ {
if((m_vrIk != null) && !BodySystem.isCalibrating) if(!BodySystem.isCalibrating)
{
BodySystem.TrackingPositionWeight = 1f; BodySystem.TrackingPositionWeight = 1f;
if(m_vrIk != null)
m_vrIk.solver.Reset(); m_vrIk.solver.Reset();
}
} }
void RestoreFingerTracking() void RestoreFingerTracking()
{ {