git-svn-id: svn://svn.ijw.co.nz/svn/OpenRa@1199 993157c7-ee19-0410-b2c4-bb4e9862e678

OpenRa.Game/HardwarePalette.cs

@@ -19,9 +19,16 @@ namespace OpenRa.Game
 
 		Texture paletteTexture;
 
-		public HardwarePalette(GraphicsDevice device)
+		public HardwarePalette(GraphicsDevice device, Map map)
 		{
 			this.device = device;
+
+			Palette pal = new Palette(File.OpenRead("../../../" + map.Theater + ".pal"));
+			AddPalette(pal);
+
+			foreach (string remap in new string[] { "blue", "red", "orange", "teal", "salmon", "green", "gray" })
+				AddPalette(new Palette(pal, new PaletteRemap(
+					File.OpenRead("../../../" + remap + ".rem"))));
 		}
 
 		void Resolve()
@@ -44,7 +51,7 @@ namespace OpenRa.Game
 			}
 		}
 
-		public int AddPalette(Palette p)
+		int AddPalette(Palette p)
 		{
 			for (int i = 0; i < 256; i++)
 				bitmap.SetPixel(i, allocated, p.GetColor(i));

OpenRa.Game/MainWindow.cs

@@ -13,36 +13,37 @@ namespace OpenRa.Game
 	class MainWindow : Form
 	{
 		readonly Renderer renderer;
-
 		readonly Map map;
-		readonly TileSet tileSet;
 		
-		Palette pal, playerPal;
 		Package TileMix;
-		string TileSuffix;
-
-		Dictionary<TileReference, SheetRectangle<Sheet>> tileMapping =
-			new Dictionary<TileReference, SheetRectangle<Sheet>>();
-
-		FvfVertexBuffer<Vertex> vertexBuffer;
-
-		Dictionary<Sheet, IndexBuffer> drawBatches = new Dictionary<Sheet, IndexBuffer>();
 
 		World world;
 		TreeCache treeCache;
+		TerrainRenderer terrain;
 
-		void LoadTextures()
+		static Size GetResolution(Settings settings)
 		{
-			Size tileSize = new Size(24, 24);
+			Size desktopResolution = Screen.PrimaryScreen.Bounds.Size;
 
-			for (int i = 0; i < map.Width; i++)
-				for (int j = 0; j < map.Height; j++)
-				{
-					TileReference tileRef = map.MapTiles[i + map.XOffset, j + map.YOffset];
+			return new Size(settings.GetValue("width", desktopResolution.Width),
+				settings.GetValue("height", desktopResolution.Height));
+		}
 
-					if (!tileMapping.ContainsKey(tileRef))
-						tileMapping.Add(tileRef, CoreSheetBuilder.Add(tileSet.GetBytes(tileRef), tileSize));
-				}
+		public MainWindow( Settings settings )
+		{
+			FormBorderStyle = FormBorderStyle.None;
+			BackColor = Color.Black;
+			renderer = new Renderer(this, GetResolution(settings), false);
+			Visible = true;
+
+			CoreSheetBuilder.Initialize(renderer.Device);
+
+			map = new Map(new IniFile(File.OpenRead("../../../" + settings.GetValue("map", "scm12ea.ini"))));
+
+			TileMix = new Package("../../../" + map.Theater + ".mix");
+
+			renderer.SetPalette(new HardwarePalette(renderer.Device, map));
+			terrain = new TerrainRenderer(renderer, map, TileMix);
 
 			world = new World(renderer.Device);
 			treeCache = new TreeCache(renderer.Device, map, TileMix);
@@ -60,63 +61,6 @@ namespace OpenRa.Game
 			world.Add(new Mcv(new PointF(24 * 9, 24 * 5), 1));
 		}
 
-		void LoadVertexBuffer()
-		{
-			Dictionary<Sheet, List<ushort>> indexMap = new Dictionary<Sheet, List<ushort>>();
-			List<Vertex> vertices = new List<Vertex>();
-
-			for (int j = 0; j < map.Height; j++)
-				for (int i = 0; i < map.Width; i++)
-				{
-					SheetRectangle<Sheet> tile = tileMapping[map.MapTiles[i + map.XOffset, j + map.YOffset]];
-
-					List<ushort> indexList;
-					if (!indexMap.TryGetValue(tile.sheet, out indexList))
-						indexMap.Add(tile.sheet, indexList = new List<ushort>());
-
-					Util.CreateQuad(vertices, indexList, new PointF(24 * i, 24 * j), tile, 0);
-				}
-
-			vertexBuffer = new FvfVertexBuffer<Vertex>(renderer.Device, vertices.Count, Vertex.Format);
-			vertexBuffer.SetData(vertices.ToArray());
-
-			foreach (KeyValuePair<Sheet, List<ushort>> p in indexMap)
-			{
-				IndexBuffer indexBuffer = new IndexBuffer(renderer.Device, p.Value.Count);
-				indexBuffer.SetData(p.Value.ToArray());
-				drawBatches.Add(p.Key, indexBuffer);
-			}
-		}
-
-		static Size GetResolution(Settings settings)
-		{
-			Size desktopResolution = Screen.PrimaryScreen.Bounds.Size;
-
-			return new Size(settings.GetValue("width", desktopResolution.Width),
-				settings.GetValue("height", desktopResolution.Height));
-		}
-
-		public MainWindow( Settings settings )
-		{
-			FormBorderStyle = FormBorderStyle.None;
-			renderer = new Renderer(this, GetResolution(settings), false);
-			Visible = true;
-
-			CoreSheetBuilder.Initialize(renderer.Device);
-
-			string mapName = settings.GetValue("map", "scm12ea.ini");
-
-			IniFile mapFile = new IniFile(File.OpenRead("../../../" + mapName));
-			map = new Map(mapFile);
-
-			Text = string.Format("OpenRA - {0} - {1}", map.Title, mapName);
-
-			tileSet = LoadTileSet(map);
-
-			LoadTextures();
-			LoadVertexBuffer();
-		}
-
 		internal void Run()
 		{
 			while (Created && Visible)
@@ -126,8 +70,7 @@ namespace OpenRa.Game
 			}
 		}
 
-		PointF scrollPos = new PointF(1, 5);
-		PointF oldPos;
+		PointF scrollPos, oldPos;
 		int x1,y1;
 
 		protected override void OnMouseDown(MouseEventArgs e)
@@ -158,8 +101,7 @@ namespace OpenRa.Game
 
 			renderer.BeginFrame(r1, r2, scrollPos);
 
-			foreach (KeyValuePair<Sheet, IndexBuffer> batch in drawBatches)
-				DrawTerrainBatch(batch);
+			terrain.Draw( ClientSize, scrollPos );
 
 			world.Draw(renderer,
 				new Range<float>(scrollPos.X, scrollPos.X + ClientSize.Width),
@@ -167,54 +109,5 @@ namespace OpenRa.Game
 
 			renderer.EndFrame();
 		}
-
-		void DrawTerrainBatch(KeyValuePair<Sheet, IndexBuffer> batch)
-		{
-			int indicesPerRow = map.Width * 6;
-			int verticesPerRow = map.Width * 4;
-
-			int visibleRows = (int)(ClientSize.Height / 24.0f + 2);
-
-			int firstRow = (int)(scrollPos.Y / 24.0f);
-			int lastRow = firstRow + visibleRows;
-
-			if (lastRow < 0 || firstRow > map.Height)
-				return;
-
-			if (firstRow < 0) firstRow = 0;
-			if (lastRow > map.Height) lastRow = map.Height;
-
-			renderer.DrawWithShader(ShaderQuality.Low, delegate
-			{
-				renderer.DrawBatch(vertexBuffer, batch.Value, 
-					new Range<int>(verticesPerRow * firstRow, verticesPerRow * lastRow), 
-					new Range<int>(indicesPerRow * firstRow, indicesPerRow * lastRow), 
-					batch.Key.Texture);
-			});
-		}
-
-		TileSet LoadTileSet(Map currentMap)
-		{
-			string theaterName = currentMap.Theater;
-			if (theaterName.Length > 8)
-				theaterName = theaterName.Substring(0, 8);
-
-			pal = new Palette(File.OpenRead("../../../" + theaterName + ".pal"));
-			TileMix = new Package("../../../" + theaterName + ".mix");
-			TileSuffix = "." + theaterName.Substring(0, 3);
-
-			playerPal = new Palette(pal, new PaletteRemap(File.OpenRead("../../../red.rem")));
-
-			HardwarePalette hardwarePalette = new HardwarePalette(renderer.Device);
-			hardwarePalette.AddPalette(pal);
-
-			foreach (string remap in new string[] { "blue", "red", "orange", "teal", "salmon", "green", "gray" })
-				hardwarePalette.AddPalette(new Palette(pal, new PaletteRemap(
-					File.OpenRead("../../../" + remap + ".rem"))));
-
-			renderer.SetPalette(hardwarePalette);
-
-			return new TileSet(TileMix, TileSuffix, pal);
-		}
 	}
 }

