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

rename SpriteSheetBuilder to SpriteLoader; it's dumb otherwise

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Game/Graphics/Sequence.cs
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"))

2
OpenRA.Game/Graphics/ShroudRenderer.cs
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;

8
OpenRA.Game/Graphics/SpriteSheetBuilder.cs → OpenRA.Game/Graphics/SpriteLoader.cs
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]; }

2
OpenRA.Game/ModData.cs
View File

@@ -103,7 +103,7 @@ namespace OpenRA
|| previousMapHadSequences || map.Sequences.Count > 0)
{
SheetBuilder = new SheetBuilder( TextureChannel.Red );
SpriteSheetBuilder.Initialize( Rules.TileSets[map.Tileset] );
SpriteLoader.Initialize( Rules.TileSets[map.Tileset], SheetBuilder );
CursorSheetBuilder = new CursorSheetBuilder( this );
CursorProvider.Initialize(Manifest.Cursors);
SequenceProvider.Initialize(Manifest.Sequences, map.Sequences);

4
OpenRA.Game/OpenRA.Game.csproj
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -131,7 +131,7 @@
<Compile Include="Graphics\Renderer.cs" />
<Compile Include="Graphics\Sprite.cs" />
<Compile Include="Graphics\SpriteRenderer.cs" />
<Compile Include="Graphics\SpriteSheetBuilder.cs" />
<Compile Include="Graphics\SpriteLoader.cs" />
<Compile Include="Graphics\TerrainRenderer.cs" />
<Compile Include="Traits\World\PlayerColorPalette.cs" />
<Compile Include="Traits\World\ResourceLayer.cs" />

2
OpenRA.Game/Traits/World/ResourceLayer.cs
View File

@@ -51,7 +51,7 @@ namespace OpenRA.Traits
resourceTypes = w.WorldActor.TraitsImplementing<ResourceType>().ToArray();
foreach (var rt in resourceTypes)
rt.info.Sprites = rt.info.SpriteNames.Select(a => SpriteSheetBuilder.LoadAllSprites(a)).ToArray();
rt.info.Sprites = rt.info.SpriteNames.Select(a => SpriteLoader.LoadAllSprites(a)).ToArray();
var map = w.Map;

2
OpenRA.Game/Widgets/ShpImageWidget.cs
View File

@@ -60,7 +60,7 @@ namespace OpenRA.Widgets
if (image != cachedImage || frame != cachedFrame)
{
sprite = SpriteSheetBuilder.LoadAllSprites(image)[frame];
sprite = SpriteLoader.LoadAllSprites(image)[frame];
cachedImage = image;
cachedFrame = frame;
}

2
OpenRA.Mods.RA/Buildings/BibLayer.cs
View File

@@ -35,7 +35,7 @@ namespace OpenRA.Mods.RA.Buildings
public BibLayer(Actor self, BibLayerInfo info)
{
this.info = info;
bibSprites = info.BibTypes.Select(x => SpriteSheetBuilder.LoadAllSprites(x)).ToArray();
bibSprites = info.BibTypes.Select(x => SpriteLoader.LoadAllSprites(x)).ToArray();
self.World.ActorAdded +=
a => { if (a.HasTrait<Bib>()) DoBib(a,true); };

2
OpenRA.Mods.RA/Widgets/BuildPaletteWidget.cs
View File

@@ -70,7 +70,7 @@ namespace OpenRA.Mods.RA.Widgets
.Where(u => u.Traits.Contains<BuildableInfo>() && u.Name[0] != '^')
.ToDictionary(
u => u.Name,
u => SpriteSheetBuilder.LoadAllSprites(u.Traits.Get<TooltipInfo>().Icon ?? (u.Name + "icon"))[0]);
u => SpriteLoader.LoadAllSprites(u.Traits.Get<TooltipInfo>().Icon ?? (u.Name + "icon"))[0]);
}
public override Rectangle EventBounds

2
OpenRA.Mods.RA/Widgets/SpecialPowerBinWidget.cs
View File

@@ -43,7 +43,7 @@ namespace OpenRA.Mods.RA.Widgets
.Select(u => u.Image).Distinct()
.ToDictionary(
u => u,
u => SpriteSheetBuilder.LoadAllSprites(u)[0]);
u => SpriteLoader.LoadAllSprites(u)[0]);
ready = new Animation("pips");
ready.PlayRepeating("ready");

2
OpenRA.Mods.RA/World/SmudgeLayer.cs
View File

@@ -36,7 +36,7 @@ namespace OpenRA.Mods.RA
public SmudgeLayer(SmudgeLayerInfo info)
{
this.Info = info;
smudgeSprites = Info.Types.Select(x => SpriteSheetBuilder.LoadAllSprites(x)).ToArray();
smudgeSprites = Info.Types.Select(x => SpriteLoader.LoadAllSprites(x)).ToArray();
}
public void WorldLoaded(World w)