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

Overlays: Avoid using IEyeManager whenever possible (#5709)

Browse Source
This commit is contained in:
E F R
2021-12-10 05:47:21 +00:00
committed by GitHub
parent b3a4e3f557
commit 8bd386dcb0
13 changed files with 39 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
Content.Client/Administration/AdminNameOverlay.cs
View File

@@ -11,15 +11,13 @@ namespace Content.Client.Administration
{
private readonly AdminSystem _system;
private readonly IEntityManager _entityManager;
private readonly IEyeManager _eyeManager;
private readonly IEntityLookup _entityLookup;
private readonly Font _font;
public AdminNameOverlay(AdminSystem system, IEntityManager entityManager, IEyeManager eyeManager, IResourceCache resourceCache, IEntityLookup entityLookup)
public AdminNameOverlay(AdminSystem system, IEntityManager entityManager, IResourceCache resourceCache, IEntityLookup entityLookup)
{
_system = system;
_entityManager = entityManager;
_eyeManager = eyeManager;
_entityLookup = entityLookup;
ZIndex = 200;
_font = new VectorFont(resourceCache.GetResource<FontResource>("/Fonts/NotoSans/NotoSans-Regular.ttf"), 10);
@@ -29,7 +27,7 @@ namespace Content.Client.Administration
protected override void Draw(in OverlayDrawArgs args)
{
var viewport = _eyeManager.GetWorldViewport();
var viewport = args.WorldAABB;
foreach (var playerInfo in _system.PlayerList)
{
@@ -41,7 +39,10 @@ namespace Content.Client.Administration
}
// if not on the same map, continue
if (IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(entity).MapID != _eyeManager.CurrentMap)
if (IoCManager
.Resolve<IEntityManager>()
.GetComponent<TransformComponent>(entity)
.MapID != args.Viewport.Eye!.Position.MapId)
{
continue;
}
@@ -55,9 +56,15 @@ namespace Content.Client.Administration
}
var lineoffset = new Vector2(0f, 11f);
var screenCoordinates = _eyeManager.WorldToScreen(aabb.Center +
new Angle(-_eyeManager.CurrentEye.Rotation).RotateVec(
aabb.TopRight - aabb.Center)) + new Vector2(1f, 7f);
var screenCoordinates = args
.ViewportControl!
.WorldToScreen(
aabb.Center +
new Angle(-args.Viewport.Eye!.Rotation)
.RotateVec(aabb.TopRight - aabb.Center)
)
+ new Vector2(1f, 7f);
if (playerInfo.Antag)
{
args.ScreenHandle.DrawString(_font, screenCoordinates + (lineoffset * 2), "ANTAG", Color.OrangeRed);

1
Content.Client/Administration/AdminSystem.Menu.cs
View File

@@ -23,7 +23,6 @@ namespace Content.Client.Administration
[Dependency] private readonly IClientAdminManager _clientAdminManager = default!;
[Dependency] private readonly IClientConGroupController _clientConGroupController = default!;
[Dependency] private readonly IOverlayManager _overlayManager = default!;
[Dependency] private readonly IEyeManager _eyeManager = default!;
[Dependency] private readonly IResourceCache _resourceCache = default!;
[Dependency] private readonly IEntityManager _entityManager = default!;
[Dependency] private readonly IEntityLookup _entityLookup = default!;

2
Content.Client/Administration/AdminSystem.Overlay.cs
View File

@@ -11,7 +11,7 @@ namespace Content.Client.Administration
private void InitializeOverlay()
{
_adminNameOverlay = new AdminNameOverlay(this, _entityManager, _eyeManager, _resourceCache, _entityLookup);
_adminNameOverlay = new AdminNameOverlay(this, _entityManager, _resourceCache, _entityLookup);
_adminManager.AdminStatusUpdated += OnAdminStatusUpdated;
}