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

Removes obsolete uses of IMapManager events. (#7036)

Browse Source
This commit is contained in:
ScalyChimp
2022-03-09 07:39:03 +01:00
committed by GitHub
parent df858100af
commit d691161542
7 changed files with 45 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Content.Client/Atmos/EntitySystems/AtmosDebugOverlaySystem.cs
View File

@@ -14,7 +14,6 @@ namespace Content.Client.Atmos.EntitySystems
[UsedImplicitly]
internal sealed class AtmosDebugOverlaySystem : SharedAtmosDebugOverlaySystem
{
[Dependency] private readonly IMapManager _mapManager = default!;
private readonly Dictionary<GridId, AtmosDebugOverlayMessage> _tileData =
new();
@@ -40,13 +39,21 @@ namespace Content.Client.Atmos.EntitySystems
SubscribeNetworkEvent<AtmosDebugOverlayMessage>(HandleAtmosDebugOverlayMessage);
SubscribeNetworkEvent<AtmosDebugOverlayDisableMessage>(HandleAtmosDebugOverlayDisableMessage);
_mapManager.OnGridRemoved += OnGridRemoved;
SubscribeLocalEvent<GridRemovalEvent>(OnGridRemoved);
var overlayManager = IoCManager.Resolve<IOverlayManager>();
if(!overlayManager.HasOverlay<AtmosDebugOverlay>())
overlayManager.AddOverlay(new AtmosDebugOverlay());
}
private void OnGridRemoved(GridRemovalEvent ev)
{
if (_tileData.ContainsKey(ev.GridId))
{
_tileData.Remove(ev.GridId);
}
}
private void HandleAtmosDebugOverlayMessage(AtmosDebugOverlayMessage message)
{
_tileData[message.GridId] = message;
@@ -60,7 +67,6 @@ namespace Content.Client.Atmos.EntitySystems
public override void Shutdown()
{
base.Shutdown();
_mapManager.OnGridRemoved -= OnGridRemoved;
var overlayManager = IoCManager.Resolve<IOverlayManager>();
if (overlayManager.HasOverlay<AtmosDebugOverlay>())
overlayManager.RemoveOverlay<AtmosDebugOverlay>();
@@ -71,14 +77,6 @@ namespace Content.Client.Atmos.EntitySystems
_tileData.Clear();
}
private void OnGridRemoved(MapId mapId, GridId gridId)
{
if (_tileData.ContainsKey(gridId))
{
_tileData.Remove(gridId);
}
}
public bool HasData(GridId gridId)
{
return _tileData.ContainsKey(gridId);
@@ -93,7 +91,7 @@ namespace Content.Client.Atmos.EntitySystems
if (relative.X < 0 || relative.Y < 0 || relative.X >= LocalViewRange || relative.Y >= LocalViewRange)
return null;
return srcMsg.OverlayData[relative.X + (relative.Y * LocalViewRange)];
return srcMsg.OverlayData[relative.X + relative.Y * LocalViewRange];
}
}

10
Content.Client/Atmos/EntitySystems/GasTileOverlaySystem.cs
View File

@@ -13,7 +13,6 @@ namespace Content.Client.Atmos.EntitySystems
[UsedImplicitly]
internal sealed class GasTileOverlaySystem : SharedGasTileOverlaySystem
{
[Dependency] private readonly IMapManager _mapManager = default!;
[Dependency] private readonly IResourceCache _resourceCache = default!;
[Dependency] private readonly AtmosphereSystem _atmosphereSystem = default!;
@@ -41,7 +40,7 @@ namespace Content.Client.Atmos.EntitySystems
{
base.Initialize();
SubscribeNetworkEvent<GasOverlayMessage>(HandleGasOverlayMessage);
_mapManager.OnGridRemoved += OnGridRemoved;
SubscribeLocalEvent<GridRemovalEvent>(OnGridRemoved);
for (var i = 0; i < Atmospherics.TotalNumberOfGases; i++)
{
@@ -118,17 +117,16 @@ namespace Content.Client.Atmos.EntitySystems
public override void Shutdown()
{
base.Shutdown();
_mapManager.OnGridRemoved -= OnGridRemoved;
var overlayManager = IoCManager.Resolve<IOverlayManager>();
overlayManager.RemoveOverlay<GasTileOverlay>();
overlayManager.RemoveOverlay<FireTileOverlay>();
}
private void OnGridRemoved(MapId mapId, GridId gridId)
private void OnGridRemoved(GridRemovalEvent ev)
{
if (_tileData.ContainsKey(gridId))
if (_tileData.ContainsKey(ev.GridId))
{
_tileData.Remove(gridId);
_tileData.Remove(ev.GridId);
}
}

7
Content.Server/AI/Pathfinding/Accessible/AiReachableSystem.cs
View File

@@ -83,11 +83,11 @@ namespace Content.Server.AI.Pathfinding.Accessible
{
SubscribeLocalEvent<RoundRestartCleanupEvent>(Reset);
SubscribeLocalEvent<PathfindingChunkUpdateMessage>(RecalculateNodeRegions);
SubscribeLocalEvent<GridRemovalEvent>(GridRemoved);
#if DEBUG
SubscribeNetworkEvent<SharedAiDebug.SubscribeReachableMessage>(HandleSubscription);
SubscribeNetworkEvent<SharedAiDebug.UnsubscribeReachableMessage>(HandleUnsubscription);
#endif
_mapManager.OnGridRemoved += GridRemoved;
}
public override void Shutdown()
@@ -99,12 +99,11 @@ namespace Content.Server.AI.Pathfinding.Accessible
_cachedAccessible.Clear();
_queuedCacheDeletions.Clear();
_mapManager.OnGridRemoved -= GridRemoved;
}
private void GridRemoved(MapId mapId, GridId gridId)
private void GridRemoved(GridRemovalEvent ev)
{
_regions.Remove(gridId);
_regions.Remove(ev.GridId);
}
public override void Update(float frameTime)

32
Content.Server/AI/Pathfinding/PathfindingSystem.cs
View File

@@ -206,21 +206,13 @@ namespace Content.Server.AI.Pathfinding
SubscribeLocalEvent<CollisionChangeMessage>(QueueCollisionChangeMessage);
SubscribeLocalEvent<MoveEvent>(QueueMoveEvent);
SubscribeLocalEvent<AccessReaderChangeMessage>(QueueAccessChangeMessage);
SubscribeLocalEvent<GridRemovalEvent>(HandleGridRemoval);
SubscribeLocalEvent<GridModifiedEvent>(QueueGridChange);
SubscribeLocalEvent<TileChangedEvent>(QueueTileChange);
// Handle all the base grid changes
// Anything that affects traversal (i.e. collision layer) is handled separately.
_mapManager.OnGridRemoved += HandleGridRemoval;
_mapManager.GridChanged += QueueGridChange;
_mapManager.TileChanged += QueueTileChange;
}
public override void Shutdown()
{
base.Shutdown();
_mapManager.OnGridRemoved -= HandleGridRemoval;
_mapManager.GridChanged -= QueueGridChange;
_mapManager.TileChanged -= QueueTileChange;
}
private void HandleTileUpdate(TileRef tile)
@@ -231,25 +223,25 @@ namespace Content.Server.AI.Pathfinding
node.UpdateTile(tile);
}
private void HandleGridRemoval(MapId mapId, GridId gridId)
private void HandleGridRemoval(GridRemovalEvent ev)
{
if (_graph.ContainsKey(gridId))
if (_graph.ContainsKey(ev.GridId))
{
_graph.Remove(gridId);
_graph.Remove(ev.GridId);
}
}
private void QueueGridChange(object? sender, GridChangedEventArgs eventArgs)
private void QueueGridChange(GridModifiedEvent ev)
{
foreach (var (position, _) in eventArgs.Modified)
foreach (var (position, _) in ev.Modified)
{
_tileUpdateQueue.Enqueue(eventArgs.Grid.GetTileRef(position));
_tileUpdateQueue.Enqueue(ev.Grid.GetTileRef(position));
}
}
private void QueueTileChange(object? sender, TileChangedEventArgs eventArgs)
private void QueueTileChange(TileChangedEvent ev)
{
_tileUpdateQueue.Enqueue(eventArgs.NewTile);
_tileUpdateQueue.Enqueue(ev.NewTile);
}
private void QueueAccessChangeMessage(AccessReaderChangeMessage message)

14
Content.Server/Atmos/EntitySystems/AtmosphereSystem.cs
View File

@@ -20,6 +20,7 @@ namespace Content.Server.Atmos.EntitySystems
[Dependency] private readonly SharedContainerSystem _containers = default!;
[Dependency] private readonly SharedPhysicsSystem _physics = default!;
private const float ExposedUpdateDelay = 1f;
private float _exposedTimer = 0f;
@@ -34,35 +35,30 @@ namespace Content.Server.Atmos.EntitySystems
InitializeCVars();
InitializeGrid();
#region Events
// Map events.
_mapManager.TileChanged += OnTileChanged;
SubscribeLocalEvent<TileChangedEvent>(OnTileChanged);
#endregion
}
public override void Shutdown()
{
base.Shutdown();
_mapManager.TileChanged -= OnTileChanged;
ShutdownCommands();
}
private void OnTileChanged(object? sender, TileChangedEventArgs eventArgs)
private void OnTileChanged(TileChangedEvent ev)
{
// When a tile changes, we want to update it only if it's gone from
// space -> not space or vice versa. So if the old tile is the
// same as the new tile in terms of space-ness, ignore the change
if (eventArgs.NewTile.IsSpace() == eventArgs.OldTile.IsSpace())
if (ev.NewTile.IsSpace(_tileDefinitionManager) == ev.OldTile.IsSpace(_tileDefinitionManager))
{
return;
}
InvalidateTile(eventArgs.NewTile.GridIndex, eventArgs.NewTile.GridIndices);
InvalidateTile(ev.NewTile.GridIndex, ev.NewTile.GridIndices);
}
public override void Update(float frameTime)

