epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace custom JSON with MiniYAML.

Browse Source
This commit is contained in:
Matthias Mailänder
2025-07-15 08:08:37 +02:00
committed by Gustas Kažukauskas
parent ec206dc359
commit f416e123f0
2 changed files with 39 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
OpenRA.Mods.Common/Traits/World/MarkerLayerOverlay.cs
View File

@@ -13,7 +13,6 @@ using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using Newtonsoft.Json;
using OpenRA.Graphics;
using OpenRA.Mods.Common.Graphics;
using OpenRA.Traits;
@@ -61,13 +60,35 @@ namespace OpenRA.Mods.Common.Traits
public class MarkerLayerOverlay : IRenderAnnotations, INotifyActorDisposing, IWorldLoaded
{
public class MarkerLayerFile
public class MarkerLayer
{
public Dictionary<int, List<int>> Tiles { get; set; }
public MarkerTileMirrorMode MirrorMode { get; set; }
public int NumSides { get; set; }
public int AxisAngle { get; set; }
public int TileAlpha { get; set; }
public readonly Dictionary<int, CPos[]> Tiles;
public readonly MarkerTileMirrorMode MirrorMode;
public readonly int NumSides;
public readonly int AxisAngle;
public readonly int TileAlpha;
public MarkerLayer() { }
public MarkerLayer(MarkerLayerOverlay markerLayerOverlay)
{
Tiles = markerLayerOverlay.Tiles.ToDictionary(d => d.Key, d => d.Value.ToArray());
MirrorMode = markerLayerOverlay.MirrorMode;
NumSides = markerLayerOverlay.NumSides;
AxisAngle = markerLayerOverlay.AxisAngle;
TileAlpha = markerLayerOverlay.TileAlpha;
}
public static MarkerLayer Deserialize(string path)
{
var yaml = MiniYaml.FromFile(path).First().Value;
return FieldLoader.Load<MarkerLayer>(yaml);
}
public List<MiniYamlNode> Serialize()
{
return [new("MarkerLayer", FieldSaver.Save(this))];
}
}
const double DegreesToRadians = Math.PI / 180;
@@ -134,24 +155,20 @@ namespace OpenRA.Mods.Common.Traits
if (string.IsNullOrWhiteSpace(world.Map.Package.Name))
return;
var markerTileFilename = $"{Path.GetFileNameWithoutExtension(world.Map.Package.Name)}.json";
var markerTileFilename = $"{Path.GetFileNameWithoutExtension(world.Map.Package.Name)}.yaml";
var markerTilePath = Path.Combine(directory, markerTileFilename);
if (!File.Exists(markerTilePath))
return;
using (var streamReader = new StreamReader(markerTilePath))
{
var content = streamReader.ReadToEnd();
var file = JsonConvert.DeserializeObject<MarkerLayerFile>(content);
var file = MarkerLayer.Deserialize(markerTilePath);
TileAlpha = file.TileAlpha;
MirrorMode = file.MirrorMode;
NumSides = file.NumSides;
AxisAngle = file.AxisAngle;
TileAlpha = file.TileAlpha;
MirrorMode = file.MirrorMode;
NumSides = file.NumSides;
AxisAngle = file.AxisAngle;
var savedTilesHashSetDictionary = file.Tiles.ToDictionary(x => x.Key, x => x.Value.Select(bits => new CPos(bits)).ToHashSet());
SetAll(savedTilesHashSetDictionary);
}
SetAll(file.Tiles.ToDictionary(d => d.Key, d => new HashSet<CPos>(d.Value)));
}
catch (Exception e)
{
@@ -160,19 +177,6 @@ namespace OpenRA.Mods.Common.Traits
}
}
public MarkerLayerFile ToFile()
{
var tilesBitsDictionary = Tiles.ToDictionary(x => x.Key, x => x.Value.Select(cpos => cpos.Bits).ToList());
return new MarkerLayerFile
{
Tiles = tilesBitsDictionary,
TileAlpha = TileAlpha,
MirrorMode = MirrorMode,
NumSides = NumSides,
AxisAngle = AxisAngle,
};
}
void UpdateTileAlpha()
{
for (var i = 0; i < Info.Colors.Length; i++)

12
OpenRA.Mods.Common/Widgets/Logic/Editor/SaveMapLogic.cs
View File

@@ -13,7 +13,6 @@ using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using Newtonsoft.Json;
using OpenRA.FileSystem;
using OpenRA.Mods.Common.Traits;
using OpenRA.Widgets;
@@ -347,14 +346,9 @@ namespace OpenRA.Mods.Common.Widgets.Logic
var directory = Path.Combine(Platform.SupportDir, "Editor", modData.Manifest.Id, mod.Version, "MarkerTiles");
Directory.CreateDirectory(directory);
var markerTilesFile = markerLayerOverlay.ToFile();
var markerTilesContent = JsonConvert.SerializeObject(markerTilesFile);
var markerTileFilename = $"{Path.GetFileNameWithoutExtension(map.Package.Name)}.json";
using (var streamWriter = new StreamWriter(Path.Combine(directory, markerTileFilename), false))
{
streamWriter.Write(markerTilesContent);
}
var markerTileFilename = $"{Path.GetFileNameWithoutExtension(map.Package.Name)}.yaml";
var markerLayer = new MarkerLayerOverlay.MarkerLayer(markerLayerOverlay);
markerLayer.Serialize().WriteToFile(Path.Combine(directory, markerTileFilename));
}
catch (Exception e)
{