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

Eye lerping tweaks (#11162)

Browse Source
This commit is contained in:
metalgearsloth
2022-09-11 07:51:41 +10:00
committed by GitHub
parent 029af42c2b
commit 06c9afeaa1
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Client/Eye/EyeLerpingSystem.cs
View File

@@ -159,7 +159,7 @@ public sealed class EyeLerpingSystem : EntitySystem
public override void FrameUpdate(float frameTime) public override void FrameUpdate(float frameTime)
{ {
var tickFraction = (float) _gameTiming.TickFraction / ushort.MaxValue; var tickFraction = (float) _gameTiming.TickFraction / ushort.MaxValue;
var lerpMinimum = 0.01; const double lerpMinimum = 0.00001;
foreach (var (eye, entity) in GetEyes()) foreach (var (eye, entity) in GetEyes())
{ {

6
Content.Shared/Movement/Systems/SharedMoverController.cs
View File

@@ -165,11 +165,11 @@ namespace Content.Shared.Movement.Systems
if (!angleDiff.EqualsApprox(Angle.Zero, 0.001)) if (!angleDiff.EqualsApprox(Angle.Zero, 0.001))
{ {
var adjustment = angleDiff * 5f * frameTime; var adjustment = angleDiff * 5f * frameTime;
var minAdjustment = 0.005 * frameTime; var minAdjustment = 0.01 * frameTime;
if (angleDiff < 0) if (angleDiff < 0)
{ {
adjustment = Math.Min(adjustment, minAdjustment); adjustment = Math.Min(adjustment, -minAdjustment);
adjustment = Math.Clamp(adjustment, angleDiff, -angleDiff); adjustment = Math.Clamp(adjustment, angleDiff, -angleDiff);
} }
else else
@@ -179,10 +179,12 @@ namespace Content.Shared.Movement.Systems
} }
mover.RelativeRotation += adjustment; mover.RelativeRotation += adjustment;
mover.RelativeRotation.FlipPositive();
Dirty(mover); Dirty(mover);
} }
else if (!angleDiff.Equals(Angle.Zero)) else if (!angleDiff.Equals(Angle.Zero))
{ {
mover.TargetRelativeRotation.FlipPositive();
mover.RelativeRotation = mover.TargetRelativeRotation; mover.RelativeRotation = mover.TargetRelativeRotation;
Dirty(mover); Dirty(mover);
} }