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

Fix camera recoil system overriding all other eye offsets (#29146)

Browse Source
This commit is contained in:
DrSmugleaf
2024-07-02 19:51:16 -07:00
committed by GitHub
parent ae4cff4982
commit c6d718d126
3 changed files with 59 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
Content.Shared/Camera/SharedCameraRecoilSystem.cs
View File

@@ -1,6 +1,7 @@
using System.Numerics;
using Content.Shared.Movement.Systems;
using JetBrains.Annotations;
using Robust.Shared.Player;
using Robust.Shared.Network;
using Robust.Shared.Serialization;
namespace Content.Shared.Camera;
@@ -28,7 +29,18 @@ public abstract class SharedCameraRecoilSystem : EntitySystem
/// </summary>
protected const float KickMagnitudeMax = 1f;
[Dependency] private readonly SharedEyeSystem _eye = default!;
[Dependency] private readonly SharedContentEyeSystem _eye = default!;
[Dependency] private readonly INetManager _net = default!;
public override void Initialize()
{
SubscribeLocalEvent<CameraRecoilComponent, GetEyeOffsetEvent>(OnCameraRecoilGetEyeOffset);
}
private void OnCameraRecoilGetEyeOffset(Entity<CameraRecoilComponent> ent, ref GetEyeOffsetEvent args)
{
args.Offset += ent.Comp.BaseOffset + ent.Comp.CurrentKick;
}
/// <summary>
/// Applies explosion/recoil/etc kickback to the view of the entity.
@@ -39,10 +51,8 @@ public abstract class SharedCameraRecoilSystem : EntitySystem
/// </remarks>
public abstract void KickCamera(EntityUid euid, Vector2 kickback, CameraRecoilComponent? component = null);
public override void FrameUpdate(float frameTime)
private void UpdateEyes(float frameTime)
{
base.FrameUpdate(frameTime);
var query = AllEntityQuery<EyeComponent, CameraRecoilComponent>();
while (query.MoveNext(out var uid, out var eye, out var recoil))
@@ -51,7 +61,7 @@ public abstract class SharedCameraRecoilSystem : EntitySystem
if (magnitude <= 0.005f)
{
recoil.CurrentKick = Vector2.Zero;
_eye.SetOffset(uid, recoil.BaseOffset + recoil.CurrentKick, eye);
_eye.UpdateEyeOffset((uid, eye));
}
else // Continually restore camera to 0.
{
@@ -60,16 +70,28 @@ public abstract class SharedCameraRecoilSystem : EntitySystem
var restoreRate = MathHelper.Lerp(RestoreRateMin, RestoreRateMax, Math.Min(1, recoil.LastKickTime / RestoreRateRamp));
var restore = normalized * restoreRate * frameTime;
var (x, y) = recoil.CurrentKick - restore;
if (Math.Sign(x) != Math.Sign(recoil.CurrentKick.X)) x = 0;
if (Math.Sign(x) != Math.Sign(recoil.CurrentKick.X))
x = 0;
if (Math.Sign(y) != Math.Sign(recoil.CurrentKick.Y)) y = 0;
if (Math.Sign(y) != Math.Sign(recoil.CurrentKick.Y))
y = 0;
recoil.CurrentKick = new Vector2(x, y);
_eye.SetOffset(uid, recoil.BaseOffset + recoil.CurrentKick, eye);
_eye.UpdateEyeOffset((uid, eye));
}
}
}
public override void Update(float frameTime)
{
if (_net.IsServer)
UpdateEyes(frameTime);
}
public override void FrameUpdate(float frameTime)
{
UpdateEyes(frameTime);
}
}
[Serializable]