17
Content.Server/Atmos/EntitySystems/AutomaticAtmosSystem.cs
View File

@@ -1,4 +1,4 @@
using Content.Server.Atmos.Components;
using Content.Server.Atmos.Components;
using Content.Server.Shuttles.EntitySystems;
using Content.Shared.Maps;
using Robust.Shared.Map;
@@ -17,26 +17,21 @@ public sealed class AutomaticAtmosSystem : EntitySystem
public override void Initialize()
{
base.Initialize();
_mapManager.TileChanged += MapManagerOnTileChanged;
SubscribeLocalEvent<TileChangedEvent>(OnTileChanged);
}
public override void Shutdown()
{
base.Shutdown();
_mapManager.TileChanged -= MapManagerOnTileChanged;
}
private void MapManagerOnTileChanged(object? sender, TileChangedEventArgs e)
private void OnTileChanged(TileChangedEvent ev)
{
// Only if a atmos-holding tile has been added or removed.
// Also, these calls are surprisingly slow.
// TODO: Make tiledefmanager cache the IsSpace property, and turn this lookup-through-two-interfaces into
// TODO: a simple array lookup, as tile IDs are likely contiguous, and there's at most 2^16 possibilities anyway.
if (!((e.OldTile.IsSpace(_tileDefinitionManager) && !e.NewTile.IsSpace(_tileDefinitionManager)) ||
(!e.OldTile.IsSpace(_tileDefinitionManager) && e.NewTile.IsSpace(_tileDefinitionManager))))
if (!((ev.OldTile.IsSpace(_tileDefinitionManager) && !ev.NewTile.IsSpace(_tileDefinitionManager)) ||
(!ev.OldTile.IsSpace(_tileDefinitionManager) && ev.NewTile.IsSpace(_tileDefinitionManager))))
return;
var uid = _mapManager.GetGridEuid(e.NewTile.GridIndex);
var uid = _mapManager.GetGridEuid(ev.NewTile.GridIndex);
if (!TryComp<PhysicsComponent>(uid, out var physics))
return;

11
Content.Server/Atmos/EntitySystems/GasTileOverlaySystem.cs
View File

@@ -1,4 +1,4 @@
using System;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Runtime.CompilerServices;
@@ -65,9 +65,9 @@ namespace Content.Server.Atmos.EntitySystems
base.Initialize();
SubscribeLocalEvent<RoundRestartCleanupEvent>(Reset);
SubscribeLocalEvent<GridRemovalEvent>(OnGridRemoved);
_playerManager.PlayerStatusChanged += OnPlayerStatusChanged;
_mapManager.OnGridRemoved += OnGridRemoved;
var configManager = IoCManager.Resolve<IConfigurationManager>();
configManager.OnValueChanged(CCVars.NetGasOverlayTickRate, value => _updateCooldown = value > 0.0f ? 1 / value : float.MaxValue, true);
configManager.OnValueChanged(CVars.NetMaxUpdateRange, value => _updateRange = value + RangeOffset, true);
@@ -78,7 +78,6 @@ namespace Content.Server.Atmos.EntitySystems
{
base.Shutdown();
_playerManager.PlayerStatusChanged -= OnPlayerStatusChanged;
_mapManager.OnGridRemoved -= OnGridRemoved;
}
[MethodImpl(MethodImplOptions.AggressiveInlining)]
@@ -112,11 +111,11 @@ namespace Content.Server.Atmos.EntitySystems
return chunk;
}
private void OnGridRemoved(MapId mapId, GridId gridId)
private void OnGridRemoved(GridRemovalEvent ev)
{
if (_overlay.ContainsKey(gridId))
if (_overlay.ContainsKey(ev.GridId))
{
_overlay.Remove(gridId);
_overlay.Remove(ev.GridId);
}
}