Compress atmos serialization data (#14266)

This commit is contained in:
metalgearsloth
2023-03-11 13:55:11 +11:00
committed by GitHub
parent 973556066b
commit 1724ecb8d9

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.Manager;
using Robust.Shared.Serialization.Markdown; using Robust.Shared.Serialization.Markdown;
using Robust.Shared.Serialization.Markdown.Mapping; using Robust.Shared.Serialization.Markdown.Mapping;
using Robust.Shared.Serialization.Markdown.Validation; 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.Serialization.TypeSerializers.Interfaces;
using Robust.Shared.Utility;
namespace Content.Server.Atmos.Serialization; namespace Content.Server.Atmos.Serialization;
@@ -20,21 +24,81 @@ public sealed class TileAtmosCollectionSerializer : ITypeSerializer<Dictionary<V
SerializationHookContext hookCtx, ISerializationContext? context = null, SerializationHookContext hookCtx, ISerializationContext? context = null,
ISerializationManager.InstantiationDelegate<Dictionary<Vector2i, TileAtmosphere>>? instanceProvider = null) ISerializationManager.InstantiationDelegate<Dictionary<Vector2i, TileAtmosphere>>? instanceProvider = null)
{ {
var data = serializationManager.Read<TileAtmosData>(node, hookCtx, context); node.TryGetValue(new ValueDataNode("version"), out var versionNode);
var tiles = new Dictionary<Vector2i, TileAtmosphere>(); var version = ((ValueDataNode?) versionNode)?.AsInt() ?? 1;
if (data.TilesUniqueMixes != null) 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)
{ {
try foreach (var (indices, mix) in mixies)
{ {
tiles.Add(indices, new TileAtmosphere(EntityUid.Invalid, indices, try
data.UniqueMixes![mix].Clone())); {
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!");
}
} }
catch (ArgumentOutOfRangeException) }
}
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)
{ {
Logger.Error( var chunkOrigin = serializationManager.Read<Vector2i>(chunkNode, hookCtx, context);
$"Error during atmos serialization! Tile at {indices} points to an unique mix ({mix}) out of range!"); 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!");
}
}
}
}
} }
} }
} }
@@ -46,41 +110,69 @@ public sealed class TileAtmosCollectionSerializer : ITypeSerializer<Dictionary<V
bool alwaysWrite = false, ISerializationContext? context = null) bool alwaysWrite = false, ISerializationContext? context = null)
{ {
var uniqueMixes = new List<GasMixture>(); var uniqueMixes = new List<GasMixture>();
var uniqueMixHash = new Dictionary<GasMixture, int>(); var tileChunks = new Dictionary<Vector2i, TileAtmosChunk>();
var tiles = new Dictionary<Vector2i, int>(); var chunkSize = 4;
foreach (var (indices, tile) in value) foreach (var (gridIndices, tile) in value)
{ {
if (tile.Air == null) continue; if (tile.Air == null) continue;
if (uniqueMixHash.TryGetValue(tile.Air, out var index)) var mixIndex = uniqueMixes.IndexOf(tile.Air);
if (mixIndex == -1)
{ {
tiles[indices] = index; mixIndex = uniqueMixes.Count;
continue; uniqueMixes.Add(tile.Air);
} }
uniqueMixes.Add(tile.Air); var chunkOrigin = SharedMapSystem.GetChunkIndices(gridIndices, chunkSize);
var newIndex = uniqueMixes.Count - 1; var tileChunk = tileChunks.GetOrNew(chunkOrigin);
uniqueMixHash[tile.Air] = newIndex; var indices = SharedMapSystem.GetChunkRelative(gridIndices, chunkSize);
tiles[indices] = newIndex;
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 (uniqueMixes.Count == 0)
if (tiles.Count == 0) tiles = null; uniqueMixes = null;
if (tileChunks.Count == 0)
tileChunks = null;
return serializationManager.WriteValue(new TileAtmosData var map = new MappingDataNode
{ {
UniqueMixes = uniqueMixes, { "version", 2.ToString(CultureInfo.InvariantCulture) },
TilesUniqueMixes = tiles {
}, alwaysWrite, context); "data", serializationManager.WriteValue(new TileAtmosData
{
ChunkSize = chunkSize,
UniqueMixes = uniqueMixes,
TilesUniqueMixes = tileChunks,
}, alwaysWrite, context)
}
};
return map;
} }
[DataDefinition] [DataDefinition]
private struct TileAtmosData private struct TileAtmosData
{ {
[DataField("chunkSize")] public int ChunkSize;
[DataField("uniqueMixes")] public List<GasMixture>? UniqueMixes; [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, public void CopyTo(ISerializationManager serializationManager, Dictionary<Vector2i, TileAtmosphere> source, ref Dictionary<Vector2i, TileAtmosphere> target, SerializationHookContext hookCtx,