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

Add native support for the d2k R8 format.

Browse Source
This commit is contained in:
Paul Chote
2013-07-16 19:38:30 +12:00
parent e8d7624867
commit acbd692de8
3 changed files with 92 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

118
OpenRA.FileFormats/Graphics/R8Reader.cs
View File

@@ -5,8 +5,6 @@
* available to you under the terms of the GNU General Public License * available to you under the terms of the GNU General Public License
* as published by the Free Software Foundation. For more information, * as published by the Free Software Foundation. For more information,
* see COPYING. * see COPYING.
* It also incorporates parts of http://code.google.com/p/dune2000plusone
* which is licensed under the BSD 2-Clause License.
*/ */
#endregion #endregion
@@ -20,102 +18,64 @@ namespace OpenRA.FileFormats
{ {
public class R8Image public class R8Image
{ {
public int Width; public readonly Size Size;
public int Height; public readonly int2 Offset;
public readonly byte[] Image;
public byte FrameWidth; // Legacy variable. Can be removed when the utility command is made sensible.
public byte FrameHeight; public readonly Size FrameSize;
public int ImageHandle; public R8Image(Stream s)
public int PaletteHandle;
public byte[] Image;
public int OffsetX;
public int OffsetY;
public R8Image(Stream s, int Frame)
{ {
var offset = s.Position; // Scan forward until we find some data
var ID = s.ReadUInt8(); // 0 = no data, 1 = picture with palette, 2 = picture with current palette var type = s.ReadUInt8();
while (ID == 0) while (type == 0)
ID = s.ReadUInt8(); type = s.ReadUInt8();
Width = s.ReadInt32(); //Width of picture
Height = s.ReadInt32(); //Height of picture
OffsetX = s.ReadInt32(); //Offset on X axis from left border edge of virtual frame
OffsetY = s.ReadInt32(); //Offset on Y axis from top border edge of virtual frame
ImageHandle = s.ReadInt32(); // 0 = no picture
PaletteHandle = s.ReadInt32(); // 0 = no palette
var Bpp = s.ReadUInt8(); // Bits per Pixel
FrameHeight = s.ReadUInt8(); // Height of virtual frame
FrameWidth = s.ReadUInt8(); // Width of virtual frame
var Align = s.ReadUInt8(); //Alignment on even border
Console.WriteLine("Offset: {0}",offset); var width = s.ReadInt32();
Console.WriteLine("ID: {0}",ID); var height = s.ReadInt32();
Console.WriteLine("Width: {0}",Width); var x = s.ReadInt32();
Console.WriteLine("Height: {0}",Height); var y = s.ReadInt32();
Console.WriteLine("OffsetX: {0}",OffsetX);
Console.WriteLine("OffsetY: {0}",OffsetY);
Console.WriteLine("ImageHandle: {0}",ImageHandle);
Console.WriteLine("PaletteHandle: {0}",PaletteHandle);
Console.WriteLine("Bpp: {0}",Bpp);
Console.WriteLine("FrameWidth: {0}",FrameWidth);
Console.WriteLine("FrameHeight: {0}",FrameHeight);
Console.WriteLine("Align: {0}",Align);
// Load image Size = new Size(width, height);
if (Bpp == 8) Offset = new int2(width/2 - x, height/2 - y);
Image = new byte[Width*Height];
else
throw new InvalidDataException("Error: {0} bits per pixel are not supported.".F(Bpp));
/*var imageOffset = */s.ReadInt32();
var paletteOffset = s.ReadInt32();
var bpp = s.ReadUInt8();
if (bpp != 8)
throw new InvalidDataException("Error: {0} bits per pixel are not supported.".F(bpp));
if (ID == 1 && PaletteHandle != 0) var frameHeight = s.ReadUInt8();
{ var frameWidth = s.ReadUInt8();
// read and ignore custom palette FrameSize = new Size(frameWidth, frameHeight);
s.ReadInt32(); //Memory
s.ReadInt32(); //Handle
for (int i = 0; i < Width*Height; i++) // Skip alignment byte
Image[i] = s.ReadUInt8(); s.ReadUInt8();
for (int i = 0; i < 256; i++)
s.ReadUInt16(); // Ignore palette header
} if (type == 1 && paletteOffset != 0)
else if (ID == 2 && PaletteHandle != 0) // image with custom palette s.Seek(8, SeekOrigin.Current);
{
for (int i = 0; i < Width*Height; i++) Image = s.ReadBytes(width*height);
Image[i] = s.ReadUInt8();
} // Ignore palette data
else //standard palette or 16 Bpp if (type == 1 && paletteOffset != 0)
{ s.Seek(512, SeekOrigin.Current);
for (int i = 0; i < Width*Height; i++)
Image[i] = s.ReadUInt8();
}
} }
} }
public class R8Reader : IEnumerable<R8Image> public class R8Reader : IEnumerable<R8Image>
{ {
private readonly List<R8Image> headers = new List<R8Image>(); readonly List<R8Image> headers = new List<R8Image>();
public readonly int Frames; public readonly int Frames;
public R8Reader(Stream stream) public R8Reader(Stream stream)
{ {
Frames = 0;
while (stream.Position < stream.Length) while (stream.Position < stream.Length)
{ {
try headers.Add(new R8Image(stream));
{ Frames++;
Console.WriteLine("Frame {0}: {1}",Frames, stream.Position);
headers.Add(new R8Image(stream, Frames));
Frames++;
}
catch (Exception e)
{
Console.WriteLine(e.Message);
break;
}
} }
} }

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

@@ -8,6 +8,7 @@
*/ */
#endregion #endregion
using System.Drawing;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using OpenRA.FileFormats; using OpenRA.FileFormats;
@@ -29,6 +30,13 @@ namespace OpenRA.Graphics
Sprite[] LoadSprites(string filename) Sprite[] LoadSprites(string filename)
{ {
// TODO: Cleanly abstract file type detection
if (filename.ToLower().EndsWith("r8"))
{
var r8 = new R8Reader(FileSystem.Open(filename));
return r8.Select(a => SheetBuilder.Add(a.Image, a.Size, a.Offset)).ToArray();
}
BinaryReader reader = new BinaryReader(FileSystem.OpenWithExts(filename, exts)); BinaryReader reader = new BinaryReader(FileSystem.OpenWithExts(filename, exts));
var ImageCount = reader.ReadUInt16(); var ImageCount = reader.ReadUInt16();

97
OpenRA.Utility/Command.cs
View File

@@ -132,12 +132,9 @@ namespace OpenRA.Utility
var FrameCount = endFrame - startFrame; var FrameCount = endFrame - startFrame;
var frame = srcImage[startFrame]; var frame = srcImage[startFrame];
var bitmap = new Bitmap(frame.FrameWidth * FrameCount, frame.FrameHeight, PixelFormat.Format8bppIndexed); var bitmap = new Bitmap(frame.FrameSize.Width * FrameCount, frame.FrameSize.Height, PixelFormat.Format8bppIndexed);
bitmap.Palette = palette.AsSystemPalette(); bitmap.Palette = palette.AsSystemPalette();
int OffsetX = 0;
int OffsetY = 0;
int x = 0; int x = 0;
frame = srcImage[startFrame]; frame = srcImage[startFrame];
@@ -150,22 +147,22 @@ namespace OpenRA.Utility
for (int f = startFrame+e-1; f > endFrame; f--) for (int f = startFrame+e-1; f > endFrame; f--)
{ {
OffsetX = frame.FrameWidth/2 - frame.Width/2; var OffsetX = frame.FrameSize.Width/2 - frame.Size.Width/2;
OffsetY = frame.FrameHeight/2 - frame.Height/2; var OffsetY = frame.FrameSize.Height/2 - frame.Size.Height/2;
Console.WriteLine("calculated OffsetX: {0}", OffsetX); Console.WriteLine("calculated OffsetX: {0}", OffsetX);
Console.WriteLine("calculated OffsetY: {0}", OffsetY); Console.WriteLine("calculated OffsetY: {0}", OffsetY);
var data = bitmap.LockBits(new Rectangle(x+OffsetX, 0+OffsetY, frame.Width, frame.Height), ImageLockMode.WriteOnly, var data = bitmap.LockBits(new Rectangle(x+OffsetX, 0+OffsetY, frame.Size.Width, frame.Size.Height), ImageLockMode.WriteOnly,
PixelFormat.Format8bppIndexed); PixelFormat.Format8bppIndexed);
for (var i = 0; i < frame.Height; i++) for (var i = 0; i < frame.Size.Height; i++)
Marshal.Copy(frame.Image, i * frame.Width, Marshal.Copy(frame.Image, i * frame.Size.Width,
new IntPtr(data.Scan0.ToInt64() + i * data.Stride), frame.Width); new IntPtr(data.Scan0.ToInt64() + i * data.Stride), frame.Size.Width);
bitmap.UnlockBits(data); bitmap.UnlockBits(data);
x += frame.FrameWidth; x += frame.FrameSize.Width;
frame = srcImage[f]; frame = srcImage[f];
Console.WriteLine("f: {0}", f); Console.WriteLine("f: {0}", f);
@@ -183,22 +180,22 @@ namespace OpenRA.Utility
for (int f = endFrame-1; f > startFrame-1; f--) for (int f = endFrame-1; f > startFrame-1; f--)
{ {
OffsetX = frame.FrameWidth/2 - frame.OffsetX; var OffsetX = frame.FrameSize.Width/2 - frame.Offset.X;
OffsetY = frame.FrameHeight/2 - frame.OffsetY; var OffsetY = frame.FrameSize.Height/2 - frame.Offset.Y;
Console.WriteLine("calculated OffsetX: {0}", OffsetX); Console.WriteLine("calculated OffsetX: {0}", OffsetX);
Console.WriteLine("calculated OffsetY: {0}", OffsetY); Console.WriteLine("calculated OffsetY: {0}", OffsetY);
var data = bitmap.LockBits(new Rectangle(x+OffsetX, 0+OffsetY, frame.Width, frame.Height), ImageLockMode.WriteOnly, var data = bitmap.LockBits(new Rectangle(x+OffsetX, 0+OffsetY, frame.Size.Width, frame.Size.Height), ImageLockMode.WriteOnly,
PixelFormat.Format8bppIndexed); PixelFormat.Format8bppIndexed);
for (var i = 0; i < frame.Height; i++) for (var i = 0; i < frame.Size.Height; i++)
Marshal.Copy(frame.Image, i * frame.Width, Marshal.Copy(frame.Image, i * frame.Size.Width,
new IntPtr(data.Scan0.ToInt64() + i * data.Stride), frame.Width); new IntPtr(data.Scan0.ToInt64() + i * data.Stride), frame.Size.Width);
bitmap.UnlockBits(data); bitmap.UnlockBits(data);
x += frame.FrameWidth; x += frame.FrameSize.Width;
frame = srcImage[f]; frame = srcImage[f];
} }
@@ -209,24 +206,22 @@ namespace OpenRA.Utility
for (int f = endFrame-1; f > startFrame-1; f--) for (int f = endFrame-1; f > startFrame-1; f--)
{ {
if (frame.OffsetX < 0) { frame.OffsetX = 0 - frame.OffsetX; } var OffsetX = Math.Abs(frame.Offset.X);
if (frame.OffsetY < 0) { frame.OffsetY = 0 - frame.OffsetY; } var OffsetY = frame.FrameSize.Height - Math.Abs(frame.Offset.Y);
OffsetX = 0 + frame.OffsetX;
OffsetY = frame.FrameHeight - frame.OffsetY;
Console.WriteLine("calculated OffsetX: {0}", OffsetX); Console.WriteLine("calculated OffsetX: {0}", OffsetX);
Console.WriteLine("calculated OffsetY: {0}", OffsetY); Console.WriteLine("calculated OffsetY: {0}", OffsetY);
var data = bitmap.LockBits(new Rectangle(x+OffsetX, 0+OffsetY, frame.Width, frame.Height), ImageLockMode.WriteOnly, var data = bitmap.LockBits(new Rectangle(x+OffsetX, 0+OffsetY, frame.Size.Width, frame.Size.Height), ImageLockMode.WriteOnly,
PixelFormat.Format8bppIndexed); PixelFormat.Format8bppIndexed);
for (var i = 0; i < frame.Height; i++) for (var i = 0; i < frame.Size.Height; i++)
Marshal.Copy(frame.Image, i * frame.Width, Marshal.Copy(frame.Image, i * frame.Size.Width,
new IntPtr(data.Scan0.ToInt64() + i * data.Stride), frame.Width); new IntPtr(data.Scan0.ToInt64() + i * data.Stride), frame.Size.Width);
bitmap.UnlockBits(data); bitmap.UnlockBits(data);
x += frame.FrameWidth; x += frame.FrameSize.Width;
frame = srcImage[f]; frame = srcImage[f];
} }
@@ -240,29 +235,27 @@ namespace OpenRA.Utility
frame = srcImage[f]; frame = srcImage[f];
if (frame.OffsetX < 0) { frame.OffsetX = 0 - frame.OffsetX; } var OffsetX = Math.Abs(frame.Offset.X);
if (frame.OffsetY < 0) { frame.OffsetY = 0 - frame.OffsetY; } var OffsetY = frame.FrameSize.Height - Math.Abs(frame.Offset.Y);
OffsetX = 0 + frame.OffsetX;
OffsetY = frame.FrameHeight - frame.OffsetY;
Console.WriteLine("calculated OffsetX: {0}", OffsetX); Console.WriteLine("calculated OffsetX: {0}", OffsetX);
Console.WriteLine("calculated OffsetY: {0}", OffsetY); Console.WriteLine("calculated OffsetY: {0}", OffsetY);
var data = bitmap.LockBits(new Rectangle(x+OffsetX, 0+OffsetY, frame.Width, frame.Height), ImageLockMode.WriteOnly, var data = bitmap.LockBits(new Rectangle(x+OffsetX, 0+OffsetY, frame.Size.Width, frame.Size.Height), ImageLockMode.WriteOnly,
PixelFormat.Format8bppIndexed); PixelFormat.Format8bppIndexed);
for (var i = 0; i < frame.Height; i++) for (var i = 0; i < frame.Size.Height; i++)
Marshal.Copy(frame.Image, i * frame.Width, Marshal.Copy(frame.Image, i * frame.Size.Width,
new IntPtr(data.Scan0.ToInt64() + i * data.Stride), frame.Width); new IntPtr(data.Scan0.ToInt64() + i * data.Stride), frame.Size.Width);
bitmap.UnlockBits(data); bitmap.UnlockBits(data);
x += frame.FrameWidth; x += frame.FrameSize.Width;
} }
} }
else if (args.Contains("--tileset")) else if (args.Contains("--tileset"))
{ {
int f = 0; int f = 0;
var tileset = new Bitmap(frame.FrameWidth * 20, frame.FrameHeight * 40, PixelFormat.Format8bppIndexed); var tileset = new Bitmap(frame.FrameSize.Width * 20, frame.FrameSize.Height * 40, PixelFormat.Format8bppIndexed);
tileset.Palette = palette.AsSystemPalette(); tileset.Palette = palette.AsSystemPalette();
for (int h = 0; h < 40; h++) for (int h = 0; h < 40; h++)
@@ -274,12 +267,12 @@ namespace OpenRA.Utility
Console.WriteLine(f); Console.WriteLine(f);
frame = srcImage[f]; frame = srcImage[f];
var data = tileset.LockBits(new Rectangle(w * frame.Width, h * frame.Height, frame.Width, frame.Height), var data = tileset.LockBits(new Rectangle(w * frame.Size.Width, h * frame.Size.Height, frame.Size.Width, frame.Size.Height),
ImageLockMode.WriteOnly, PixelFormat.Format8bppIndexed); ImageLockMode.WriteOnly, PixelFormat.Format8bppIndexed);
for (var i = 0; i < frame.Height; i++) for (var i = 0; i < frame.Size.Height; i++)
Marshal.Copy(frame.Image, i * frame.Width, Marshal.Copy(frame.Image, i * frame.Size.Width,
new IntPtr(data.Scan0.ToInt64() + i * data.Stride), frame.Width); new IntPtr(data.Scan0.ToInt64() + i * data.Stride), frame.Size.Width);
tileset.UnlockBits(data); tileset.UnlockBits(data);
f++; f++;
@@ -293,31 +286,31 @@ namespace OpenRA.Utility
for (int f = startFrame; f < endFrame; f++) for (int f = startFrame; f < endFrame; f++)
{ {
frame = srcImage[f]; frame = srcImage[f];
int OffsetX = 0;
int OffsetY = 0;
if (args.Contains("--infantrydeath")) if (args.Contains("--infantrydeath"))
{ {
OffsetX = frame.FrameWidth/2 - frame.Width/2; OffsetX = frame.FrameSize.Width/2 - frame.Size.Width/2;
OffsetY = frame.FrameHeight/2 - frame.Height/2; OffsetY = frame.FrameSize.Height/2 - frame.Size.Height/2;
} }
else if (args.Contains("--building")) else if (args.Contains("--building"))
{ {
if (frame.OffsetX < 0) { frame.OffsetX = 0 - frame.OffsetX; } OffsetX = Math.Abs(frame.Offset.X);
if (frame.OffsetY < 0) { frame.OffsetY = 0 - frame.OffsetY; } OffsetY = frame.FrameSize.Height - Math.Abs(frame.Offset.Y);
OffsetX = 0 + frame.OffsetX;
OffsetY = frame.FrameHeight - frame.OffsetY;
} }
Console.WriteLine("calculated OffsetX: {0}", OffsetX); Console.WriteLine("calculated OffsetX: {0}", OffsetX);
Console.WriteLine("calculated OffsetY: {0}", OffsetY); Console.WriteLine("calculated OffsetY: {0}", OffsetY);
var data = bitmap.LockBits(new Rectangle(x+OffsetX, 0+OffsetY, frame.Width, frame.Height), ImageLockMode.WriteOnly, var data = bitmap.LockBits(new Rectangle(x+OffsetX, 0+OffsetY, frame.Size.Width, frame.Size.Height), ImageLockMode.WriteOnly,
PixelFormat.Format8bppIndexed); PixelFormat.Format8bppIndexed);
for (var i = 0; i < frame.Height; i++) for (var i = 0; i < frame.Size.Height; i++)
Marshal.Copy(frame.Image, i * frame.Width, Marshal.Copy(frame.Image, i * frame.Size.Width,
new IntPtr(data.Scan0.ToInt64() + i * data.Stride), frame.Width); new IntPtr(data.Scan0.ToInt64() + i * data.Stride), frame.Size.Width);
bitmap.UnlockBits(data); bitmap.UnlockBits(data);
x += frame.FrameWidth; x += frame.FrameSize.Width;
} }
} }
bitmap.Save(filename+".png"); bitmap.Save(filename+".png");