From 06c9afeaa14615af43420e01f1a1a5d06732ed27 Mon Sep 17 00:00:00 2001 From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Date: Sun, 11 Sep 2022 07:51:41 +1000 Subject: [PATCH] Eye lerping tweaks (#11162) --- Content.Client/Eye/EyeLerpingSystem.cs | 2 +- Content.Shared/Movement/Systems/SharedMoverController.cs | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Content.Client/Eye/EyeLerpingSystem.cs b/Content.Client/Eye/EyeLerpingSystem.cs index 57b2ffff7c..837f923ec8 100644 --- a/Content.Client/Eye/EyeLerpingSystem.cs +++ b/Content.Client/Eye/EyeLerpingSystem.cs @@ -159,7 +159,7 @@ public sealed class EyeLerpingSystem : EntitySystem public override void FrameUpdate(float frameTime) { var tickFraction = (float) _gameTiming.TickFraction / ushort.MaxValue; - var lerpMinimum = 0.01; + const double lerpMinimum = 0.00001; foreach (var (eye, entity) in GetEyes()) { diff --git a/Content.Shared/Movement/Systems/SharedMoverController.cs b/Content.Shared/Movement/Systems/SharedMoverController.cs index 5a90dd7632..9b9c2836ff 100644 --- a/Content.Shared/Movement/Systems/SharedMoverController.cs +++ b/Content.Shared/Movement/Systems/SharedMoverController.cs @@ -165,11 +165,11 @@ namespace Content.Shared.Movement.Systems if (!angleDiff.EqualsApprox(Angle.Zero, 0.001)) { var adjustment = angleDiff * 5f * frameTime; - var minAdjustment = 0.005 * frameTime; + var minAdjustment = 0.01 * frameTime; if (angleDiff < 0) { - adjustment = Math.Min(adjustment, minAdjustment); + adjustment = Math.Min(adjustment, -minAdjustment); adjustment = Math.Clamp(adjustment, angleDiff, -angleDiff); } else @@ -179,10 +179,12 @@ namespace Content.Shared.Movement.Systems } mover.RelativeRotation += adjustment; + mover.RelativeRotation.FlipPositive(); Dirty(mover); } else if (!angleDiff.Equals(Angle.Zero)) { + mover.TargetRelativeRotation.FlipPositive(); mover.RelativeRotation = mover.TargetRelativeRotation; Dirty(mover); }