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

Allow sequences to define a custom z offset.

Browse Source
This commit is contained in:
Paul Chote
2013-07-15 19:48:17 +12:00
parent 15688eed13
commit 9a47c6a303
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Game/Graphics/Animation.cs
View File

@@ -47,7 +47,7 @@ namespace OpenRA.Graphics
public IEnumerable<IRenderable> Render(WPos pos, int zOffset, PaletteReference palette, float scale) public IEnumerable<IRenderable> Render(WPos pos, int zOffset, PaletteReference palette, float scale)
{ {
yield return new SpriteRenderable(Image, pos, zOffset, palette, scale); yield return new SpriteRenderable(Image, pos, CurrentSequence.ZOffset + zOffset, palette, scale);
} }
public IEnumerable<IRenderable> Render(WPos pos, PaletteReference palette) public IEnumerable<IRenderable> Render(WPos pos, PaletteReference palette)

4
OpenRA.Game/Graphics/Sequence.cs
View File

@@ -29,6 +29,7 @@ namespace OpenRA.Graphics
public int Stride { get { return stride; } } public int Stride { get { return stride; } }
public int Facings { get { return facings; } } public int Facings { get { return facings; } }
public int Tick { get { return tick; } } public int Tick { get { return tick; } }
public readonly int ZOffset;
public Sequence(string unit, string name, MiniYaml info) public Sequence(string unit, string name, MiniYaml info)
{ {
@@ -76,6 +77,9 @@ namespace OpenRA.Graphics
if (d.ContainsKey("Transpose")) if (d.ContainsKey("Transpose"))
transpose = bool.Parse(d["Transpose"].Value); transpose = bool.Parse(d["Transpose"].Value);
if (d.ContainsKey("ZOffset"))
ZOffset = int.Parse(d["ZOffset"].Value);
if (length > stride) if (length > stride)
throw new InvalidOperationException( throw new InvalidOperationException(
"{0}: Sequence {1}.{2}: Length must be <= stride" "{0}: Sequence {1}.{2}: Length must be <= stride"