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

Rename SpriteFrameType enums.

Browse Source
This commit is contained in:
Paul Chote
2020-12-19 11:31:39 +00:00
committed by abcdefg30
parent ce09b402d0
commit 62fa3b7c9c
19 changed files with 55 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenRA.Mods.Cnc/Graphics/VoxelLoader.cs
View File

@@ -77,8 +77,8 @@ namespace OpenRA.Mods.Cnc.Graphics
var size = new Size(su, sv);
var s = sheetBuilder.Allocate(size);
var t = sheetBuilder.Allocate(size);
OpenRA.Graphics.Util.FastCopyIntoChannel(s, colors, SpriteFrameType.Indexed);
OpenRA.Graphics.Util.FastCopyIntoChannel(t, normals, SpriteFrameType.Indexed);
OpenRA.Graphics.Util.FastCopyIntoChannel(s, colors, SpriteFrameType.Indexed8);
OpenRA.Graphics.Util.FastCopyIntoChannel(t, normals, SpriteFrameType.Indexed8);
// s and t are guaranteed to use the same sheet because
// of the custom voxel sheet allocation implementation

2
OpenRA.Mods.Cnc/SpriteLoaders/ShpD2Loader.cs
View File

@@ -30,7 +30,7 @@ namespace OpenRA.Mods.Cnc.SpriteLoaders
class ShpD2Frame : ISpriteFrame
{
public SpriteFrameType Type { get { return SpriteFrameType.Indexed; } }
public SpriteFrameType Type { get { return SpriteFrameType.Indexed8; } }
public Size Size { get; private set; }
public Size FrameSize { get { return Size; } }
public float2 Offset { get { return float2.Zero; } }

2
OpenRA.Mods.Cnc/SpriteLoaders/ShpTDLoader.cs
View File

@@ -77,7 +77,7 @@ namespace OpenRA.Mods.Cnc.SpriteLoaders
class ImageHeader : ISpriteFrame
{
public SpriteFrameType Type { get { return SpriteFrameType.Indexed; } }
public SpriteFrameType Type { get { return SpriteFrameType.Indexed8; } }
public Size Size { get { return reader.Size; } }
public Size FrameSize { get { return reader.Size; } }
public float2 Offset { get { return float2.Zero; } }

2
OpenRA.Mods.Cnc/SpriteLoaders/TmpRALoader.cs
View File

@@ -19,7 +19,7 @@ namespace OpenRA.Mods.Cnc.SpriteLoaders
{
class TmpRAFrame : ISpriteFrame
{
public SpriteFrameType Type { get { return SpriteFrameType.Indexed; } }
public SpriteFrameType Type { get { return SpriteFrameType.Indexed8; } }
public Size Size { get; private set; }
public Size FrameSize { get; private set; }
public float2 Offset { get { return float2.Zero; } }

2
OpenRA.Mods.Cnc/SpriteLoaders/TmpTDLoader.cs
View File

@@ -19,7 +19,7 @@ namespace OpenRA.Mods.Cnc.SpriteLoaders
{
class TmpTDFrame : ISpriteFrame
{
public SpriteFrameType Type { get { return SpriteFrameType.Indexed; } }
public SpriteFrameType Type { get { return SpriteFrameType.Indexed8; } }
public Size Size { get; private set; }
public Size FrameSize { get; private set; }
public float2 Offset { get { return float2.Zero; } }

4
OpenRA.Mods.Cnc/SpriteLoaders/TmpTSLoader.cs
View File

@@ -21,7 +21,7 @@ namespace OpenRA.Mods.Cnc.SpriteLoaders
{
readonly TmpTSFrame parent;
public SpriteFrameType Type { get { return SpriteFrameType.Indexed; } }
public SpriteFrameType Type { get { return SpriteFrameType.Indexed8; } }
public Size Size { get { return parent.Size; } }
public Size FrameSize { get { return Size; } }
public float2 Offset { get { return parent.Offset; } }
@@ -36,7 +36,7 @@ namespace OpenRA.Mods.Cnc.SpriteLoaders
class TmpTSFrame : ISpriteFrame
{
public SpriteFrameType Type { get { return SpriteFrameType.Indexed; } }
public SpriteFrameType Type { get { return SpriteFrameType.Indexed8; } }
public Size Size { get; private set; }
public Size FrameSize { get { return Size; } }
public float2 Offset { get; private set; }

2
OpenRA.Mods.Cnc/UtilityCommands/ConvertPngToShpCommand.cs
View File

@@ -36,7 +36,7 @@ namespace OpenRA.Mods.Cnc.UtilityCommands
var dest = inputFiles[0].Split('-').First() + ".shp";
var frames = inputFiles.Select(a => new Png(File.OpenRead(a))).ToList();
if (frames.Any(f => f.Type != SpriteFrameType.Indexed))
if (frames.Any(f => f.Type != SpriteFrameType.Indexed8))
throw new InvalidOperationException("All frames must be paletted");
var size = new Size(frames[0].Width, frames[0].Height);