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

Slight status icons performance improvement. (#18076)

Browse Source
This commit is contained in:
Leon Friedrich
2023-07-17 20:22:35 +12:00
committed by GitHub
parent 10f5a5a17a
commit 8143b9d87a
3 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Content.Client/StatusIcon/StatusIconOverlay.cs
View File

@@ -35,19 +35,23 @@ public sealed class StatusIconOverlay : Overlay
var scaleMatrix = Matrix3.CreateScale(new Vector2(1, 1));
var rotationMatrix = Matrix3.CreateRotation(-eyeRot);
var query = _entity.AllEntityQueryEnumerator<StatusIconComponent, SpriteComponent, TransformComponent>();
while (query.MoveNext(out var uid, out var comp, out var sprite, out var xform))
var query = _entity.AllEntityQueryEnumerator<StatusIconComponent, SpriteComponent, TransformComponent, MetaDataComponent>();
while (query.MoveNext(out var uid, out var comp, out var sprite, out var xform, out var meta))
{
if (xform.MapID != args.MapId)
continue;
var icons = _statusIcon.GetStatusIcons(uid);
var icons = _statusIcon.GetStatusIcons(uid, meta);
if (icons.Count == 0)
continue;
var bounds = comp.Bounds ?? sprite.Bounds;
var worldPos = _transform.GetWorldPosition(xform, xformQuery);
if (!bounds.Translated(worldPos).Intersects(args.WorldAABB))
continue;
var worldMatrix = Matrix3.CreateTranslation(worldPos);
Matrix3.Multiply(scaleMatrix, worldMatrix, out var scaledWorld);
Matrix3.Multiply(rotationMatrix, scaledWorld, out var matty);

13
Content.Client/StatusIcon/StatusIconSystem.cs
View File

@@ -53,12 +53,17 @@ public sealed class StatusIconSystem : SharedStatusIconSystem
_overlay.AddOverlay(new StatusIconOverlay());
}
public List<StatusIconData> GetStatusIcons(EntityUid uid)
public List<StatusIconData> GetStatusIcons(EntityUid uid, MetaDataComponent? meta = null)
{
if (!Exists(uid) || Terminating(uid))
return new();
var list = new List<StatusIconData>();
if (!Resolve(uid, ref meta))
return list;
var ev = new GetStatusIconsEvent(new());
if (meta.EntityLifeStage >= EntityLifeStage.Terminating)
return list;
var inContainer = (meta.Flags & MetaDataFlags.InContainer) != 0;
var ev = new GetStatusIconsEvent(list, inContainer);
RaiseLocalEvent(uid, ref ev);
return ev.StatusIcons;
}

2
Content.Shared/StatusIcon/Components/StatusIconComponent.cs
View File

@@ -24,4 +24,4 @@ public sealed partial class StatusIconComponent : Component
/// </summary>
/// <param name="StatusIcons"></param>
[ByRefEvent]
public record struct GetStatusIconsEvent(List<StatusIconData> StatusIcons);
public record struct GetStatusIconsEvent(List<StatusIconData> StatusIcons, bool InContainer);