Overlays: Avoid using IEyeManager whenever possible (#5709)

This commit is contained in:
E F R
2021-12-10 05:47:21 +00:00
committed by GitHub
parent b3a4e3f557
commit 8bd386dcb0
13 changed files with 39 additions and 42 deletions

View File

@@ -15,7 +15,6 @@ namespace Content.Client.Atmos.Overlays
private readonly AtmosDebugOverlaySystem _atmosDebugOverlaySystem;
[Dependency] private readonly IMapManager _mapManager = default!;
[Dependency] private readonly IEyeManager _eyeManager = default!;
public override OverlaySpace Space => OverlaySpace.WorldSpace;
@@ -30,8 +29,8 @@ namespace Content.Client.Atmos.Overlays
{
var drawHandle = args.WorldHandle;
var mapId = _eyeManager.CurrentMap;
var worldBounds = _eyeManager.GetWorldViewbounds();
var mapId = args.Viewport.Eye!.Position.MapId;
var worldBounds = args.WorldBounds;
// IF YOU ARE ABOUT TO INTRODUCE CHUNKING OR SOME OTHER OPTIMIZATION INTO THIS CODE:
// -- THINK! --

View File

@@ -13,7 +13,6 @@ namespace Content.Client.Atmos.Overlays
private readonly GasTileOverlaySystem _gasTileOverlaySystem;
[Dependency] private readonly IMapManager _mapManager = default!;
[Dependency] private readonly IEyeManager _eyeManager = default!;
public override OverlaySpace Space => OverlaySpace.WorldSpaceBelowFOV;
@@ -28,8 +27,8 @@ namespace Content.Client.Atmos.Overlays
{
var drawHandle = args.WorldHandle;
var mapId = _eyeManager.CurrentMap;
var worldBounds = _eyeManager.GetWorldViewbounds();
var mapId = args.Viewport.Eye!.Position.MapId;
var worldBounds = args.WorldBounds;
foreach (var mapGrid in _mapManager.FindGridsIntersecting(mapId, worldBounds))
{