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

Compress atmos serialization data (#14266)

Browse Source
This commit is contained in:
metalgearsloth
2023-03-11 13:55:11 +11:00
committed by GitHub
parent 973556066b
commit 1724ecb8d9
1 changed files with 120 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

138
Content.Server/Atmos/Serialization/TileAtmosCollectionSerializer.cs
View File

@@ -1,9 +1,13 @@
using Robust.Shared.Serialization;
using System.Globalization;
using Robust.Shared.Serialization;
using Robust.Shared.Serialization.Manager;
using Robust.Shared.Serialization.Markdown;
using Robust.Shared.Serialization.Markdown.Mapping;
using Robust.Shared.Serialization.Markdown.Validation;
using Robust.Shared.Serialization.Markdown.Value;
using Robust.Shared.Serialization.TypeSerializers.Implementations.Generic;
using Robust.Shared.Serialization.TypeSerializers.Interfaces;
using Robust.Shared.Utility;
namespace Content.Server.Atmos.Serialization;
@@ -20,16 +24,28 @@ public sealed class TileAtmosCollectionSerializer : ITypeSerializer<Dictionary<V
SerializationHookContext hookCtx, ISerializationContext? context = null,
ISerializationManager.InstantiationDelegate<Dictionary<Vector2i, TileAtmosphere>>? instanceProvider = null)
{
var data = serializationManager.Read<TileAtmosData>(node, hookCtx, context);
var tiles = new Dictionary<Vector2i, TileAtmosphere>();
if (data.TilesUniqueMixes != null)
node.TryGetValue(new ValueDataNode("version"), out var versionNode);
var version = ((ValueDataNode?) versionNode)?.AsInt() ?? 1;
Dictionary<Vector2i, TileAtmosphere> tiles;
// Backwards compatability
if (version == 1)
{
foreach (var (indices, mix) in data.TilesUniqueMixes)
var tile2 = node["tiles"];
var mixies = serializationManager.Read<Dictionary<Vector2i, int>?>(tile2, hookCtx, context);
var unique = serializationManager.Read<List<GasMixture>?>(node["uniqueMixes"], hookCtx, context);
tiles = new Dictionary<Vector2i, TileAtmosphere>();
if (unique != null && mixies != null)
{
foreach (var (indices, mix) in mixies)
{
try
{
tiles.Add(indices, new TileAtmosphere(EntityUid.Invalid, indices,
data.UniqueMixes![mix].Clone()));
unique[mix].Clone()));
}
catch (ArgumentOutOfRangeException)
{
@@ -38,6 +54,54 @@ public sealed class TileAtmosCollectionSerializer : ITypeSerializer<Dictionary<V
}
}
}
}
else
{
var dataNode = (MappingDataNode) node["data"];
var tileNode = (MappingDataNode) dataNode["tiles"];
var chunkSize = serializationManager.Read<int>(dataNode["chunkSize"], hookCtx, context);
var unique = serializationManager.Read<List<GasMixture>?>(dataNode["uniqueMixes"], hookCtx, context);
tiles = new Dictionary<Vector2i, TileAtmosphere>();
if (unique != null)
{
foreach (var (chunkNode, valueNode) in tileNode)
{
var chunkOrigin = serializationManager.Read<Vector2i>(chunkNode, hookCtx, context);
var chunk = serializationManager.Read<TileAtmosChunk>(valueNode, hookCtx, context);
foreach (var (mix, data) in chunk.Data)
{
for (var x = 0; x < chunkSize; x++)
{
for (var y = 0; y < chunkSize; y++)
{
var flag = data & (uint) (1 << (x + y * chunkSize));
if (flag == 0)
continue;
var indices = new Vector2i(x + chunkOrigin.X * chunkSize,
y + chunkOrigin.Y * chunkSize);
try
{
tiles.Add(indices, new TileAtmosphere(EntityUid.Invalid, indices,
unique[mix].Clone()));
}
catch (ArgumentOutOfRangeException)
{
Logger.Error(
$"Error during atmos serialization! Tile at {indices} points to an unique mix ({mix}) out of range!");
}
}
}
}
}
}
}
return tiles;
}
@@ -46,41 +110,69 @@ public sealed class TileAtmosCollectionSerializer : ITypeSerializer<Dictionary<V
bool alwaysWrite = false, ISerializationContext? context = null)
{
var uniqueMixes = new List<GasMixture>();
var uniqueMixHash = new Dictionary<GasMixture, int>();
var tiles = new Dictionary<Vector2i, int>();
var tileChunks = new Dictionary<Vector2i, TileAtmosChunk>();
var chunkSize = 4;
foreach (var (indices, tile) in value)
foreach (var (gridIndices, tile) in value)
{
if (tile.Air == null) continue;
if (uniqueMixHash.TryGetValue(tile.Air, out var index))
{
tiles[indices] = index;
continue;
}
var mixIndex = uniqueMixes.IndexOf(tile.Air);
if (mixIndex == -1)
{
mixIndex = uniqueMixes.Count;
uniqueMixes.Add(tile.Air);
var newIndex = uniqueMixes.Count - 1;
uniqueMixHash[tile.Air] = newIndex;
tiles[indices] = newIndex;
}
if (uniqueMixes.Count == 0) uniqueMixes = null;
if (tiles.Count == 0) tiles = null;
var chunkOrigin = SharedMapSystem.GetChunkIndices(gridIndices, chunkSize);
var tileChunk = tileChunks.GetOrNew(chunkOrigin);
var indices = SharedMapSystem.GetChunkRelative(gridIndices, chunkSize);
return serializationManager.WriteValue(new TileAtmosData
var mixFlag = tileChunk.Data.GetOrNew(mixIndex);
mixFlag |= (uint) 1 << (indices.X + indices.Y * chunkSize);
tileChunk.Data[mixIndex] = mixFlag;
}
if (uniqueMixes.Count == 0)
uniqueMixes = null;
if (tileChunks.Count == 0)
tileChunks = null;
var map = new MappingDataNode
{
{ "version", 2.ToString(CultureInfo.InvariantCulture) },
{
"data", serializationManager.WriteValue(new TileAtmosData
{
ChunkSize = chunkSize,
UniqueMixes = uniqueMixes,
TilesUniqueMixes = tiles
}, alwaysWrite, context);
TilesUniqueMixes = tileChunks,
}, alwaysWrite, context)
}
};
return map;
}
[DataDefinition]
private struct TileAtmosData
{
[DataField("chunkSize")] public int ChunkSize;
[DataField("uniqueMixes")] public List<GasMixture>? UniqueMixes;
[DataField("tiles")] public Dictionary<Vector2i, int>? TilesUniqueMixes;
[DataField("tiles")] public Dictionary<Vector2i, TileAtmosChunk>? TilesUniqueMixes;
}
[DataDefinition]
private record struct TileAtmosChunk()
{
/// <summary>
/// Key is unique mix and value is bitflag of the affected tiles.
/// </summary>
[IncludeDataField(customTypeSerializer: typeof(DictionarySerializer<int, uint>))]
public readonly Dictionary<int, uint> Data = new();
}
public void CopyTo(ISerializationManager serializationManager, Dictionary<Vector2i, TileAtmosphere> source, ref Dictionary<Vector2i, TileAtmosphere> target, SerializationHookContext hookCtx,