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

Reduce array resizing in GasTileOverlay (#7479)

Browse Source
This commit is contained in:
Leon Friedrich
2022-04-10 04:45:57 +12:00
committed by GitHub
parent 1317f0214a
commit 7057c7ca77
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -187,11 +187,17 @@ namespace Content.Server.Atmos.EntitySystems
/// <returns></returns> /// <returns></returns>
private List<GasOverlayChunk> GetChunksInRange(EntityUid entity) private List<GasOverlayChunk> GetChunksInRange(EntityUid entity)
{ {
var inRange = new List<GasOverlayChunk>();
// This is the max in any direction that we can get a chunk (e.g. max 2 chunks away of data). // This is the max in any direction that we can get a chunk (e.g. max 2 chunks away of data).
var (maxXDiff, maxYDiff) = ((int) (_updateRange.X / ChunkSize) + 1, (int) (_updateRange.Y / ChunkSize) + 1); var (maxXDiff, maxYDiff) = ((int) (_updateRange.X / ChunkSize) + 1, (int) (_updateRange.Y / ChunkSize) + 1);
// Setting initial list size based on the theoretical max number of chunks from a single grid. For default
// parameters, this is currently 6^2 = 36. Unless a player is near more than one grid, this is will
// generally slightly over-estimate the actual list size, which will be either 25, 30, or 36 (assuming the
// player is not near the edge of a grid).
var initialListSize = (1 + (int) MathF.Ceiling(2 * _updateRange.X / ChunkSize)) * (1 + (int) MathF.Ceiling(2 * _updateRange.Y / ChunkSize));
var inRange = new List<GasOverlayChunk>(initialListSize);
var xform = Transform(entity); var xform = Transform(entity);
var worldPos = xform.MapPosition; var worldPos = xform.MapPosition;
@@ -219,8 +225,8 @@ namespace Content.Server.Atmos.EntitySystems
// (e.g. if we're on the very edge of a chunk we may need more chunks). // (e.g. if we're on the very edge of a chunk we may need more chunks).
var (xDiff, yDiff) = (chunkIndices.X - entityTile.X, chunkIndices.Y - entityTile.Y); var (xDiff, yDiff) = (chunkIndices.X - entityTile.X, chunkIndices.Y - entityTile.Y);
if (xDiff > 0 && xDiff > _updateRange.X || if (xDiff > _updateRange.X ||
yDiff > 0 && yDiff > _updateRange.Y || yDiff > _updateRange.Y ||
xDiff < 0 && Math.Abs(xDiff + ChunkSize) > _updateRange.X || xDiff < 0 && Math.Abs(xDiff + ChunkSize) > _updateRange.X ||
yDiff < 0 && Math.Abs(yDiff + ChunkSize) > _updateRange.Y) continue; yDiff < 0 && Math.Abs(yDiff + ChunkSize) > _updateRange.Y) continue;