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

TileSet and Map are now in Rules, not Game

Browse Source
This commit is contained in:
Bob
2009-11-19 17:08:23 +13:00
parent c0fe3fa4c9
commit 732f3c6c63
12 changed files with 44 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -11,7 +11,6 @@ namespace OpenRa.Game.Graphics
FvfVertexBuffer<Vertex> vertexBuffer;
IndexBuffer indexBuffer;
Sheet terrainSheet;
public TileSet tileSet;
Renderer renderer;
Map map;
@@ -23,14 +22,12 @@ namespace OpenRa.Game.Graphics
this.map = map;
overlayRenderer = new OverlayRenderer( renderer, map );
tileSet = new TileSet( map.TileSuffix );
Size tileSize = new Size( Game.CellSize, Game.CellSize );
SheetBuilder.ForceNewSheet();
var tileMapping = new Cache<TileReference, Sprite>(
x => SheetBuilder.Add(tileSet.GetBytes(x), tileSize));
x => SheetBuilder.Add(Rules.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/WorldRenderer.cs
View File

@@ -21,7 +21,7 @@ namespace OpenRa.Game.Graphics
public WorldRenderer(Renderer renderer)
{
terrainRenderer = new TerrainRenderer(renderer, Game.map);
terrainRenderer = new TerrainRenderer(renderer, Rules.Map);
this.renderer = renderer;
spriteRenderer = new SpriteRenderer(renderer, true);