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

Move Eye Lerping to content and fix/improve it a bunch. (#5900)

Browse Source
This commit is contained in:
Vera Aguilera Puerto
2021-12-27 18:50:00 +01:00
committed by GitHub
parent b0bdc0336e
commit 525c38b794
4 changed files with 142 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,6 +5,7 @@ using Content.Shared.Friction;
using Content.Shared.MobState.Components;
using Content.Shared.Movement.Components;
using Content.Shared.Pulling.Components;
using JetBrains.Annotations;
using Robust.Shared.Configuration;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
@@ -60,6 +61,14 @@ namespace Content.Shared.Movement
UsedMobMovement.Clear();
}
protected Angle GetParentGridAngle(TransformComponent xform, IMoverComponent mover)
{
if (xform.GridID == GridId.Invalid || !_mapManager.TryGetGrid(xform.GridID, out var grid))
return mover.LastGridAngle;
return grid.WorldRotation;
}
/// <summary>
/// A generic kinematic mover for entities.
/// </summary>
@@ -68,7 +77,7 @@ namespace Content.Shared.Movement
var (walkDir, sprintDir) = mover.VelocityDir;
var transform = EntityManager.GetComponent<TransformComponent>(mover.Owner);
var parentRotation = transform.Parent!.WorldRotation;
var parentRotation = GetParentGridAngle(transform, mover);
// Regular movement.
// Target velocity.
@@ -118,7 +127,7 @@ namespace Content.Shared.Movement
if (!touching)
{
if (transform.GridID != GridId.Invalid)
mover.LastGridAngle = transform.Parent!.WorldRotation;
mover.LastGridAngle = GetParentGridAngle(transform, mover);
transform.WorldRotation = physicsComponent.LinearVelocity.GetDir().ToAngle();
return;
@@ -130,7 +139,7 @@ namespace Content.Shared.Movement
// This is relative to the map / grid we're on.
var total = walkDir * mover.CurrentWalkSpeed + sprintDir * mover.CurrentSprintSpeed;
var parentRotation = transform.Parent!.WorldRotation;
var parentRotation = GetParentGridAngle(transform, mover);
var worldTotal = _relativeMovement ? parentRotation.RotateVec(total) : total;