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

overlay cleanup

Browse Source
This commit is contained in:
metalgearsloth
2021-12-10 16:51:06 +11:00
parent 8bd386dcb0
commit cb1266c2fb
3 changed files with 21 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

3
Content.Client/Suspicion/SuspicionRoleComponent.cs
View File

@@ -3,6 +3,7 @@ using Content.Client.HUD;
using Content.Shared.Suspicion; using Content.Shared.Suspicion;
using Robust.Client.GameObjects; using Robust.Client.GameObjects;
using Robust.Client.Graphics; using Robust.Client.Graphics;
using Robust.Client.Player;
using Robust.Client.ResourceManagement; using Robust.Client.ResourceManagement;
using Robust.Shared.GameObjects; using Robust.Shared.GameObjects;
using Robust.Shared.IoC; using Robust.Shared.IoC;
@@ -71,7 +72,7 @@ namespace Content.Client.Suspicion
} }
_overlayActive = true; _overlayActive = true;
var overlay = new TraitorOverlay(IoCManager.Resolve<IEntityManager>(), _resourceCache); var overlay = new TraitorOverlay(IoCManager.Resolve<IEntityManager>(), IoCManager.Resolve<IPlayerManager>(), _resourceCache);
_overlayManager.AddOverlay(overlay); _overlayManager.AddOverlay(overlay);
} }

19
Content.Client/Suspicion/TraitorOverlay.cs
View File

@@ -24,9 +24,10 @@ namespace Content.Client.Suspicion
public TraitorOverlay( public TraitorOverlay(
IEntityManager entityManager, IEntityManager entityManager,
IPlayerManager playerManager,
IResourceCache resourceCache) IResourceCache resourceCache)
{ {
_playerManager = IoCManager.Resolve<IPlayerManager>(); _playerManager = playerManager;
_entityManager = entityManager; _entityManager = entityManager;
@@ -56,8 +57,10 @@ namespace Content.Client.Suspicion
continue; continue;
} }
var allyXform = _entityManager.GetComponent<TransformComponent>(ally);
var entPosition = _entityManager.GetComponent<TransformComponent>(ent.Value).MapPosition; var entPosition = _entityManager.GetComponent<TransformComponent>(ent.Value).MapPosition;
var allyPosition = _entityManager.GetComponent<TransformComponent>(ally).MapPosition; var allyPosition = allyXform.MapPosition;
if (!ExamineSystemShared.InRangeUnOccluded(entPosition, allyPosition, 15, if (!ExamineSystemShared.InRangeUnOccluded(entPosition, allyPosition, 15,
entity => entity == ent || entity == ally)) entity => entity == ent || entity == ally))
{ {
@@ -65,15 +68,15 @@ namespace Content.Client.Suspicion
} }
// if not on the same map, continue // if not on the same map, continue
if (_entityManager if (allyXform.MapID != args.Viewport.Eye!.Position.MapId
.GetComponent<TransformComponent>(physics.Owner) || physics.Owner.IsInContainer())
.MapID != args.Viewport.Eye!.Position.MapId
|| physics.Owner.IsInContainer())
{ {
continue; continue;
} }
var worldBox = physics.GetWorldAABB(); var (allyWorldPos, allyWorldRot) = allyXform.GetWorldPositionRotation();
var worldBox = physics.GetWorldAABB(allyWorldPos, allyWorldRot);
// if not on screen, or too small, continue // if not on screen, or too small, continue
if (!worldBox.Intersects(in viewport) || worldBox.IsEmpty()) if (!worldBox.Intersects(in viewport) || worldBox.IsEmpty())
@@ -81,7 +84,7 @@ namespace Content.Client.Suspicion
continue; continue;
} }
var screenCoordinates = args.ViewportControl!.WorldToScreen(physics.GetWorldAABB().TopLeft + (0, 0.5f)); var screenCoordinates = args.ViewportControl!.WorldToScreen(worldBox.TopLeft + (0, 0.5f));
args.ScreenHandle.DrawString(_font, screenCoordinates, _traitorText, Color.OrangeRed); args.ScreenHandle.DrawString(_font, screenCoordinates, _traitorText, Color.OrangeRed);
} }
} }