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

Content update for ECS physics (#13291)

Browse Source
This commit is contained in:
metalgearsloth
2023-01-15 15:38:59 +11:00
committed by GitHub
parent 46d24bc36b
commit bf79d76666
61 changed files with 431 additions and 379 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -68,7 +68,8 @@ namespace Content.Client.Suspicion
}
_overlayActive = true;
var overlay = new TraitorOverlay(IoCManager.Resolve<IEntityManager>(), IoCManager.Resolve<IPlayerManager>(), _resourceCache);
var entManager = IoCManager.Resolve<IEntityManager>();
var overlay = new TraitorOverlay(entManager, IoCManager.Resolve<IPlayerManager>(), _resourceCache, entManager.System<EntityLookupSystem>());
_overlayManager.AddOverlay(overlay);
}

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

@@ -17,6 +17,7 @@ namespace Content.Client.Suspicion
{
private readonly IEntityManager _entityManager;
private readonly IPlayerManager _playerManager;
private readonly EntityLookupSystem _lookup;
public override OverlaySpace Space => OverlaySpace.ScreenSpace;
private readonly Font _font;
@@ -26,11 +27,12 @@ namespace Content.Client.Suspicion
public TraitorOverlay(
IEntityManager entityManager,
IPlayerManager playerManager,
IResourceCache resourceCache)
IResourceCache resourceCache,
EntityLookupSystem lookup)
{
_playerManager = playerManager;
_entityManager = entityManager;
_lookup = lookup;
_font = new VectorFont(resourceCache.GetResource<FontResource>("/Fonts/NotoSans/NotoSans-Regular.ttf"), 10);
}
@@ -77,7 +79,7 @@ namespace Content.Client.Suspicion
var (allyWorldPos, allyWorldRot) = allyXform.GetWorldPositionRotation();
var worldBox = physics.GetWorldAABB(allyWorldPos, allyWorldRot);
var worldBox = _lookup.GetWorldAABB(ally, allyXform);
// if not on screen, or too small, continue
if (!worldBox.Intersects(in viewport) || worldBox.IsEmpty())