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

GasTileOverlay now uses a struct enumerator for enumerating overlays for a given tile. (#4844)

Browse Source
This commit is contained in:
Vera Aguilera Puerto
2021-10-12 17:20:32 +02:00
committed by GitHub
parent 88bee5b878
commit 26c77a0d0b
3 changed files with 96 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,7 @@
using System; using System;
using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis;
using Content.Client.Atmos.Overlays; using Content.Client.Atmos.Overlays;
using Content.Shared.Atmos; using Content.Shared.Atmos;
using Content.Shared.Atmos.EntitySystems; using Content.Shared.Atmos.EntitySystems;
@@ -22,19 +24,19 @@ namespace Content.Client.Atmos.EntitySystems
[Dependency] private readonly AtmosphereSystem _atmosphereSystem = default!; [Dependency] private readonly AtmosphereSystem _atmosphereSystem = default!;
// Gas overlays // Gas overlays
private readonly float[] _timer = new float[Atmospherics.TotalNumberOfGases]; public readonly float[] Timer = new float[Atmospherics.TotalNumberOfGases];
private readonly float[][] _frameDelays = new float[Atmospherics.TotalNumberOfGases][]; public readonly float[][] FrameDelays = new float[Atmospherics.TotalNumberOfGases][];
private readonly int[] _frameCounter = new int[Atmospherics.TotalNumberOfGases]; public readonly int[] FrameCounter = new int[Atmospherics.TotalNumberOfGases];
private readonly Texture[][] _frames = new Texture[Atmospherics.TotalNumberOfGases][]; public readonly Texture[][] Frames = new Texture[Atmospherics.TotalNumberOfGases][];
// Fire overlays // Fire overlays
private const int FireStates = 3; public const int FireStates = 3;
private const string FireRsiPath = "/Textures/Effects/fire.rsi"; public const string FireRsiPath = "/Textures/Effects/fire.rsi";
private readonly float[] _fireTimer = new float[FireStates]; public readonly float[] FireTimer = new float[FireStates];
private readonly float[][] _fireFrameDelays = new float[FireStates][]; public readonly float[][] FireFrameDelays = new float[FireStates][];
private readonly int[] _fireFrameCounter = new int[FireStates]; public readonly int[] FireFrameCounter = new int[FireStates];
private readonly Texture[][] _fireFrames = new Texture[FireStates][]; public readonly Texture[][] FireFrames = new Texture[FireStates][];
private readonly Dictionary<GridId, Dictionary<Vector2i, GasOverlayChunk>> _tileData = private readonly Dictionary<GridId, Dictionary<Vector2i, GasOverlayChunk>> _tileData =
new(); new();
@@ -56,17 +58,17 @@ namespace Content.Client.Atmos.EntitySystems
if(!rsi.TryGetState(stateId, out var state)) continue; if(!rsi.TryGetState(stateId, out var state)) continue;
_frames[i] = state.GetFrames(RSI.State.Direction.South); Frames[i] = state.GetFrames(RSI.State.Direction.South);
_frameDelays[i] = state.GetDelays(); FrameDelays[i] = state.GetDelays();
_frameCounter[i] = 0; FrameCounter[i] = 0;
break; break;
case SpriteSpecifier.Texture texture: case SpriteSpecifier.Texture texture:
_frames[i] = new[] {texture.Frame0()}; Frames[i] = new[] {texture.Frame0()};
_frameDelays[i] = Array.Empty<float>(); FrameDelays[i] = Array.Empty<float>();
break; break;
case null: case null:
_frames[i] = Array.Empty<Texture>(); Frames[i] = Array.Empty<Texture>();
_frameDelays[i] = Array.Empty<float>(); FrameDelays[i] = Array.Empty<float>();
break; break;
} }
} }
@@ -78,9 +80,9 @@ namespace Content.Client.Atmos.EntitySystems
if (!fire.TryGetState((i+1).ToString(), out var state)) if (!fire.TryGetState((i+1).ToString(), out var state))
throw new ArgumentOutOfRangeException($"Fire RSI doesn't have state \"{i}\"!"); throw new ArgumentOutOfRangeException($"Fire RSI doesn't have state \"{i}\"!");
_fireFrames[i] = state.GetFrames(RSI.State.Direction.South); FireFrames[i] = state.GetFrames(RSI.State.Direction.South);
_fireFrameDelays[i] = state.GetDelays(); FireFrameDelays[i] = state.GetDelays();
_fireFrameCounter[i] = 0; FireFrameCounter[i] = 0;
} }
var overlayManager = IoCManager.Resolve<IOverlayManager>(); var overlayManager = IoCManager.Resolve<IOverlayManager>();
@@ -139,35 +141,18 @@ namespace Content.Client.Atmos.EntitySystems
return _tileData.ContainsKey(gridId); return _tileData.ContainsKey(gridId);
} }
public IEnumerable<(Texture, Color)> GetOverlays(GridId gridIndex, Vector2i indices) public GasOverlayEnumerator GetOverlays(GridId gridIndex, Vector2i indices)
{ {
if (!_tileData.TryGetValue(gridIndex, out var chunks)) if (!_tileData.TryGetValue(gridIndex, out var chunks))
yield break; return default;
var chunkIndex = GetGasChunkIndices(indices); var chunkIndex = GetGasChunkIndices(indices);
if (!chunks.TryGetValue(chunkIndex, out var chunk)) if (!chunks.TryGetValue(chunkIndex, out var chunk))
yield break; return default;
var overlays = chunk.GetData(indices); var overlays = chunk.GetData(indices);
if (overlays.Gas == null) return new GasOverlayEnumerator(overlays, this);
yield break;
var fire = overlays.FireState != 0;
foreach (var gasData in overlays.Gas)
{
var frames = _frames[gasData.Index];
yield return (frames[_frameCounter[gasData.Index]], Color.White.WithAlpha(gasData.Opacity));
}
if (fire)
{
var state = overlays.FireState - 1;
var frames = _fireFrames[state];
// TODO ATMOS Set color depending on temperature
yield return (frames[_fireFrameCounter[state]], Color.White);
}
} }
public override void FrameUpdate(float frameTime) public override void FrameUpdate(float frameTime)
@@ -176,26 +161,80 @@ namespace Content.Client.Atmos.EntitySystems
for (var i = 0; i < Atmospherics.TotalNumberOfGases; i++) for (var i = 0; i < Atmospherics.TotalNumberOfGases; i++)
{ {
var delays = _frameDelays[i]; var delays = FrameDelays[i];
if (delays.Length == 0) continue; if (delays.Length == 0) continue;
var frameCount = _frameCounter[i]; var frameCount = FrameCounter[i];
_timer[i] += frameTime; Timer[i] += frameTime;
if (!(_timer[i] >= delays[frameCount])) continue; if (!(Timer[i] >= delays[frameCount])) continue;
_timer[i] = 0f; Timer[i] = 0f;
_frameCounter[i] = (frameCount + 1) % _frames[i].Length; FrameCounter[i] = (frameCount + 1) % Frames[i].Length;
} }
for (var i = 0; i < FireStates; i++) for (var i = 0; i < FireStates; i++)
{ {
var delays = _fireFrameDelays[i]; var delays = FireFrameDelays[i];
if (delays.Length == 0) continue; if (delays.Length == 0) continue;
var frameCount = _fireFrameCounter[i]; var frameCount = FireFrameCounter[i];
_fireTimer[i] += frameTime; FireTimer[i] += frameTime;
if (!(_fireTimer[i] >= delays[frameCount])) continue; if (!(FireTimer[i] >= delays[frameCount])) continue;
_fireTimer[i] = 0f; FireTimer[i] = 0f;
_fireFrameCounter[i] = (frameCount + 1) % _fireFrames[i].Length; FireFrameCounter[i] = (frameCount + 1) % FireFrames[i].Length;
}
}
public struct GasOverlayEnumerator : IDisposable
{
private readonly GasTileOverlaySystem _system;
private readonly GasData[]? _data;
private byte _fireState;
// TODO: Take Fire Temperature into account, when we code fire color
private readonly int _length; // We cache the length so we can avoid a pointer dereference, for speed. Brrr.
private int _current;
public GasOverlayEnumerator(in GasOverlayData data, GasTileOverlaySystem system)
{
// Gas can't be null, as the caller to this constructor already ensured it wasn't.
_data = data.Gas;
_fireState = data.FireState;
_system = system;
_length = _data?.Length ?? 0;
_current = 0;
}
public bool MoveNext(out (Texture Texture, Color Color) overlay)
{
if (_current < _length)
{
// Data can't be null here unless length/current are incorrect
var gas = _data![_current++];
var frames = _system.Frames[gas.Index];
overlay = (frames[_system.FrameCounter[gas.Index]], Color.White.WithAlpha(gas.Opacity));
return true;
}
if (_fireState != 0)
{
var state = _fireState - 1;
var frames = _system.FireFrames[state];
// TODO ATMOS Set color depending on temperature
overlay = (frames[_system.FireFrameCounter[state]], Color.White);
// Setting this to zero so we don't get stuck in an infinite loop.
_fireState = 0;
return true;
}
overlay = default;
return false;
}
public void Dispose()
{
} }
} }
} }

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

