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

Use tileset ID in sequences instead of the TileSet object.

Browse Source
This commit is contained in:
Paul Chote
2020-10-10 21:03:29 +01:00
committed by reaperrr
parent 6dcb701d1d
commit dd7b8b24af
7 changed files with 25 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Game/GameRules/Ruleset.cs
View File

@@ -208,7 +208,7 @@ namespace OpenRA
// TODO: Top-level dictionary should be moved into the Ruleset instead of in its own object // TODO: Top-level dictionary should be moved into the Ruleset instead of in its own object
var sequences = mapSequences == null ? modData.DefaultSequences[tileSet] : var sequences = mapSequences == null ? modData.DefaultSequences[tileSet] :
new SequenceProvider(fileSystem, modData, ts, mapSequences); new SequenceProvider(fileSystem, modData, tileSet, mapSequences);
var modelSequences = dr.ModelSequences; var modelSequences = dr.ModelSequences;
if (mapModelSequences != null) if (mapModelSequences != null)

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

@@ -41,20 +41,20 @@ namespace OpenRA.Graphics
public interface ISpriteSequenceLoader public interface ISpriteSequenceLoader
{ {
IReadOnlyDictionary<string, ISpriteSequence> ParseSequences(ModData modData, TileSet tileSet, SpriteCache cache, MiniYamlNode node); IReadOnlyDictionary<string, ISpriteSequence> ParseSequences(ModData modData, string tileSet, SpriteCache cache, MiniYamlNode node);
} }
public class SequenceProvider : IDisposable public class SequenceProvider : IDisposable
{ {
readonly ModData modData; readonly ModData modData;
readonly TileSet tileSet; readonly string tileSet;
readonly Lazy<Sequences> sequences; readonly Lazy<Sequences> sequences;
readonly Lazy<SpriteCache> spriteCache; readonly Lazy<SpriteCache> spriteCache;
public SpriteCache SpriteCache { get { return spriteCache.Value; } } public SpriteCache SpriteCache { get { return spriteCache.Value; } }
readonly Dictionary<string, UnitSequences> sequenceCache = new Dictionary<string, UnitSequences>(); readonly Dictionary<string, UnitSequences> sequenceCache = new Dictionary<string, UnitSequences>();
public SequenceProvider(IReadOnlyFileSystem fileSystem, ModData modData, TileSet tileSet, MiniYaml additionalSequences) public SequenceProvider(IReadOnlyFileSystem fileSystem, ModData modData, string tileSet, MiniYaml additionalSequences)
{ {
this.modData = modData; this.modData = modData;
this.tileSet = tileSet; this.tileSet = tileSet;

2
OpenRA.Game/ModData.cs
View File

@@ -107,7 +107,7 @@ namespace OpenRA
defaultSequences = Exts.Lazy(() => defaultSequences = Exts.Lazy(() =>
{ {
var items = DefaultTileSets.ToDictionary(t => t.Key, t => new SequenceProvider(DefaultFileSystem, this, t.Value, null)); var items = DefaultTileSets.ToDictionary(t => t.Key, t => new SequenceProvider(DefaultFileSystem, this, t.Key, null));
return (IReadOnlyDictionary<string, SequenceProvider>)(new ReadOnlyDictionary<string, SequenceProvider>(items)); return (IReadOnlyDictionary<string, SequenceProvider>)(new ReadOnlyDictionary<string, SequenceProvider>(items));
}); });

4
OpenRA.Mods.Cnc/Graphics/ClassicSpriteSequence.cs
View File

@@ -20,7 +20,7 @@ namespace OpenRA.Mods.Cnc.Graphics
public ClassicSpriteSequenceLoader(ModData modData) public ClassicSpriteSequenceLoader(ModData modData)
: base(modData) { } : base(modData) { }
public override ISpriteSequence CreateSequence(ModData modData, TileSet tileSet, SpriteCache cache, string sequence, string animation, MiniYaml info) public override ISpriteSequence CreateSequence(ModData modData, string tileSet, SpriteCache cache, string sequence, string animation, MiniYaml info)
{ {
return new ClassicSpriteSequence(modData, tileSet, cache, this, sequence, animation, info); return new ClassicSpriteSequence(modData, tileSet, cache, this, sequence, animation, info);
} }
@@ -30,7 +30,7 @@ namespace OpenRA.Mods.Cnc.Graphics
{ {
readonly bool useClassicFacings; readonly bool useClassicFacings;
public ClassicSpriteSequence(ModData modData, TileSet tileSet, SpriteCache cache, ISpriteSequenceLoader loader, string sequence, string animation, MiniYaml info) public ClassicSpriteSequence(ModData modData, string tileSet, SpriteCache cache, ISpriteSequenceLoader loader, string sequence, string animation, MiniYaml info)
: base(modData, tileSet, cache, loader, sequence, animation, info) : base(modData, tileSet, cache, loader, sequence, animation, info)
{ {
var d = info.ToDictionary(); var d = info.ToDictionary();

16
OpenRA.Mods.Cnc/Graphics/ClassicTilesetSpecificSpriteSequence.cs
View File

@@ -35,7 +35,7 @@ namespace OpenRA.Mods.Cnc.Graphics
TilesetCodes = yaml.ToDictionary(kv => kv.Value); TilesetCodes = yaml.ToDictionary(kv => kv.Value);
} }
public override ISpriteSequence CreateSequence(ModData modData, TileSet tileSet, SpriteCache cache, string sequence, string animation, MiniYaml info) public override ISpriteSequence CreateSequence(ModData modData, string tileSet, SpriteCache cache, string sequence, string animation, MiniYaml info)
{ {
return new ClassicTilesetSpecificSpriteSequence(modData, tileSet, cache, this, sequence, animation, info); return new ClassicTilesetSpecificSpriteSequence(modData, tileSet, cache, this, sequence, animation, info);
} }
@@ -43,24 +43,22 @@ namespace OpenRA.Mods.Cnc.Graphics
public class ClassicTilesetSpecificSpriteSequence : ClassicSpriteSequence public class ClassicTilesetSpecificSpriteSequence : ClassicSpriteSequence
{ {
public ClassicTilesetSpecificSpriteSequence(ModData modData, TileSet tileSet, SpriteCache cache, ISpriteSequenceLoader loader, string sequence, string animation, MiniYaml info) public ClassicTilesetSpecificSpriteSequence(ModData modData, string tileSet, SpriteCache cache, ISpriteSequenceLoader loader, string sequence, string animation, MiniYaml info)
: base(modData, tileSet, cache, loader, sequence, animation, info) { } : base(modData, tileSet, cache, loader, sequence, animation, info) { }
string ResolveTilesetId(TileSet tileSet, Dictionary<string, MiniYaml> d) string ResolveTilesetId(string tileSet, Dictionary<string, MiniYaml> d)
{ {
var tsId = tileSet.Id;
if (d.TryGetValue("TilesetOverrides", out var yaml)) if (d.TryGetValue("TilesetOverrides", out var yaml))
{ {
var tsNode = yaml.Nodes.FirstOrDefault(n => n.Key == tsId); var tsNode = yaml.Nodes.FirstOrDefault(n => n.Key == tileSet);
if (tsNode != null) if (tsNode != null)
tsId = tsNode.Value.Value; tileSet = tsNode.Value.Value;
} }
return tsId; return tileSet;
} }
protected override string GetSpriteSrc(ModData modData, TileSet tileSet, string sequence, string animation, string sprite, Dictionary<string, MiniYaml> d) protected override string GetSpriteSrc(ModData modData, string tileSet, string sequence, string animation, string sprite, Dictionary<string, MiniYaml> d)
{ {
var loader = (ClassicTilesetSpecificSpriteSequenceLoader)Loader; var loader = (ClassicTilesetSpecificSpriteSequenceLoader)Loader;

8
OpenRA.Mods.Common/Graphics/DefaultSpriteSequence.cs
View File

@@ -42,12 +42,12 @@ namespace OpenRA.Mods.Common.Graphics
{ {
public DefaultSpriteSequenceLoader(ModData modData) { } public DefaultSpriteSequenceLoader(ModData modData) { }
public virtual ISpriteSequence CreateSequence(ModData modData, TileSet tileSet, SpriteCache cache, string sequence, string animation, MiniYaml info) public virtual ISpriteSequence CreateSequence(ModData modData, string tileSet, SpriteCache cache, string sequence, string animation, MiniYaml info)
{ {
return new DefaultSpriteSequence(modData, tileSet, cache, this, sequence, animation, info); return new DefaultSpriteSequence(modData, tileSet, cache, this, sequence, animation, info);
} }
public IReadOnlyDictionary<string, ISpriteSequence> ParseSequences(ModData modData, TileSet tileSet, SpriteCache cache, MiniYamlNode node) public IReadOnlyDictionary<string, ISpriteSequence> ParseSequences(ModData modData, string tileSet, SpriteCache cache, MiniYamlNode node)
{ {
var sequences = new Dictionary<string, ISpriteSequence>(); var sequences = new Dictionary<string, ISpriteSequence>();
var nodes = node.Value.ToDictionary(); var nodes = node.Value.ToDictionary();
@@ -143,7 +143,7 @@ namespace OpenRA.Mods.Common.Graphics
public readonly uint[] EmbeddedPalette; public readonly uint[] EmbeddedPalette;
protected virtual string GetSpriteSrc(ModData modData, TileSet tileSet, string sequence, string animation, string sprite, Dictionary<string, MiniYaml> d) protected virtual string GetSpriteSrc(ModData modData, string tileSet, string sequence, string animation, string sprite, Dictionary<string, MiniYaml> d)
{ {
return sprite ?? sequence; return sprite ?? sequence;
} }
@@ -166,7 +166,7 @@ namespace OpenRA.Mods.Common.Graphics
return Rectangle.FromLTRB(left, top, right, bottom); return Rectangle.FromLTRB(left, top, right, bottom);
} }
public DefaultSpriteSequence(ModData modData, TileSet tileSet, SpriteCache cache, ISpriteSequenceLoader loader, string sequence, string animation, MiniYaml info) public DefaultSpriteSequence(ModData modData, string tileSet, SpriteCache cache, ISpriteSequenceLoader loader, string sequence, string animation, MiniYaml info)
{ {
this.sequence = sequence; this.sequence = sequence;
Name = animation; Name = animation;

16
OpenRA.Mods.Common/Graphics/TilesetSpecificSpriteSequence.cs
View File

@@ -35,7 +35,7 @@ namespace OpenRA.Mods.Common.Graphics
TilesetCodes = yaml.ToDictionary(kv => kv.Value); TilesetCodes = yaml.ToDictionary(kv => kv.Value);
} }
public override ISpriteSequence CreateSequence(ModData modData, TileSet tileSet, SpriteCache cache, string sequence, string animation, MiniYaml info) public override ISpriteSequence CreateSequence(ModData modData, string tileSet, SpriteCache cache, string sequence, string animation, MiniYaml info)
{ {
return new TilesetSpecificSpriteSequence(modData, tileSet, cache, this, sequence, animation, info); return new TilesetSpecificSpriteSequence(modData, tileSet, cache, this, sequence, animation, info);
} }
@@ -43,24 +43,22 @@ namespace OpenRA.Mods.Common.Graphics
public class TilesetSpecificSpriteSequence : DefaultSpriteSequence public class TilesetSpecificSpriteSequence : DefaultSpriteSequence
{ {
public TilesetSpecificSpriteSequence(ModData modData, TileSet tileSet, SpriteCache cache, ISpriteSequenceLoader loader, string sequence, string animation, MiniYaml info) public TilesetSpecificSpriteSequence(ModData modData, string tileSet, SpriteCache cache, ISpriteSequenceLoader loader, string sequence, string animation, MiniYaml info)
: base(modData, tileSet, cache, loader, sequence, animation, info) { } : base(modData, tileSet, cache, loader, sequence, animation, info) { }
string ResolveTilesetId(TileSet tileSet, Dictionary<string, MiniYaml> d) string ResolveTilesetId(string tileSet, Dictionary<string, MiniYaml> d)
{ {
var tsId = tileSet.Id;
if (d.TryGetValue("TilesetOverrides", out var yaml)) if (d.TryGetValue("TilesetOverrides", out var yaml))
{ {
var tsNode = yaml.Nodes.FirstOrDefault(n => n.Key == tsId); var tsNode = yaml.Nodes.FirstOrDefault(n => n.Key == tileSet);
if (tsNode != null) if (tsNode != null)
tsId = tsNode.Value.Value; tileSet = tsNode.Value.Value;
} }
return tsId; return tileSet;
} }
protected override string GetSpriteSrc(ModData modData, TileSet tileSet, string sequence, string animation, string sprite, Dictionary<string, MiniYaml> d) protected override string GetSpriteSrc(ModData modData, string tileSet, string sequence, string animation, string sprite, Dictionary<string, MiniYaml> d)
{ {
var loader = (TilesetSpecificSpriteSequenceLoader)Loader; var loader = (TilesetSpecificSpriteSequenceLoader)Loader;