juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix popups not working properly with an eye offset (#30990)

Browse Source
This commit is contained in:
DrSmugleaf
2024-08-14 06:38:36 -07:00
committed by GitHub
parent 07451eb92b
commit 1fb03e9074
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Content.Client/Popups/PopupOverlay.cs
View File

@@ -74,8 +74,14 @@ public sealed class PopupOverlay : Overlay
return;
var matrix = args.ViewportControl.GetWorldToScreenMatrix();
var viewPos = new MapCoordinates(args.WorldAABB.Center, args.MapId);
var ourEntity = _playerMgr.LocalEntity;
var viewPos = new MapCoordinates(args.WorldAABB.Center, args.MapId);
var ourPos = args.WorldBounds.Center;
if (ourEntity != null)
{
viewPos = _transform.GetMapCoordinates(ourEntity.Value);
ourPos = viewPos.Position;
}
foreach (var popup in _popup.WorldLabels)
{
@@ -84,7 +90,7 @@ public sealed class PopupOverlay : Overlay
if (mapPos.MapId != args.MapId)
continue;
var distance = (mapPos.Position - args.WorldBounds.Center).Length();
var distance = (mapPos.Position - ourPos).Length();
// Should handle fade here too wyci.
if (!args.WorldBounds.Contains(mapPos.Position) || !_examine.InRangeUnOccluded(viewPos, mapPos, distance,