OpenRa.Game/Mcv.cs

@@ -23,7 +23,7 @@ namespace OpenRa.Game
 
 		public override SheetRectangle<Sheet>[] CurrentImages
 		{
-			get { return new SheetRectangle<Sheet>[] { UnitSheetBuilder.McvSheet[ GetFacing() ] }; }
+			get { return new SheetRectangle<Sheet>[] { UnitSheetBuilder.McvSheet[GetFacing()] }; }
 		}
 	}
 }

OpenRa.Game/OpenRa.Game.csproj

@@ -54,6 +54,7 @@
     <Compile Include="Settings.cs" />
     <Compile Include="Sheet.cs" />
     <Compile Include="Sidebar.cs" />
+    <Compile Include="TerrainRenderer.cs" />
     <Compile Include="Tree.cs" />
     <Compile Include="TreeCache.cs" />
     <Compile Include="UnitSheetBuilder.cs" />

OpenRa.Game/TerrainRenderer.cs

@@ -0,0 +1,82 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using OpenRa.FileFormats;
+using BluntDirectX.Direct3D;
+using System.Drawing;
+using System.IO;
+
+namespace OpenRa.Game
+{
+	class TerrainRenderer
+	{
+		FvfVertexBuffer<Vertex> vertexBuffer;
+		IndexBuffer indexBuffer;
+		Sheet terrainSheet;
+		TileSet tileSet;
+
+		Renderer renderer;
+		Map map;
+
+		public TerrainRenderer(Renderer renderer, Map map, Package tilePackage)
+		{
+			this.renderer = renderer;
+			this.map = map;
+
+			tileSet = new TileSet(tilePackage, map.TileSuffix);
+
+			Dictionary<TileReference, SheetRectangle<Sheet>> tileMapping =
+				new Dictionary<TileReference, SheetRectangle<Sheet>>();
+
+			Size tileSize = new Size(24, 24);
+
+			List<Vertex> vertices = new List<Vertex>();
+			List<ushort> indices = new List<ushort>();
+
+			for (int j = 0; j < map.Height; j++)
+				for (int i = 0; i < map.Width; i++)
+				{
+					TileReference tileRef = map.MapTiles[i + map.XOffset, j + map.YOffset];
+					SheetRectangle<Sheet> tile;
+
+					if (!tileMapping.TryGetValue(tileRef, out tile))
+						tileMapping.Add(tileRef, tile = CoreSheetBuilder.Add(tileSet.GetBytes(tileRef), tileSize));
+
+					terrainSheet = tile.sheet;
+
+					Util.CreateQuad(vertices, indices, new PointF(24 * i, 24 * j), tile, 0);
+				}
+
+			vertexBuffer = new FvfVertexBuffer<Vertex>(renderer.Device, vertices.Count, Vertex.Format);
+			vertexBuffer.SetData(vertices.ToArray());
+
+			indexBuffer = new IndexBuffer(renderer.Device, indices.Count);
+			indexBuffer.SetData(indices.ToArray());
+		}
+
+		public void Draw( Size screenSize, PointF scrollPos )
+		{
+			int indicesPerRow = map.Width * 6;
+			int verticesPerRow = map.Width * 4;
+
+			int visibleRows = (int)(screenSize.Height / 24.0f + 2);
+
+			int firstRow = (int)(scrollPos.Y / 24.0f);
+			int lastRow = firstRow + visibleRows;
+
+			if (lastRow < 0 || firstRow > map.Height)
+				return;
+
+			if (firstRow < 0) firstRow = 0;
+			if (lastRow > map.Height) lastRow = map.Height;
+
+			renderer.DrawWithShader(ShaderQuality.Low, delegate
+			{
+				renderer.DrawBatch(vertexBuffer, indexBuffer, 
+					new Range<int>(verticesPerRow * firstRow, verticesPerRow * lastRow), 
+					new Range<int>(indicesPerRow * firstRow, indicesPerRow * lastRow), 
+					terrainSheet.Texture);
+			});
+		}
+	}
+}