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

Avoid unnecessary parent worldrot resolve for kinematic movement

Browse Source
This commit is contained in:
metalgearsloth
2021-11-13 14:40:27 +11:00
parent 8673c22931
commit 96aa70e304
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -68,17 +68,18 @@ namespace Content.Shared.Movement
var (walkDir, sprintDir) = mover.VelocityDir; var (walkDir, sprintDir) = mover.VelocityDir;
var transform = mover.Owner.Transform; var transform = mover.Owner.Transform;
var parentRotation = transform.Parent!.WorldRotation;
// Regular movement. // Regular movement.
// Target velocity. // Target velocity.
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 worldTotal = _relativeMovement ? parentRotation.RotateVec(total) : total;
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)
transform.WorldRotation = worldTotal.GetDir().ToAngle(); transform.WorldRotation = worldTotal.GetDir().ToAngle();