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

Fix entity popup error (#7500)

Browse Source
This commit is contained in:
Leon Friedrich
2022-04-11 21:42:52 +12:00
committed by GitHub
parent 646e03b7e5
commit 9833d25103
1 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
Content.Client/Popups/PopupSystem.cs
View File

@@ -19,6 +19,8 @@ namespace Content.Client.Popups
private readonly List<PopupLabel> _aliveLabels = new(); private readonly List<PopupLabel> _aliveLabels = new();
public const float PopupLifetime = 3f;
public override void Initialize() public override void Initialize()
{ {
SubscribeNetworkEvent<PopupCursorEvent>(OnPopupCursorEvent); SubscribeNetworkEvent<PopupCursorEvent>(OnPopupCursorEvent);
@@ -128,7 +130,7 @@ namespace Content.Client.Popups
{ {
foreach (var l in _aliveLabels) foreach (var l in _aliveLabels)
{ {
if (l.TimeLeft > 3f) if (l.TotalTime > PopupLifetime)
l.Dispose(); l.Dispose();
} }
@@ -140,7 +142,7 @@ namespace Content.Client.Popups
private readonly IEyeManager _eyeManager; private readonly IEyeManager _eyeManager;
private readonly IEntityManager _entityManager; private readonly IEntityManager _entityManager;
public float TimeLeft { get; private set; } public float TotalTime { get; private set; }
public Vector2 InitialPos { get; set; } public Vector2 InitialPos { get; set; }
public EntityUid? Entity { get; set; } public EntityUid? Entity { get; set; }
@@ -155,17 +157,26 @@ namespace Content.Client.Popups
protected override void FrameUpdate(FrameEventArgs eventArgs) protected override void FrameUpdate(FrameEventArgs eventArgs)
{ {
TimeLeft += eventArgs.DeltaSeconds; TotalTime += eventArgs.DeltaSeconds;
var position = Entity == null Vector2 position;
? InitialPos if (Entity == null)
: (_eyeManager.CoordinatesToScreen(_entityManager.GetComponent<TransformComponent>(Entity.Value).Coordinates).Position / UIScale) - DesiredSize / 2; position = InitialPos;
else if (_entityManager.TryGetComponent(Entity.Value, out TransformComponent xform))
LayoutContainer.SetPosition(this, position - (0, 20 * (TimeLeft * TimeLeft + TimeLeft))); position = (_eyeManager.CoordinatesToScreen(xform.Coordinates).Position / UIScale) - DesiredSize / 2;
else
if (TimeLeft > 0.5f)
{ {
Modulate = Color.White.WithAlpha(1f - 0.2f * (float)Math.Pow(TimeLeft - 0.5f, 3f)); // Entity has probably been deleted.
Visible = false;
TotalTime += PopupLifetime;
return;
}
LayoutContainer.SetPosition(this, position - (0, 20 * (TotalTime * TotalTime + TotalTime)));
if (TotalTime > 0.5f)
{
Modulate = Color.White.WithAlpha(1f - 0.2f * (float)Math.Pow(TotalTime - 0.5f, 3f));
} }
} }
} }