added ResourceType; mostly works, except for growth & consumption

This commit is contained in:
Chris Forbes
2010-03-02 21:55:32 +13:00
parent 45a4fa110e
commit 2c50d3baa7
8 changed files with 98 additions and 82 deletions

View File

@@ -25,22 +25,12 @@ namespace OpenRA.Graphics
{
class OverlayRenderer
{
static string[] overlaySpriteNames =
{
"sbag", "cycl", "brik", "fenc", "wood",
"gold01", "gold02", "gold03", "gold04",
"gem01", "gem02", "gem03", "gem04",
"v12", "v13", "v14", "v15", "v16", "v17", "v18",
"fpls", "wcrate", "scrate", "barb", "sbag",
};
static string[] smudgeSpriteNames =
{
"bib3", "bib2", "bib1", "sc1", "sc2", "sc3", "sc4", "sc5", "sc6",
"cr1", "cr2", "cr3", "cr4", "cr5", "cr6",
};
readonly Sprite[][] overlaySprites;
readonly Sprite[] smudgeSprites;
SpriteRenderer spriteRenderer;
@@ -51,7 +41,6 @@ namespace OpenRA.Graphics
this.spriteRenderer = new SpriteRenderer( renderer, true );
this.map = map;
overlaySprites = overlaySpriteNames.Select(f => SpriteSheetBuilder.LoadAllSprites(f)).ToArray();
smudgeSprites = smudgeSpriteNames.SelectMany(f => SpriteSheetBuilder.LoadAllSprites(f)).ToArray();
}
@@ -71,44 +60,9 @@ namespace OpenRA.Graphics
spriteRenderer.DrawSprite(smudgeSprites[tr.smudge - 1],
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();
}
bool IsFence( int x, int y )
{
var o = map.MapTiles[ x, y ].overlay;
if (o < Ore.overlayIsFence.Length)
return Ore.overlayIsFence[o];
return false;
}
int NearbyFences( int x, int y )
{
int ret = 0;
if( IsFence( x, y - 1 ) )
ret |= 1;
if( IsFence( x + 1, y ) )
ret |= 2;
if( IsFence( x, y + 1 ) )
ret |= 4;
if( IsFence( x - 1, y ) )
ret |= 8;
return ret;
}
}
}