Moved our TerrainRender ref into WorldRenderer; TR.tileSet want to be somewhere else (it's not just renderer, it affects pathing)

OpenRa.Game/Graphics/WorldRenderer.cs

@@ -8,25 +8,28 @@ using OpenRa.Game.Traits;
 namespace OpenRa.Game.Graphics
 {
 	class WorldRenderer
-	{
+	{
+		public readonly TerrainRenderer terrainRenderer;
 		public readonly SpriteRenderer spriteRenderer;
         public readonly LineRenderer lineRenderer;
 		public readonly Region region;
-		public readonly UiOverlay uiOverlay;
+		public readonly UiOverlay uiOverlay;
 		readonly Renderer renderer;
 
 		public static bool ShowUnitPaths = false;
 
 		public WorldRenderer(Renderer renderer)
-		{
+		{
+			terrainRenderer = new TerrainRenderer( renderer, Game.map );
+
 			// TODO: this is layout policy. it belongs at a higher level than this.
-			region = Region.Create(Game.viewport, DockStyle.Left,
+			region = Region.Create(Game.viewport, DockStyle.Left,
 				Game.viewport.Width - 128, Draw, 
                 Game.controller.HandleMouseInput);		
 
-			Game.viewport.AddRegion(region);
-
-			this.renderer = renderer;
+			Game.viewport.AddRegion(region);
+
+			this.renderer = renderer;
 			spriteRenderer = new SpriteRenderer(renderer, true);
             lineRenderer = new LineRenderer(renderer);
 			uiOverlay = new UiOverlay(spriteRenderer);
@@ -52,7 +55,9 @@ namespace OpenRa.Game.Graphics
 		}
 
 		public void Draw()
-		{
+		{
+			terrainRenderer.Draw( Game.viewport );
+
 			var rect = new RectangleF((region.Position + Game.viewport.Location).ToPointF(), 
                 region.Size.ToSizeF());
 
@@ -92,8 +97,8 @@ namespace OpenRa.Game.Graphics
 				foreach( var a in uog.selection )
 	                DrawSelectionBox(a, Color.White, true);
             
-            lineRenderer.Flush();
-
+            lineRenderer.Flush();
+
 			renderer.DrawText(string.Format("Frame {0}", Game.orderManager.FrameNumber), new int2(5, 5), Color.White);
 		}