Add native support for the d2k R8 format.

OpenRA.FileFormats/Graphics/R8Reader.cs

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