lots of experimental bits

This commit is contained in:
Chris Forbes
2010-02-28 22:43:54 +13:00
parent e7b48c7ea6
commit 45a4fa110e
22 changed files with 166 additions and 14 deletions

View File

@@ -72,18 +72,18 @@ namespace OpenRA.Graphics
Game.CellSize * (float2)location, "terrain");
}
var o = tr.overlay;
if (o < overlaySprites.Length)
{
var location = new int2(x, y);
var sprites = overlaySprites[o];
var spriteIndex = 0;
if (Ore.overlayIsFence[o]) spriteIndex = NearbyFences(x, y);
else if (Ore.overlayIsOre[o]) spriteIndex = map.MapTiles[x,y].density - 1;
else if (Ore.overlayIsGems[o]) spriteIndex = map.MapTiles[x,y].density - 1;
spriteRenderer.DrawSprite(sprites[spriteIndex],
Game.CellSize * (float2)location, "terrain");
}
//var o = tr.overlay;
//if (o < overlaySprites.Length)
//{
// var location = new int2(x, y);
// var sprites = overlaySprites[o];
// var spriteIndex = 0;
// if (Ore.overlayIsFence[o]) spriteIndex = NearbyFences(x, y);
// else if (Ore.overlayIsOre[o]) spriteIndex = map.MapTiles[x,y].density - 1;
// else if (Ore.overlayIsGems[o]) spriteIndex = map.MapTiles[x,y].density - 1;
// spriteRenderer.DrawSprite(sprites[spriteIndex],
// Game.CellSize * (float2)location, "terrain");
//}
}
spriteRenderer.Flush();

View File

@@ -21,6 +21,7 @@
using System.Drawing;
using OpenRA.FileFormats;
using OpenRA.FileFormats.Graphics;
using OpenRA.Traits;
namespace OpenRA.Graphics
{
@@ -104,6 +105,9 @@ namespace OpenRA.Graphics
new Range<int>(indicesPerRow * firstRow, indicesPerRow * lastRow),
terrainSheet.Texture, PrimitiveType.TriangleList, renderer.SpriteShader));
foreach (var r in Game.world.WorldActor.traits.WithInterface<IRenderOverlay>())
r.Render();
overlayRenderer.Draw();
}
}