Make terrain tiles ISpriteSources.

OpenRA.FileFormats/Graphics/SpriteSource.cs

@@ -179,6 +179,10 @@ namespace OpenRA.FileFormats
 					return new ShpTSReader(s);
 				case SpriteType.R8:
 					return new R8Reader(s);
+				case SpriteType.TmpRA:
+					return new TmpRAReader(s);
+				case SpriteType.TmpTD:
+					return new TmpTDReader(s);
 				case SpriteType.Unknown:
 				default:
 					throw new InvalidDataException(filename + " is not a valid sprite file");

OpenRA.FileFormats/Graphics/TileSetRenderer.cs

@@ -11,6 +11,7 @@
 using System.Collections.Generic;
 using System.Drawing;
 using System.Drawing.Imaging;
+using System.IO;
 using System.Linq;
 
 namespace OpenRA.FileFormats
@@ -33,7 +34,22 @@ namespace OpenRA.FileFormats
 			}
 
 			using (var s = FileSystem.OpenWithExts(filename, exts))
-				return new Terrain(s).TileBitmapBytes;
+			{
+				var type = SpriteSource.DetectSpriteType(s);
+				ISpriteSource source;
+				switch (type)
+				{
+					case SpriteType.TmpTD:
+						source = new TmpTDReader(s);
+						break;
+					case SpriteType.TmpRA:
+						source = new TmpRAReader(s);
+						break;
+					default:
+						throw new InvalidDataException(filename + " is not a valid terrain tile");
+				}
+				return source.Frames.Select(f => f.Data).ToList();
+			}
 		}
 
 		public TileSetRenderer(TileSet tileset, Size tileSize)

OpenRA.FileFormats/Graphics/TmpRAReader.cs

@@ -0,0 +1,49 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2013 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see COPYING.
+ */
+#endregion
+
+using System.Collections.Generic;
+using System.Drawing;
+using System.IO;
+using System.Linq;
+
+namespace OpenRA.FileFormats
+{
+	public class TmpRAReader : ISpriteSource
+	{
+		readonly List<TmpTile> tiles = new List<TmpTile>();
+		public IEnumerable<ISpriteFrame> Frames { get { return tiles.Cast<ISpriteFrame>(); } }
+
+		public TmpRAReader(Stream s)
+		{
+			var width = s.ReadUInt16();
+			var height = s.ReadUInt16();
+			var size = new Size(width, height);
+
+			s.Position += 12;
+			var imgStart = s.ReadUInt32();
+			s.Position += 8;
+			var indexEnd = s.ReadInt32();
+			s.Position += 4;
+			var indexStart = s.ReadInt32();
+
+			s.Position = indexStart;
+			foreach (byte b in s.ReadBytes(indexEnd - indexStart))
+			{
+				if (b != 255)
+				{
+					s.Position = imgStart + b * width * height;
+					tiles.Add(new TmpTile(s.ReadBytes(width * height), size));
+				}
+				else
+					tiles.Add(new TmpTile(null, size));
+			}
+		}
+	}
+}

OpenRA.FileFormats/Graphics/TmpTDReader.cs

@@ -0,0 +1,67 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2013 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see COPYING.
+ */
+#endregion
+
+using System.Collections.Generic;
+using System.Drawing;
+using System.Linq;
+using System.IO;
+
+namespace OpenRA.FileFormats
+{
+	public class TmpTile : ISpriteFrame
+	{
+		public Size Size { get; private set; }
+		public Size FrameSize { get; private set; }
+		public float2 Offset { get { return float2.Zero; } }
+		public byte[] Data { get; set; }
+
+		public TmpTile(byte[] data, Size size)
+		{
+			FrameSize = size;
+			Data = data;
+
+			if (data == null)
+				Data = new byte[0];
+			else
+				Size = size;
+		}
+	}
+
+	public class TmpTDReader : ISpriteSource
+	{
+		readonly List<TmpTile> tiles = new List<TmpTile>();
+		public IEnumerable<ISpriteFrame> Frames { get { return tiles.Cast<ISpriteFrame>(); } }
+
+		public TmpTDReader(Stream s)
+		{
+			var width = s.ReadUInt16();
+			var height = s.ReadUInt16();
+			var size = new Size(width, height);
+
+			s.Position += 8;
+			var imgStart = s.ReadUInt32();
+			s.Position += 8;
+			var indexEnd = s.ReadInt32();
+			var indexStart = s.ReadInt32();
+
+			s.Position = indexStart;
+			foreach (byte b in s.ReadBytes(indexEnd - indexStart))
+			{
+				if (b != 255)
+				{
+					s.Position = imgStart + b * width * height;
+					tiles.Add(new TmpTile(s.ReadBytes(width * height), size));
+				}
+				else
+					tiles.Add(new TmpTile(null, size));
+			}
+		}
+	}
+}