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

Revert "Remove most usages of obsolete TransformComponent methods (#1… (#19714)

Browse Source
This commit is contained in:
metalgearsloth
2023-09-01 12:30:29 +10:00
committed by GitHub
parent 37222930d9
commit 4cfc578011
91 changed files with 227 additions and 315 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -17,7 +17,6 @@ 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;
@@ -26,7 +25,6 @@ namespace Content.Client.Atmos.Overlays
IoCManager.InjectDependencies(this);
_atmosDebugOverlaySystem = system;
_transform = _entManager.System<SharedTransformSystem>();
}
protected override void Draw(in OverlayDrawArgs args)
@@ -49,7 +47,7 @@ namespace Content.Client.Atmos.Overlays
!_entManager.TryGetComponent<TransformComponent>(mapGrid.Owner, out var xform))
continue;
drawHandle.SetTransform(_transform.GetWorldMatrix(xform));
drawHandle.SetTransform(xform.WorldMatrix);
for (var pass = 0; pass < 2; pass++)
{

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

@@ -19,7 +19,6 @@ 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;
@@ -49,7 +48,6 @@ 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;
@@ -184,7 +182,7 @@ namespace Content.Client.Atmos.Overlays
// TODO: WorldBounds callback.
_mapManager.FindGridsIntersecting(args.MapId, args.WorldAABB, ref gridState,
(EntityUid uid, MapGridComponent grid,
static (EntityUid uid, MapGridComponent grid,
ref (Box2Rotated WorldBounds,
DrawingHandleWorld drawHandle,
int gasCount,
@@ -202,7 +200,7 @@ namespace Content.Client.Atmos.Overlays
return true;
}
var (_, _, worldMatrix, invMatrix) = _transform.GetWorldPositionRotationMatrixWithInv(gridXform);
var (_, _, worldMatrix, invMatrix) = gridXform.GetWorldPositionRotationMatrixWithInv();
state.drawHandle.SetTransform(worldMatrix);
var floatBounds = invMatrix.TransformBox(in state.WorldBounds).Enlarged(grid.TileSize);
var localBounds = new Box2i(