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

Move tileset image validation to TerrainRendererInfo.

Browse Source
This commit is contained in:
Paul Chote
2020-10-14 10:47:12 +01:00
committed by reaperrr
parent 2782620081
commit 6d6efd5fe8
3 changed files with 54 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
OpenRA.Mods.Common/UtilityCommands/CheckMissingSprites.cs
View File

@@ -13,6 +13,7 @@ using System;
using System.Collections.Generic;
using OpenRA.Graphics;
using OpenRA.Mods.Common.Graphics;
using OpenRA.Mods.Common.Traits;
namespace OpenRA.Mods.Common.UtilityCommands
{
@@ -45,33 +46,11 @@ namespace OpenRA.Mods.Common.UtilityCommands
try
{
Console.WriteLine("Tileset: " + kv.Key);
var tileset = modData.DefaultTileSets[kv.Key];
var missingImages = new HashSet<string>();
Action<uint, string> onMissingImage = (id, f) =>
{
Console.WriteLine("\tTemplate `{0}` references sprite `{1}` that does not exist.", id, f);
missingImages.Add(f);
failed = true;
};
var terrainInfo = modData.DefaultTileSets[kv.Key];
var theater = new Theater(tileset, onMissingImage);
foreach (var t in tileset.Templates)
{
for (var v = 0; v < t.Value.Images.Length; v++)
{
if (!missingImages.Contains(t.Value.Images[v]))
{
for (var i = 0; i < t.Value.TilesCount; i++)
{
if (t.Value[i] == null || theater.HasTileSprite(new TerrainTile(t.Key, (byte)i), v))
continue;
Console.WriteLine("\tTemplate `{0}` references frame {1} that does not exist in sprite `{2}`.", t.Key, i, t.Value.Images[v]);
failed = true;
}
}
}
}
if (terrainInfo is ITemplatedTerrainInfo templatedTerrainInfo)
foreach (var r in modData.DefaultRules.Actors["world"].TraitInfos<ITiledTerrainRendererInfo>())
failed |= r.ValidateTileSprites(templatedTerrainInfo, Console.WriteLine);
foreach (var image in kv.Value.Images)
{