rename SpriteSheetBuilder to SpriteLoader; it's dumb otherwise

This commit is contained in:
Chris Forbes
2011-01-08 20:56:57 +13:00
committed by Paul Chote
parent 0f84ac5215
commit 1d7f57941e
11 changed files with 16 additions and 14 deletions

View File

@@ -33,7 +33,7 @@ namespace OpenRA.Graphics
Name = name;
var d = info.NodesDict;
sprites = SpriteSheetBuilder.LoadAllSprites(string.IsNullOrEmpty(srcOverride) ? unit : srcOverride );
sprites = SpriteLoader.LoadAllSprites(string.IsNullOrEmpty(srcOverride) ? unit : srcOverride );
start = int.Parse(d["Start"].Value);
if (!d.ContainsKey("Length"))

View File

@@ -16,7 +16,7 @@ namespace OpenRA.Graphics
public class ShroudRenderer
{
Traits.Shroud shroud;
Sprite[] shadowBits = SpriteSheetBuilder.LoadAllSprites("shadow");
Sprite[] shadowBits = SpriteLoader.LoadAllSprites("shadow");
Sprite[,] sprites, fogSprites;
bool dirty = true;

View File

@@ -13,21 +13,23 @@ using OpenRA.FileFormats;
namespace OpenRA.Graphics
{
public static class SpriteSheetBuilder
public static class SpriteLoader
{
public static void Initialize( TileSet tileset )
public static void Initialize( TileSet tileset, SheetBuilder sheetBuilder )
{
exts = tileset.Extensions;
SheetBuilder = sheetBuilder;
sprites = new Cache<string, Sprite[]>( LoadSprites );
}
static SheetBuilder SheetBuilder;
static Cache<string, Sprite[]> sprites;
static string[] exts;
static Sprite[] LoadSprites(string filename)
{
var shp = new ShpReader(FileSystem.OpenWithExts(filename, exts));
return shp.Select(a => Game.modData.SheetBuilder.Add(a.Image, shp.Size)).ToArray();
return shp.Select(a => SheetBuilder.Add(a.Image, shp.Size)).ToArray();
}
public static Sprite[] LoadAllSprites(string filename) { return sprites[filename]; }