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

Fix speechbubbles outside of PVS appearing on top left corner of the screen (#5557)

Browse Source
This commit is contained in:
Clyybber
2021-11-26 23:50:24 +01:00
committed by GitHub
parent 61423be24e
commit 02ac863002
1 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
Content.Client/Chat/UI/SpeechBubble.cs
View File

@@ -88,19 +88,6 @@ namespace Content.Client.Chat.UI
_timeLeft -= args.DeltaSeconds; _timeLeft -= args.DeltaSeconds;
if (_timeLeft <= FadeTime)
{
// Update alpha if we're fading.
Modulate = Color.White.WithAlpha(_timeLeft / FadeTime);
}
if (_senderEntity.Deleted || _timeLeft <= 0)
{
// Timer spawn to prevent concurrent modification exception.
Timer.Spawn(0, Die);
return;
}
// Lerp to our new vertical offset if it's been modified. // Lerp to our new vertical offset if it's been modified.
if (MathHelper.CloseToPercent(_verticalOffsetAchieved - VerticalOffset, 0, 0.1)) if (MathHelper.CloseToPercent(_verticalOffsetAchieved - VerticalOffset, 0, 0.1))
{ {
@@ -112,7 +99,28 @@ namespace Content.Client.Chat.UI
} }
if (!_senderEntity.Transform.Coordinates.IsValid(_senderEntity.EntityManager)) if (!_senderEntity.Transform.Coordinates.IsValid(_senderEntity.EntityManager))
{
Modulate = Color.White.WithAlpha(0);
return; return;
}
if (_timeLeft <= FadeTime)
{
// Update alpha if we're fading.
Modulate = Color.White.WithAlpha(_timeLeft / FadeTime);
}
else
{
// Make opaque otherwise, because it might have been hidden before
Modulate = Color.White;
}
if (_senderEntity.Deleted || _timeLeft <= 0)
{
// Timer spawn to prevent concurrent modification exception.
Timer.Spawn(0, Die);
return;
}
var worldPos = _senderEntity.Transform.WorldPosition; var worldPos = _senderEntity.Transform.WorldPosition;
var scale = _eyeManager.MainViewport.GetRenderScale(); var scale = _eyeManager.MainViewport.GetRenderScale();