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

Fix caching by making the tileset part of the key

Browse Source
This commit is contained in:
Pavlos Touboulidis
2014-05-02 16:26:00 +03:00
parent 495ad989d8
commit 693186e1eb
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
OpenRA.Game/Graphics/SequenceProvider.cs
View File

@@ -49,10 +49,10 @@ namespace OpenRA.Graphics
public void ActivateMap(Map map) public void ActivateMap(Map map)
{ {
sequences = Load(modData.Manifest.Sequences, map.Sequences); sequences = Load(modData.Manifest.Sequences, map.Tileset, map.Sequences);
} }
public Dictionary<string, Lazy<Dictionary<string, Sequence>>> Load(string[] sequenceFiles, List<MiniYamlNode> sequenceNodes) public Dictionary<string, Lazy<Dictionary<string, Sequence>>> Load(string[] sequenceFiles, string tileset, List<MiniYamlNode> sequenceNodes)
{ {
Game.modData.LoadScreen.Display(); Game.modData.LoadScreen.Display();
@@ -63,7 +63,10 @@ namespace OpenRA.Graphics
var items = new Dictionary<string, Lazy<Dictionary<string, Sequence>>>(); var items = new Dictionary<string, Lazy<Dictionary<string, Sequence>>>();
foreach (var node in nodes) foreach (var node in nodes)
{ {
var key = node.Value.ToLines(node.Key).JoinWith("|"); // Sequence loading uses the active SpriteLoader that depends on the current map's tileset
var key = tileset + node.Value.ToLines(node.Key).JoinWith("|");
Lazy<Dictionary<string, Sequence>> t; Lazy<Dictionary<string, Sequence>> t;
if (sequenceCache.TryGetValue(key, out t)) if (sequenceCache.TryGetValue(key, out t))
{ {