tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Avoid unnecessary WorldRotation in mover code

Browse Source
This commit is contained in:
metalgearsloth
2021-11-13 14:14:19 +11:00
parent f7a40c8a2f
commit 6cb05f48d6
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Content.Shared/Movement/SharedMoverController.cs
View File

@@ -118,6 +118,7 @@ namespace Content.Shared.Movement
{ {
if (transform.GridID != GridId.Invalid) if (transform.GridID != GridId.Invalid)
mover.LastGridAngle = transform.Parent!.WorldRotation; mover.LastGridAngle = transform.Parent!.WorldRotation;
transform.WorldRotation = physicsComponent.LinearVelocity.GetDir().ToAngle(); transform.WorldRotation = physicsComponent.LinearVelocity.GetDir().ToAngle();
return; return;
} }
@@ -128,7 +129,9 @@ namespace Content.Shared.Movement
// This is relative to the map / grid we're on. // This is relative to the map / grid we're on.
var total = walkDir * mover.CurrentWalkSpeed + sprintDir * mover.CurrentSprintSpeed; var total = walkDir * mover.CurrentWalkSpeed + sprintDir * mover.CurrentSprintSpeed;
var worldTotal = _relativeMovement ? transform.Parent!.WorldRotation.RotateVec(total) : total; var parentRotation = transform.Parent!.WorldRotation;
var worldTotal = _relativeMovement ? parentRotation.RotateVec(total) : total;
DebugTools.Assert(MathHelper.CloseToPercent(total.Length, worldTotal.Length)); DebugTools.Assert(MathHelper.CloseToPercent(total.Length, worldTotal.Length));
@@ -138,7 +141,7 @@ namespace Content.Shared.Movement
if (transform.GridID == GridId.Invalid) if (transform.GridID == GridId.Invalid)
worldTotal = mover.LastGridAngle.RotateVec(worldTotal); worldTotal = mover.LastGridAngle.RotateVec(worldTotal);
else else
mover.LastGridAngle = transform.Parent!.WorldRotation; mover.LastGridAngle = parentRotation;
if (worldTotal != Vector2.Zero) if (worldTotal != Vector2.Zero)
{ {