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

6
OpenRA.Game/Graphics/CursorManager.cs
View File

@@ -72,10 +72,10 @@ namespace OpenRA.Graphics
// Resolve indexed data to real colours
var data = f.Data;
var type = f.Type;
if (type == SpriteFrameType.Indexed)
if (type == SpriteFrameType.Indexed8)
{
data = ConvertIndexedToBgra(kv.Key, f, palette);
type = SpriteFrameType.BGRA;
type = SpriteFrameType.Bgra32;
}
c.Sprites[c.Length++] = sheetBuilder.Add(data, type, f.Size, 0, hotspot);
@@ -226,7 +226,7 @@ namespace OpenRA.Graphics
public static byte[] ConvertIndexedToBgra(string name, ISpriteFrame frame, ImmutablePalette palette)
{
if (frame.Type != SpriteFrameType.Indexed)
if (frame.Type != SpriteFrameType.Indexed8)
throw new ArgumentException("ConvertIndexedToBgra requires input frames to be indexed.", nameof(frame));
// All palettes must be explicitly referenced, even if they are embedded in the sprite.

4
OpenRA.Game/Graphics/Sheet.cs
View File

@@ -82,7 +82,7 @@ namespace OpenRA.Graphics
if (Type == SheetType.Indexed)
throw new InvalidOperationException("AsPng() cannot be called on Indexed sheets.");
return new Png(GetData(), SpriteFrameType.BGRA, Size.Width, Size.Height);
return new Png(GetData(), SpriteFrameType.Bgra32, Size.Width, Size.Height);
}
public Png AsPng(TextureChannel channel, IPalette pal)
@@ -103,7 +103,7 @@ namespace OpenRA.Graphics
for (var i = 0; i < Palette.Size; i++)
palColors[i] = pal.GetColor(i);
return new Png(plane, SpriteFrameType.BGRA, Size.Width, Size.Height, palColors);
return new Png(plane, SpriteFrameType.Bgra32, Size.Width, Size.Height, palColors);
}
public void CreateBuffer()

10
OpenRA.Game/Graphics/SheetBuilder.cs
View File

@@ -52,14 +52,14 @@ namespace OpenRA.Graphics
{
switch (t)
{
case SpriteFrameType.Indexed:
case SpriteFrameType.Indexed8:
return SheetType.Indexed;
// Util.FastCopyIntoChannel will automatically convert these to BGRA
case SpriteFrameType.BGRA:
case SpriteFrameType.BGR:
case SpriteFrameType.RGBA:
case SpriteFrameType.RGB:
case SpriteFrameType.Bgra32:
case SpriteFrameType.Bgr24:
case SpriteFrameType.Rgba32:
case SpriteFrameType.Rgb24:
return SheetType.BGRA;
default: throw new NotImplementedException("Unknown SpriteFrameType {0}".F(t));
}

10
OpenRA.Game/Graphics/SpriteLoader.cs
View File

@@ -26,20 +26,20 @@ namespace OpenRA.Graphics
public enum SpriteFrameType
{
// 8 bit index into an external palette
Indexed,
Indexed8,
// 32 bit color such as returned by Color.ToArgb() or the bmp file format
// (remember that little-endian systems place the little bits in the first byte!)
BGRA,
Bgra32,
// Like BGRA, but without an alpha channel
BGR,
Bgr24,
// 32 bit color in big-endian format, like png
RGBA,
Rgba32,
// Like RGBA, but without an alpha channel
RGB
Rgb24
}
public interface ISpriteLoader

4
OpenRA.Game/Graphics/Theater.cs
View File

@@ -138,9 +138,9 @@ namespace OpenRA.Graphics
// 1x1px transparent tile
if (sheetBuilder.Type == SheetType.BGRA)
missingTile = sheetBuilder.Add(new byte[4], SpriteFrameType.BGRA, new Size(1, 1));
missingTile = sheetBuilder.Add(new byte[4], SpriteFrameType.Bgra32, new Size(1, 1));
else
missingTile = sheetBuilder.Add(new byte[1], SpriteFrameType.Indexed, new Size(1, 1));
missingTile = sheetBuilder.Add(new byte[1], SpriteFrameType.Indexed8, new Size(1, 1));
Sheet.ReleaseBuffer();
}

20
OpenRA.Game/Graphics/Util.cs
View File

@@ -88,23 +88,23 @@ namespace OpenRA.Graphics
byte r, g, b, a;
switch (srcType)
{
case SpriteFrameType.BGRA:
case SpriteFrameType.BGR:
case SpriteFrameType.Bgra32:
case SpriteFrameType.Bgr24:
{
b = src[k++];
g = src[k++];
r = src[k++];
a = srcType == SpriteFrameType.BGRA ? src[k++] : (byte)255;
a = srcType == SpriteFrameType.Bgra32 ? src[k++] : (byte)255;
break;
}
case SpriteFrameType.RGBA:
case SpriteFrameType.RGB:
case SpriteFrameType.Rgba32:
case SpriteFrameType.Rgb24:
{
r = src[k++];
g = src[k++];
b = src[k++];
a = srcType == SpriteFrameType.RGBA ? src[k++] : (byte)255;
a = srcType == SpriteFrameType.Rgba32 ? src[k++] : (byte)255;
break;
}
@@ -163,19 +163,19 @@ namespace OpenRA.Graphics
Color cc;
switch (src.Type)
{
case SpriteFrameType.Indexed:
case SpriteFrameType.Indexed8:
{
cc = src.Palette[src.Data[k++]];
break;
}
case SpriteFrameType.RGBA:
case SpriteFrameType.RGB:
case SpriteFrameType.Rgba32:
case SpriteFrameType.Rgb24:
{
var r = src.Data[k++];
var g = src.Data[k++];
var b = src.Data[k++];
var a = src.Type == SpriteFrameType.RGBA ? src.Data[k++] : (byte)255;
var a = src.Type == SpriteFrameType.Rgba32 ? src.Data[k++] : (byte)255;
cc = Color.FromArgb(a, r, g, b);
break;
}