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

Add palette checks for png sprites.

Browse Source
This commit is contained in:
Paul Chote
2018-12-23 00:18:40 +00:00
parent d2ee9bcad9
commit 49b04221b2
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
OpenRA.Mods.Common/SpriteLoaders/PngSheetLoader.cs
View File

@@ -45,13 +45,16 @@ namespace OpenRA.Mods.Common.SpriteLoaders
public bool TryParseSprite(Stream s, out ISpriteFrame[] frames, out TypeDictionary metadata) public bool TryParseSprite(Stream s, out ISpriteFrame[] frames, out TypeDictionary metadata)
{ {
metadata = null; metadata = null;
if (!Png.Verify(s))
{
frames = null; frames = null;
if (!Png.Verify(s))
return false; return false;
}
var png = new Png(s); var png = new Png(s);
// Only supports paletted images
if (png.Palette == null)
return false;
List<Rectangle> frameRegions; List<Rectangle> frameRegions;
List<float2> frameOffsets; List<float2> frameOffsets;

3
OpenRA.Mods.Common/UtilityCommands/ConvertPngToShpCommand.cs
View File

@@ -35,6 +35,9 @@ namespace OpenRA.Mods.Common.UtilityCommands
var dest = inputFiles[0].Split('-').First() + ".shp"; var dest = inputFiles[0].Split('-').First() + ".shp";
var frames = inputFiles.Select(a => new Png(File.OpenRead(a))).ToList(); var frames = inputFiles.Select(a => new Png(File.OpenRead(a))).ToList();
if (frames.Any(f => f.Palette == null))
throw new InvalidOperationException("All frames must be paletted");
var size = new Size(frames[0].Width, frames[0].Height); var size = new Size(frames[0].Width, frames[0].Height);
if (frames.Any(f => f.Width != size.Width || f.Height != size.Height)) if (frames.Any(f => f.Width != size.Width || f.Height != size.Height))
throw new InvalidOperationException("All frames must be the same size"); throw new InvalidOperationException("All frames must be the same size");