epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

move Game.worldRenderer into World

Browse Source
This commit is contained in:
Bob
2010-01-18 01:50:24 +13:00
parent b581f248a7
commit 2f568ce829
10 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenRa.Game/Graphics/TerrainRenderer.cs
View File

@@ -15,15 +15,15 @@ namespace OpenRa.Graphics
Map map;
OverlayRenderer overlayRenderer;
public TerrainRenderer(Renderer renderer, Map map)
public TerrainRenderer(World world, Renderer renderer)
{
this.renderer = renderer;
this.map = map;
this.map = world.Map;
Size tileSize = new Size( Game.CellSize, Game.CellSize );
var tileMapping = new Cache<TileReference, Sprite>(
x => SheetBuilder.Add(Game.world.TileSet.GetBytes(x), tileSize));
x => SheetBuilder.Add(world.TileSet.GetBytes(x), tileSize));
Vertex[] vertices = new Vertex[4 * map.Height * map.Width];
ushort[] indices = new ushort[6 * map.Height * map.Width];

2
OpenRa.Game/Graphics/Viewport.cs
View File

@@ -48,7 +48,7 @@ namespace OpenRa.Graphics
renderer.BeginFrame(r1, r2, scrollPosition);
Game.worldRenderer.Draw();
Game.world.WorldRenderer.Draw();
Game.chrome.Draw();
var c = Game.chrome.HitTest(mousePos) ? Cursor.Default : Game.controller.ChooseCursor();

4
OpenRa.Game/Graphics/WorldRenderer.cs
View File

@@ -15,9 +15,9 @@ namespace OpenRa.Graphics
public static bool ShowUnitPaths = false;
internal WorldRenderer(Renderer renderer)
internal WorldRenderer(World world, Renderer renderer)
{
terrainRenderer = new TerrainRenderer(renderer, Game.world.Map);
terrainRenderer = new TerrainRenderer(world, renderer);
this.renderer = renderer;
spriteRenderer = new SpriteRenderer(renderer, true);