Merge pull request #3684 from pchote/tileset-fixup

TileSet Refactoring

OpenRA.Game/Graphics/TerrainRenderer.cs

@@ -18,7 +18,6 @@ namespace OpenRA.Graphics
 {
 	class TerrainRenderer
 	{
-		SheetBuilder sheetBuilder;
 		IVertexBuffer<Vertex> vertexBuffer;
 
 		World world;
@@ -29,23 +28,6 @@ namespace OpenRA.Graphics
 			this.world = world;
 			this.map = world.Map;
 
-			var allocated = false;
-			Func<Sheet> allocate = () =>
-			{
-				if (allocated)
-					throw new SheetOverflowException("Terrain sheet overflow");
-				allocated = true;
-
-				// TODO: Use a fixed sheet size specified in the tileset yaml
-				return SheetBuilder.AllocateSheet();
-			};
-
-			sheetBuilder = new SheetBuilder(SheetType.Indexed, allocate);
-
-			var tileSize = new Size(Game.CellSize, Game.CellSize);
-			var tileMapping = new Cache<TileReference<ushort,byte>, Sprite>(
-				x => sheetBuilder.Add(world.TileSet.GetBytes(x), tileSize));
-
 			var terrainPalette = wr.Palette("terrain").Index;
 			var vertices = new Vertex[4 * map.Bounds.Height * map.Bounds.Width];
 			int nv = 0;
@@ -53,7 +35,7 @@ namespace OpenRA.Graphics
 			for (var j = map.Bounds.Top; j < map.Bounds.Bottom; j++)
 				for (var i = map.Bounds.Left; i < map.Bounds.Right; i++)
 				{
-					var tile = tileMapping[map.MapTiles.Value[i, j]];
+					var tile = wr.Theater.TileSprite(map.MapTiles.Value[i, j]);
 					Util.FastCreateQuad(vertices, Game.CellSize * new float2(i, j), tile, terrainPalette, nv, tile.size);
 					nv += 4;
 				}
@@ -96,7 +78,7 @@ namespace OpenRA.Graphics
 
 			Game.Renderer.WorldSpriteRenderer.DrawVertexBuffer(
 				vertexBuffer, verticesPerRow * firstRow, verticesPerRow * (lastRow - firstRow),
-				PrimitiveType.QuadList, sheetBuilder.Current);
+				PrimitiveType.QuadList, wr.Theater.Sheet);
 
 			foreach (var r in world.WorldActor.TraitsImplementing<IRenderOverlay>())
 				r.Render(wr);

OpenRA.Game/Graphics/Theater.cs

@@ -0,0 +1,85 @@
+#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;
+using System.Collections.Generic;
+using System.Drawing;
+using System.IO;
+using System.Linq;
+using OpenRA.FileFormats;
+using OpenRA.FileFormats.Graphics;
+using OpenRA.Traits;
+
+namespace OpenRA.Graphics
+{
+	public class Theater
+	{
+		SheetBuilder sheetBuilder;
+		Dictionary<ushort, Sprite[]> templates;
+		Sprite missingTile;
+
+		Sprite[] LoadTemplate(string filename, string[] exts, Cache<string, R8Reader> r8Cache, int[] frames)
+		{
+			if (exts.Contains(".R8") && FileSystem.Exists(filename+".R8"))
+			{
+				return frames.Select(f =>
+				{
+					if (f < 0)
+						return null;
+
+					var image = r8Cache[filename][f];
+					return sheetBuilder.Add(image.Image, new Size(image.Size.Width, image.Size.Height));
+				}).ToArray();
+			}
+
+			using (var s = FileSystem.OpenWithExts(filename, exts))
+			{
+				var t = new Terrain(s);
+				return t.TileBitmapBytes
+					.Select(b => b != null ? sheetBuilder.Add(b, new Size(t.Width, t.Height)) : null)
+					.ToArray();
+			}
+		}
+
+		public Theater(TileSet tileset)
+		{
+			var allocated = false;
+			Func<Sheet> allocate = () =>
+			{
+				if (allocated)
+					throw new SheetOverflowException("Terrain sheet overflow. Try increasing the tileset SheetSize parameter.");
+				allocated = true;
+
+				return new Sheet(new Size(tileset.SheetSize, tileset.SheetSize));
+			};
+
+			var r8Cache = new Cache<string, R8Reader>(s => new R8Reader(FileSystem.OpenWithExts(s, ".R8")));
+			templates = new Dictionary<ushort, Sprite[]>();
+			sheetBuilder = new SheetBuilder(SheetType.Indexed, allocate);
+			foreach (var t in tileset.Templates)
+				templates.Add(t.Value.Id, LoadTemplate(t.Value.Image, tileset.Extensions, r8Cache, t.Value.Frames));
+
+			// 1x1px transparent tile
+			missingTile = sheetBuilder.Add(new byte[1], new Size(1, 1));
+		}
+
+		public Sprite TileSprite(TileReference<ushort, byte> r)
+		{
+			Sprite[] template;
+			if (templates.TryGetValue(r.type, out template))
+				if (template.Length > r.index && template[r.index] != null)
+					return template[r.index];
+
+			return missingTile;
+		}
+
+		public Sheet Sheet { get { return sheetBuilder.Current; } }
+	}
+}

OpenRA.Game/Graphics/WorldRenderer.cs

@@ -33,6 +33,8 @@ namespace OpenRA.Graphics
 	public class WorldRenderer
 	{
 		public readonly World world;
+		public readonly Theater Theater;
+
 		internal readonly TerrainRenderer terrainRenderer;
 		internal readonly ShroudRenderer shroudRenderer;
 		internal readonly HardwarePalette palette;
@@ -50,6 +52,7 @@ namespace OpenRA.Graphics
 
 			palette.Initialize();
 
+			Theater = new Theater(world.TileSet);
 			terrainRenderer = new TerrainRenderer(world, this);
 			shroudRenderer = new ShroudRenderer(world);
 
@@ -117,10 +120,6 @@ namespace OpenRA.Graphics
 			Game.Renderer.EnableScissor(bounds.Left, bounds.Top, bounds.Width, bounds.Height);
 
 			terrainRenderer.Draw(this, Game.viewport);
-			foreach (var a in world.traitDict.ActorsWithTraitMultiple<IRenderAsTerrain>(world))
-				foreach (var r in a.Trait.RenderAsTerrain(this, a.Actor))
-					r.Render(this);
-
 			Game.Renderer.Flush();
 
 			for (var i = 0; i < renderables.Count; i++)