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

Draw turrets, spinners, rotors at ZOffset +1 relative to the body.

Browse Source
This commit is contained in:
Paul Chote
2013-05-24 18:18:47 +12:00
parent d048d083c4
commit a11e403084
4 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
OpenRA.Game/Graphics/AnimationWithOffset.cs
View File

@@ -18,12 +18,15 @@ namespace OpenRA.Graphics
public readonly Animation Animation;
public readonly Func<WVec> OffsetFunc;
public readonly Func<bool> DisableFunc;
public readonly int ZOffset;
public readonly Func<WPos, int> ZOffset;
public AnimationWithOffset(Animation a, Func<WVec> offset, Func<bool> disable)
: this(a, offset, disable, 0) { }
: this(a, offset, disable, null) { }
public AnimationWithOffset(Animation a, Func<WVec> offset, Func<bool> disable, int zOffset)
: this(a, offset, disable, _ => zOffset) { }
public AnimationWithOffset(Animation a, Func<WVec> offset, Func<bool> disable, Func<WPos, int> zOffset)
{
this.Animation = a;
this.OffsetFunc = offset;
@@ -42,12 +45,13 @@ namespace OpenRA.Graphics
if (OffsetFunc != null)
p += OffsetFunc();
return new SpriteRenderable(Animation.Image, p, ZOffset, pal, scale);
var z = (ZOffset != null) ? ZOffset(p) : 0;
return new SpriteRenderable(Animation.Image, p, z, pal, scale);
}
public static implicit operator AnimationWithOffset(Animation a)
{
return new AnimationWithOffset(a, null, null, 0);
return new AnimationWithOffset(a, null, null, null);
}
}
}