@@ -40,9 +40,10 @@ namespace Content.Client.Atmos.Overlays
foreach (var tile in mapGrid.GetTilesIntersecting(worldBounds)) foreach (var tile in mapGrid.GetTilesIntersecting(worldBounds))
{ {
foreach (var (texture, color) in _gasTileOverlaySystem.GetOverlays(mapGrid.Index, tile.GridIndices)) var enumerator = _gasTileOverlaySystem.GetOverlays(mapGrid.Index, tile.GridIndices);
while (enumerator.MoveNext(out var tuple))
{ {
drawHandle.DrawTexture(texture, new Vector2(tile.X, tile.Y), color); drawHandle.DrawTexture(tuple.Texture, new Vector2(tile.X, tile.Y), tuple.Color);
} }
} }
} }

2
Content.Shared/Atmos/EntitySystems/SharedGasTileOverlaySystem.cs
View File

@@ -45,7 +45,7 @@ namespace Content.Shared.Atmos.EntitySystems
{ {
public readonly byte FireState; public readonly byte FireState;
public readonly float FireTemperature; public readonly float FireTemperature;
public readonly GasData[] Gas; public readonly GasData[]? Gas;
public readonly int HashCode; public readonly int HashCode;
public GasOverlayData(byte fireState, float fireTemperature, GasData[] gas) public GasOverlayData(byte fireState, float fireTemperature, GasData[] gas)