Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Improve Popup animation (#18721)

Browse Source 
* Cap and slow Popup Y-distance

* Make Popup lifetime a function of text length
This commit is contained in:
Vordenburg
2023-08-05 17:26:15 -04:00
committed by GitHub
parent dbd260af33
commit 42ed9dd550
2 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -35,7 +35,9 @@ namespace Content.Client.Popups
private readonly List<WorldPopupLabel> _aliveWorldLabels = new();
private readonly List<CursorPopupLabel> _aliveCursorLabels = new();
public const float PopupLifetime = 3f;
public const float MinimumPopupLifetime = 0.7f;
public const float MaximumPopupLifetime = 5f;
public const float PopupLifetimePerCharacter = 0.04f;
public override void Initialize()
{
@@ -185,6 +187,13 @@ namespace Content.Client.Popups
#endregion
public static float GetPopupLifetime(PopupLabel label)
{
return Math.Clamp(PopupLifetimePerCharacter * label.Text.Length,
MinimumPopupLifetime,
MaximumPopupLifetime);
}
public override void FrameUpdate(float frameTime)
{
if (_aliveWorldLabels.Count == 0 && _aliveCursorLabels.Count == 0)
@@ -195,7 +204,7 @@ namespace Content.Client.Popups
var label = _aliveWorldLabels[i];
label.TotalTime += frameTime;
if (label.TotalTime > PopupLifetime || Deleted(label.InitialPos.EntityId))
if (label.TotalTime > GetPopupLifetime(label) || Deleted(label.InitialPos.EntityId))
{
_aliveWorldLabels.RemoveSwap(i);
i--;
@@ -207,7 +216,7 @@ namespace Content.Client.Popups
var label = _aliveCursorLabels[i];
label.TotalTime += frameTime;
if (label.TotalTime > PopupLifetime)
if (label.TotalTime > GetPopupLifetime(label))
{
_aliveCursorLabels.RemoveSwap(i);
i--;