unstatic SpriteLoader

This commit is contained in:
Chris Forbes
2011-01-08 21:03:33 +13:00
committed by Paul Chote
parent f032322948
commit 848622054d
10 changed files with 18 additions and 16 deletions

View File

@@ -33,7 +33,7 @@ namespace OpenRA.Graphics
Name = name;
var d = info.NodesDict;
sprites = SpriteLoader.LoadAllSprites(string.IsNullOrEmpty(srcOverride) ? unit : srcOverride );
sprites = Game.modData.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 = SpriteLoader.LoadAllSprites("shadow");
Sprite[] shadowBits = Game.modData.SpriteLoader.LoadAllSprites("shadow");
Sprite[,] sprites, fogSprites;
bool dirty = true;

View File

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