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

Move parachute shadow anim ticking from Render to Tick

Browse Source
This commit is contained in:
reaperrr
2016-05-15 16:04:01 +02:00
parent a670ea4bad
commit c2f537a43d
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenRA.Mods.Common/Traits/Render/WithParachute.cs
View File

@@ -79,7 +79,7 @@ namespace OpenRA.Mods.Common.Traits.Render
} }
} }
public class WithParachute : UpgradableTrait<WithParachuteInfo>, IRender public class WithParachute : UpgradableTrait<WithParachuteInfo>, ITick, IRender
{ {
readonly Animation shadow; readonly Animation shadow;
readonly AnimationWithOffset anim; readonly AnimationWithOffset anim;
@@ -133,6 +133,11 @@ namespace OpenRA.Mods.Common.Traits.Render
anim.Animation.PlayBackwardsThen(info.OpeningSequence, () => renderProlonged = false); anim.Animation.PlayBackwardsThen(info.OpeningSequence, () => renderProlonged = false);
} }
public void Tick(Actor self)
{
shadow.Tick();
}
public IEnumerable<IRenderable> Render(Actor self, WorldRenderer wr) public IEnumerable<IRenderable> Render(Actor self, WorldRenderer wr)
{ {
if (info.ShadowImage == null) if (info.ShadowImage == null)
@@ -147,7 +152,6 @@ namespace OpenRA.Mods.Common.Traits.Render
if (self.World.FogObscures(self)) if (self.World.FogObscures(self))
return Enumerable.Empty<IRenderable>(); return Enumerable.Empty<IRenderable>();
shadow.Tick();
var pos = self.CenterPosition - new WVec(0, 0, self.CenterPosition.Z); var pos = self.CenterPosition - new WVec(0, 0, self.CenterPosition.Z);
var palette = wr.Palette(info.ShadowPalette); var palette = wr.Palette(info.ShadowPalette);
return new IRenderable[] { new SpriteRenderable(shadow.Image, pos, info.ShadowOffset, info.ShadowZOffset, palette, 1, true) }; return new IRenderable[] { new SpriteRenderable(shadow.Image, pos, info.ShadowOffset, info.ShadowZOffset, palette, 1, true) };