Fix eye zoom lerp (#19377)

This commit is contained in:
metalgearsloth
2023-08-25 14:41:04 +10:00
committed by GitHub
parent a8bac1f91f
commit 1ba517ec84
5 changed files with 57 additions and 61 deletions

View File

@@ -4,11 +4,9 @@ using Content.Shared.Administration.Managers;
using Content.Shared.Ghost;
using Content.Shared.Input;
using Content.Shared.Movement.Components;
using Robust.Shared.Input;
using Robust.Shared.Input.Binding;
using Robust.Shared.Players;
using Robust.Shared.Serialization;
using Robust.Shared.Serialization.TypeSerializers.Implementations.Generic;
namespace Content.Shared.Movement.Systems;
@@ -78,7 +76,7 @@ public abstract class SharedContentEyeSystem : EntitySystem
return;
eye.TargetZoom = ignoreLimits ? zoom : Clamp(zoom, eye);
Dirty(eye);
Dirty(uid, eye);
}
private void OnContentZoomRequest(RequestTargetZoomEvent msg, EntitySessionEventArgs args)
@@ -100,7 +98,7 @@ public abstract class SharedContentEyeSystem : EntitySystem
if (TryComp<SharedEyeComponent>(player, out var eyeComp))
{
eyeComp.DrawFov = msg.Fov;
Dirty(eyeComp);
Dirty(player, eyeComp);
}
}
@@ -110,24 +108,7 @@ public abstract class SharedContentEyeSystem : EntitySystem
return;
component.TargetZoom = eyeComp.Zoom;
Dirty(component);
}
protected void UpdateEye(EntityUid uid, ContentEyeComponent content, SharedEyeComponent eye, float frameTime)
{
var diff = content.TargetZoom - eye.Zoom;
if (diff.LengthSquared() < 0.00001f)
{
eye.Zoom = content.TargetZoom;
Dirty(eye);
return;
}
var change = diff * 8f * frameTime;
eye.Zoom += change;
Dirty(eye);
Dirty(uid, component);
}
public void ResetZoom(EntityUid uid, ContentEyeComponent? component = null)
@@ -142,7 +123,7 @@ public abstract class SharedContentEyeSystem : EntitySystem
component.MaxZoom = value;
component.TargetZoom = Clamp(component.TargetZoom, component);
Dirty(component);
Dirty(uid, component);
}
/// <summary>