Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed Jumping into wall adds excessive speed bug #503

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fixed Jumping into wall adds excessive speed bug #503

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 21 additions & 28 deletions UOP1_Project/Assets/Scripts/Characters/StateMachine/Actions/AerialMovementActionSO.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,49 +33,42 @@ public override void Awake(StateMachine stateMachine)
public override void OnUpdate()
{
Vector3 velocity = _protagonist.movementVector;
Vector3 input = _protagonist.movementInput;
float speed = OriginSO.Speed;
Vector2 horizontalInput = new Vector2(_protagonist.movementInput.x, _protagonist.movementInput.z);
float acceleration = OriginSO.Acceleration;
float speed = OriginSO.Speed;

SetVelocityPerAxis(ref velocity.x, input.x, acceleration, speed);
SetVelocityPerAxis(ref velocity.z, input.z, acceleration, speed);
Vector2 horizontalVelocity = new Vector2(velocity.x, velocity.z);
SetHorizontalVelocity(ref horizontalVelocity, horizontalInput, acceleration, speed);
velocity.x = horizontalVelocity.x;
velocity.z = horizontalVelocity.y;

_protagonist.movementVector = velocity;
}

private void SetVelocityPerAxis(ref float currentAxisSpeed, float axisInput, float acceleration, float targetSpeed)
private void SetHorizontalVelocity(ref Vector2 horizontalVelocity, Vector2 horizontalInput, float acceleration, float targetSpeed)
{
if (axisInput == 0f)
float inputMagnitude = horizontalInput.magnitude;
if (Mathf.Approximately(inputMagnitude, 0f))
{
if (currentAxisSpeed != 0f)
{
ApplyAirResistance(ref currentAxisSpeed);
}
ApplyAirResistance(ref horizontalVelocity);
}
else
{
(float absVel, float absInput) = (Mathf.Abs(currentAxisSpeed), Mathf.Abs(axisInput));
(float signVel, float signInput) = (Mathf.Sign(currentAxisSpeed), Mathf.Sign(axisInput));
targetSpeed *= absInput;
targetSpeed *= inputMagnitude;

if (signVel != signInput || absVel < targetSpeed)
{
currentAxisSpeed += axisInput * acceleration;
currentAxisSpeed = Mathf.Clamp(currentAxisSpeed, -targetSpeed, targetSpeed);
}
else
{
ApplyAirResistance(ref currentAxisSpeed);
}
horizontalVelocity += horizontalInput * acceleration;

// Apply a speed limit
float horizontalSpeed = horizontalVelocity.magnitude;
if (targetSpeed < horizontalSpeed)
horizontalVelocity = horizontalVelocity / horizontalSpeed * targetSpeed;
}
}

private void ApplyAirResistance(ref float value)
private void ApplyAirResistance(ref Vector2 vector)
{
float sign = Mathf.Sign(value);

value -= sign * Protagonist.AIR_RESISTANCE * Time.deltaTime;
if (Mathf.Sign(value) != sign)
value = 0;
if (Mathf.Approximately(vector.sqrMagnitude, 0))
return;
vector -= vector.normalized * Protagonist.AIR_RESISTANCE * Time.deltaTime;
}
}