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

Make ISpriteLoader aware of the source file name.

Browse Source
This commit is contained in:
Andre Mohren
2021-03-11 12:09:54 +01:00
committed by reaperrr
parent d60c05eff3
commit 3f510b6d93
13 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Mods.Common/SpriteLoaders/DdsLoader.cs
View File

@@ -28,7 +28,7 @@ namespace OpenRA.Mods.Common.SpriteLoaders
return isDds;
}
public bool TryParseSprite(Stream s, out ISpriteFrame[] frames, out TypeDictionary metadata)
public bool TryParseSprite(Stream s, string filename, out ISpriteFrame[] frames, out TypeDictionary metadata)
{
metadata = null;
if (!IsDds(s))

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

@@ -42,7 +42,7 @@ namespace OpenRA.Mods.Common.SpriteLoaders
public bool DisableExportPadding => false;
}
public bool TryParseSprite(Stream s, out ISpriteFrame[] frames, out TypeDictionary metadata)
public bool TryParseSprite(Stream s, string filename, out ISpriteFrame[] frames, out TypeDictionary metadata)
{
metadata = null;
frames = null;

2
OpenRA.Mods.Common/SpriteLoaders/ShpTSLoader.cs
View File

@@ -146,7 +146,7 @@ namespace OpenRA.Mods.Common.SpriteLoaders
return frames;
}
public bool TryParseSprite(Stream s, out ISpriteFrame[] frames, out TypeDictionary metadata)
public bool TryParseSprite(Stream s, string filename, out ISpriteFrame[] frames, out TypeDictionary metadata)
{
metadata = null;
if (!IsShpTS(s))

2
OpenRA.Mods.Common/SpriteLoaders/TgaLoader.cs
View File

@@ -50,7 +50,7 @@ namespace OpenRA.Mods.Common.SpriteLoaders
}
}
public bool TryParseSprite(Stream s, out ISpriteFrame[] frames, out TypeDictionary metadata)
public bool TryParseSprite(Stream s, string filename, out ISpriteFrame[] frames, out TypeDictionary metadata)
{
metadata = null;
if (!IsTga(s))

2
OpenRA.Mods.Common/UtilityCommands/ConvertSpriteToPngCommand.cs
View File

@@ -49,7 +49,7 @@ namespace OpenRA.Mods.Common.UtilityCommands
for (var i = 0; i < Palette.Size; i++)
palColors[i] = palette.GetColor(i);
var frames = FrameLoader.GetFrames(File.OpenRead(src), modData.SpriteLoaders, out _);
var frames = FrameLoader.GetFrames(File.OpenRead(src), modData.SpriteLoaders, src, out _);
var usePadding = !args.Contains("--nopadding");
var count = 0;