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

Remove most usages of obsolete TransformComponent methods (#19571)

Browse Source
This commit is contained in:
Visne
2023-08-30 04:05:19 +02:00
committed by GitHub
parent 3ba60835ec
commit 1416942bea
91 changed files with 312 additions and 221 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Client/Atmos/Overlays/AtmosDebugOverlay.cs
View File

@@ -17,6 +17,7 @@ namespace Content.Client.Atmos.Overlays
[Dependency] private readonly IEntityManager _entManager = default!;
[Dependency] private readonly IMapManager _mapManager = default!;
private readonly SharedTransformSystem _transform;
public override OverlaySpace Space => OverlaySpace.WorldSpace;
@@ -25,6 +26,7 @@ namespace Content.Client.Atmos.Overlays
IoCManager.InjectDependencies(this);
_atmosDebugOverlaySystem = system;
_transform = _entManager.System<SharedTransformSystem>();
}
protected override void Draw(in OverlayDrawArgs args)
@@ -47,7 +49,7 @@ namespace Content.Client.Atmos.Overlays
!_entManager.TryGetComponent<TransformComponent>(mapGrid.Owner, out var xform))
continue;
drawHandle.SetTransform(xform.WorldMatrix);
drawHandle.SetTransform(_transform.GetWorldMatrix(xform));
for (var pass = 0; pass < 2; pass++)
{

6
Content.Client/Atmos/Overlays/GasTileOverlay.cs
View File

@@ -19,6 +19,7 @@ namespace Content.Client.Atmos.Overlays
public sealed class GasTileOverlay : Overlay
{
private readonly IEntityManager _entManager;
private readonly SharedTransformSystem _transform;
private readonly IMapManager _mapManager;
public override OverlaySpace Space => OverlaySpace.WorldSpaceEntities;
@@ -48,6 +49,7 @@ namespace Content.Client.Atmos.Overlays
public GasTileOverlay(GasTileOverlaySystem system, IEntityManager entManager, IResourceCache resourceCache, IPrototypeManager protoMan, SpriteSystem spriteSys)
{
_entManager = entManager;
_transform = entManager.System<SharedTransformSystem>();
_mapManager = IoCManager.Resolve<IMapManager>();
_shader = protoMan.Index<ShaderPrototype>("unshaded").Instance();
ZIndex = GasOverlayZIndex;
@@ -182,7 +184,7 @@ namespace Content.Client.Atmos.Overlays
// TODO: WorldBounds callback.
_mapManager.FindGridsIntersecting(args.MapId, args.WorldAABB, ref gridState,
static (EntityUid uid, MapGridComponent grid,
(EntityUid uid, MapGridComponent grid,
ref (Box2Rotated WorldBounds,
DrawingHandleWorld drawHandle,
int gasCount,
@@ -200,7 +202,7 @@ namespace Content.Client.Atmos.Overlays
return true;
}
var (_, _, worldMatrix, invMatrix) = gridXform.GetWorldPositionRotationMatrixWithInv();
var (_, _, worldMatrix, invMatrix) = _transform.GetWorldPositionRotationMatrixWithInv(gridXform);
state.drawHandle.SetTransform(worldMatrix);
var floatBounds = invMatrix.TransformBox(in state.WorldBounds).Enlarged(grid.TileSize);
var localBounds = new Box2i(