Mirrors/SanAndreasUnity
2
0
Fork 0
mirror of https://github.com/GTA-ASM/SanAndreasUnity synced 2024-11-22 20:13:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

smooth out switching between aim movement states

Browse source
This commit is contained in:
in0finite 2021-12-26 23:16:14 +01:00
parent 6037568f0a
commit abac2b54f5
3 changed files with 31 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
Assets/Scripts/Behaviours/Ped/States/BaseAimMovementState.cs
View file

@ -23,6 +23,10 @@ namespace SanAndreasUnity.Behaviours.Peds.States
protected bool m_wasAimingBackWithAWAWeapon = false;
protected float m_timeSinceAimingBackWithAWAWeapon = 0f;
public virtual float TimeUntilStateCanBeSwitchedToOtherAimMovementState => PedManager.Instance.timeUntilAimMovementStateCanBeSwitchedToOtherAimMovementState;
public virtual float TimeUntilStateCanBeEnteredFromOtherAimMovementState => PedManager.Instance.timeUntilAimMovementStateCanBeEnteredFromOtherAimMovementState;
public override void OnBecameActive()
@ -108,10 +112,30 @@ namespace SanAndreasUnity.Behaviours.Peds.States
protected virtual bool SwitchToOtherAimMovementState ()
{
BaseAimMovementState.SwitchToAimMovementStateBasedOnInput (m_ped);
System.Type type = GetAimMovementStateToSwitchToBasedOnInput(m_ped);
var state = (BaseAimMovementState)m_ped.GetStateOrLogError(type);
if (!EnoughTimePassedToSwitchBetweenAimMovementStates(this, state))
return false;
m_ped.SwitchState(type);
return ! this.IsActiveState;
}
public static bool EnoughTimePassedToSwitchBetweenAimMovementStates(
BaseAimMovementState currentState,
BaseAimMovementState targetState)
{
if (currentState.TimeSinceActivated < currentState.TimeUntilStateCanBeSwitchedToOtherAimMovementState)
return false;
if (targetState.TimeSinceDeactivated < targetState.TimeUntilStateCanBeEnteredFromOtherAimMovementState)
return false;
return true;
}
protected virtual bool SwitchToFallingState ()
{
return false;

2
Assets/Scripts/Behaviours/Ped/States/StandAimState.cs
View file

@ -9,6 +9,8 @@ namespace SanAndreasUnity.Behaviours.Peds.States
{
public override AnimId aimWithArm_LowerAnim { get { return m_ped.CurrentWeapon.IdleAnim; } }
public override float TimeUntilStateCanBeSwitchedToOtherAimMovementState => 0f;
public override void OnBecameActive ()
{

2
Assets/Scripts/Behaviours/PedManager.cs
View file

@ -24,6 +24,8 @@ namespace SanAndreasUnity.Behaviours
public float minTimeToReturnToNonAimStateFromAimState = 0.33f;
public float timeUntilMovementStateCanBeSwitchedToOtherMovementState = 0.166f;
public float timeUntilMovementStateCanBeEnteredFromOtherMovementState = 0.166f;
public float timeUntilAimMovementStateCanBeSwitchedToOtherAimMovementState = 0.166f;
public float timeUntilAimMovementStateCanBeEnteredFromOtherAimMovementState = 0.166f;
[Header("Camera")]