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

Allow Animation to generate its own Renderables.

Browse Source
This commit is contained in:
Paul Chote
2013-07-15 19:21:18 +12:00
parent fc458d191d
commit 15688eed13
22 changed files with 70 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9,6 +9,7 @@
#endregion #endregion
using System; using System;
using System.Collections.Generic;
namespace OpenRA.Graphics namespace OpenRA.Graphics
{ {
@@ -44,6 +45,16 @@ namespace OpenRA.Graphics
} }
} }
public IEnumerable<IRenderable> Render(WPos pos, int zOffset, PaletteReference palette, float scale)
{
yield return new SpriteRenderable(Image, pos, zOffset, palette, scale);
}
public IEnumerable<IRenderable> Render(WPos pos, PaletteReference palette)
{
return Render(pos, 0, palette, 1f);
}
public void Play(string sequenceName) public void Play(string sequenceName)
{ {
PlayThen(sequenceName, null); PlayThen(sequenceName, null);

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

@@ -9,6 +9,7 @@
#endregion #endregion
using System; using System;
using System.Collections.Generic;
using OpenRA.Traits; using OpenRA.Traits;
namespace OpenRA.Graphics namespace OpenRA.Graphics
@@ -34,19 +35,14 @@ namespace OpenRA.Graphics
this.ZOffset = zOffset; this.ZOffset = zOffset;
} }
public IRenderable Image(Actor self, WorldRenderer wr, PaletteReference pal) public IEnumerable<IRenderable> Render(Actor self, WorldRenderer wr, PaletteReference pal, float scale)
{
return Image(self, wr, pal, 1f);
}
public IRenderable Image(Actor self, WorldRenderer wr, PaletteReference pal, float scale)
{ {
var p = self.CenterPosition; var p = self.CenterPosition;
if (OffsetFunc != null) if (OffsetFunc != null)
p += OffsetFunc(); p += OffsetFunc();
var z = (ZOffset != null) ? ZOffset(p) : 0; var z = (ZOffset != null) ? ZOffset(p) : 0;
return new SpriteRenderable(Animation.Image, p, z, pal, scale); return Animation.Render(p, z, pal, scale);
} }
public static implicit operator AnimationWithOffset(Animation a) public static implicit operator AnimationWithOffset(Animation a)

3
OpenRA.Game/Graphics/Renderable.cs
View File

@@ -10,6 +10,7 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Drawing; using System.Drawing;
using System.Linq;
namespace OpenRA.Graphics namespace OpenRA.Graphics
{ {
@@ -47,6 +48,8 @@ namespace OpenRA.Graphics
public struct SpriteRenderable : IRenderable public struct SpriteRenderable : IRenderable
{ {
public static readonly IEnumerable<IRenderable> None = new IRenderable[0].AsEnumerable();
readonly Sprite sprite; readonly Sprite sprite;
readonly WPos pos; readonly WPos pos;
readonly int zOffset; readonly int zOffset;

2
OpenRA.Game/Traits/Render/RenderSimple.cs
View File

@@ -25,7 +25,7 @@ namespace OpenRA.Traits
var anim = new Animation(RenderSimple.GetImage(ai), () => 0); var anim = new Animation(RenderSimple.GetImage(ai), () => 0);
anim.PlayRepeating("idle"); anim.PlayRepeating("idle");
yield return new SpriteRenderable(anim.Image, WPos.Zero, 0, pr, 1f); return anim.Render(WPos.Zero, pr);
} }
} }

9
OpenRA.Game/Traits/Render/RenderSprites.cs
View File

@@ -90,8 +90,13 @@ namespace OpenRA.Traits
} }
foreach (var a in anims.Values) foreach (var a in anims.Values)
if (a.DisableFunc == null || !a.DisableFunc()) {
yield return a.Image(self, wr, palette, Info.Scale); if (a.DisableFunc != null && a.DisableFunc())
continue;
foreach (var r in a.Render(self, wr, palette, Info.Scale))
yield return r;
}
} }
public virtual void Tick(Actor self) public virtual void Tick(Actor self)

2
OpenRA.Mods.Cnc/Effects/IonCannon.cs
View File

@@ -34,7 +34,7 @@ namespace OpenRA.Mods.Cnc.Effects
public IEnumerable<IRenderable> Render(WorldRenderer wr) public IEnumerable<IRenderable> Render(WorldRenderer wr)
{ {
yield return new SpriteRenderable(anim.Image, target.CenterPosition, 1, wr.Palette("effect"), 1.0f); return anim.Render(target.CenterPosition, 1, wr.Palette("effect"), 1.0f);
} }
void Finish(World world) void Finish(World world)

4
OpenRA.Mods.RA/Cloak.cs
View File

@@ -66,8 +66,6 @@ namespace OpenRA.Mods.RA
if (!canCloak) Uncloak(); if (!canCloak) Uncloak();
} }
static readonly IRenderable[] Nothing = { };
public IEnumerable<IRenderable> ModifyRender(Actor self, WorldRenderer wr, IEnumerable<IRenderable> r) public IEnumerable<IRenderable> ModifyRender(Actor self, WorldRenderer wr, IEnumerable<IRenderable> r)
{ {
if (remainingTime > 0) if (remainingTime > 0)
@@ -79,7 +77,7 @@ namespace OpenRA.Mods.RA
else else
return r.Select(a => a.WithPalette(wr.Palette(info.Palette))); return r.Select(a => a.WithPalette(wr.Palette(info.Palette)));
else else
return Nothing; return SpriteRenderable.None;
} }
public void Tick(Actor self) public void Tick(Actor self)

2
OpenRA.Mods.RA/Effects/Corpse.cs
View File

@@ -33,7 +33,7 @@ namespace OpenRA.Mods.RA.Effects
public IEnumerable<IRenderable> Render(WorldRenderer wr) public IEnumerable<IRenderable> Render(WorldRenderer wr)
{ {
yield return new SpriteRenderable(Anim.Image, Pos, 0, wr.Palette(PaletteName), 1f); return Anim.Render(Pos, wr.Palette(PaletteName));
} }
} }
} }

7
OpenRA.Mods.RA/Effects/CrateEffect.cs
View File

@@ -34,9 +34,10 @@ namespace OpenRA.Mods.RA.Effects
public IEnumerable<IRenderable> Render(WorldRenderer wr) public IEnumerable<IRenderable> Render(WorldRenderer wr)
{ {
if (a.IsInWorld) if (!a.IsInWorld)
yield return new SpriteRenderable(anim.Image, return SpriteRenderable.None;
a.CenterPosition, 0, wr.Palette("effect"), 1f);
return anim.Render(a.CenterPosition, wr.Palette("effect"));
} }
} }
} }

2
OpenRA.Mods.RA/Effects/Explosion.cs
View File

@@ -31,7 +31,7 @@ namespace OpenRA.Mods.RA.Effects
public IEnumerable<IRenderable> Render(WorldRenderer wr) public IEnumerable<IRenderable> Render(WorldRenderer wr)
{ {
yield return new SpriteRenderable(anim.Image, pos, 0, wr.Palette("effect"), 1f); return anim.Render(pos, wr.Palette("effect"));
} }
} }
} }

4
OpenRA.Mods.RA/Effects/GpsDot.cs
View File

@@ -80,10 +80,10 @@ namespace OpenRA.Mods.RA.Effects
public IEnumerable<IRenderable> Render(WorldRenderer wr) public IEnumerable<IRenderable> Render(WorldRenderer wr)
{ {
if (!show || self.Destroyed) if (!show || self.Destroyed)
yield break; return SpriteRenderable.None;
var palette = wr.Palette(info.IndicatorPalettePrefix+self.Owner.InternalName); var palette = wr.Palette(info.IndicatorPalettePrefix+self.Owner.InternalName);
yield return new SpriteRenderable(anim.Image, self.CenterPosition, 0, palette, 1f); return anim.Render(self.CenterPosition, palette);
} }
} }
} }

2
OpenRA.Mods.RA/Effects/GpsSatellite.cs
View File

@@ -37,7 +37,7 @@ namespace OpenRA.Mods.RA.Effects
public IEnumerable<IRenderable> Render(WorldRenderer wr) public IEnumerable<IRenderable> Render(WorldRenderer wr)
{ {
yield return new SpriteRenderable(Anim.Image, Pos, 0, wr.Palette("effect"), 1f); return Anim.Render(Pos, wr.Palette("effect"));
} }
} }
} }

2
OpenRA.Mods.RA/Effects/NukeLaunch.cs
View File

@@ -75,7 +75,7 @@ namespace OpenRA.Mods.RA.Effects
public IEnumerable<IRenderable> Render(WorldRenderer wr) public IEnumerable<IRenderable> Render(WorldRenderer wr)
{ {
yield return new SpriteRenderable(anim.Image, pos, 0, wr.Palette("effect"), 1f); return anim.Render(pos, wr.Palette("effect"));
} }
} }
} }

3
OpenRA.Mods.RA/Effects/Parachute.cs
View File

@@ -76,7 +76,8 @@ namespace OpenRA.Mods.RA.Effects
yield return c.WithPos(pos); yield return c.WithPos(pos);
} }
yield return new SpriteRenderable(paraAnim.Image, pos + parachuteOffset, 1, rc.First().Palette, 1f); foreach (var r in paraAnim.Render(pos + parachuteOffset, 1, rc.First().Palette, 1f))
yield return r;
} }
} }
} }

7
OpenRA.Mods.RA/Effects/PowerdownIndicator.cs
View File

@@ -36,9 +36,10 @@ namespace OpenRA.Mods.RA.Effects
public IEnumerable<IRenderable> Render(WorldRenderer wr) public IEnumerable<IRenderable> Render(WorldRenderer wr)
{ {
if (!a.Destroyed && a.Owner.IsAlliedWith(a.World.RenderPlayer)) if (a.Destroyed || a.Owner.IsAlliedWith(a.World.RenderPlayer))
yield return new SpriteRenderable(anim.Image, a.CenterPosition, 0, return SpriteRenderable.None;
wr.Palette("chrome"), 1f);
return anim.Render(a.CenterPosition, wr.Palette("chrome"));
} }
} }
} }

13
OpenRA.Mods.RA/Effects/RallyPoint.cs
View File

@@ -50,14 +50,15 @@ namespace OpenRA.Mods.RA.Effects
public IEnumerable<IRenderable> Render(WorldRenderer wr) public IEnumerable<IRenderable> Render(WorldRenderer wr)
{ {
if (building.IsInWorld && building.Owner == building.World.LocalPlayer if (building.Owner != building.World.LocalPlayer)
&& building.World.Selection.Actors.Contains(building)) return SpriteRenderable.None;
{
if (!building.IsInWorld || !building.World.Selection.Actors.Contains(building))
return SpriteRenderable.None;
var pos = cachedLocation.CenterPosition; var pos = cachedLocation.CenterPosition;
var palette = wr.Palette(palettePrefix+building.Owner.InternalName); var palette = wr.Palette(palettePrefix+building.Owner.InternalName);
yield return new SpriteRenderable(circles.Image, pos, 0, palette, 1f); return circles.Render(pos, palette).Concat(flag.Render(pos, palette));
yield return new SpriteRenderable(flag.Image, pos, 0, palette, 1f);
}
} }
} }
} }

10
OpenRA.Mods.RA/Effects/RepairIndicator.cs
View File

@@ -44,11 +44,11 @@ namespace OpenRA.Mods.RA.Effects
public IEnumerable<IRenderable> Render(WorldRenderer wr) public IEnumerable<IRenderable> Render(WorldRenderer wr)
{ {
if (!building.Destroyed) if (building.Destroyed)
{ return SpriteRenderable.None;
yield return new SpriteRenderable(anim.Image, building.CenterPosition, 0,
wr.Palette(palettePrefix+player.InternalName), 1f); return anim.Render(building.CenterPosition,
} wr.Palette(palettePrefix+player.InternalName));
} }
} }
} }

2
OpenRA.Mods.RA/Effects/SatelliteLaunch.cs
View File

@@ -39,7 +39,7 @@ namespace OpenRA.Mods.RA.Effects
public IEnumerable<IRenderable> Render(WorldRenderer wr) public IEnumerable<IRenderable> Render(WorldRenderer wr)
{ {
yield return new SpriteRenderable(doors.Image, pos, 0, wr.Palette("effect"), 1f); return doors.Render(pos, wr.Palette("effect"));
} }
} }
} }

2
OpenRA.Mods.RA/Effects/Smoke.cs
View File

@@ -35,7 +35,7 @@ namespace OpenRA.Mods.RA.Effects
public IEnumerable<IRenderable> Render(WorldRenderer wr) public IEnumerable<IRenderable> Render(WorldRenderer wr)
{ {
yield return new SpriteRenderable(Anim.Image, Pos, 0, wr.Palette("effect"), 1f); return Anim.Render(Pos, wr.Palette("effect"));
} }
} }
} }

6
OpenRA.Mods.RA/Render/RenderBuildingWarFactory.cs
View File

@@ -29,12 +29,10 @@ namespace OpenRA.Mods.RA.Render
public override IEnumerable<IRenderable> RenderPreview(ActorInfo building, PaletteReference pr) public override IEnumerable<IRenderable> RenderPreview(ActorInfo building, PaletteReference pr)
{ {
var p = BaseBuildingPreview(building, pr); var p = BaseBuildingPreview(building, pr);
foreach (var r in p)
yield return r;
var anim = new Animation(RenderSprites.GetImage(building), () => 0); var anim = new Animation(RenderSprites.GetImage(building), () => 0);
anim.PlayRepeating("idle-top"); anim.PlayRepeating("idle-top");
yield return new SpriteRenderable(anim.Image, WPos.Zero, 0, pr, 1f);
return p.Concat(anim.Render(WPos.Zero, pr));
} }
} }

3
OpenRA.Mods.RA/Render/RenderEditorOnly.cs
View File

@@ -23,7 +23,6 @@ namespace OpenRA.Mods.RA.Render
{ {
public RenderEditorOnly(Actor self) : base(self, () => 0) { } public RenderEditorOnly(Actor self) : base(self, () => 0) { }
static readonly IRenderable[] Nothing = { }; public override IEnumerable<IRenderable> Render(Actor self, WorldRenderer wr) { return SpriteRenderable.None; }
public override IEnumerable<IRenderable> Render(Actor self, WorldRenderer wr) { return Nothing; }
} }
} }

9
OpenRA.Mods.RA/Render/WithMuzzleFlash.cs
View File

@@ -62,8 +62,13 @@ namespace OpenRA.Mods.RA.Render
public IEnumerable<IRenderable> Render(Actor self, WorldRenderer wr) public IEnumerable<IRenderable> Render(Actor self, WorldRenderer wr)
{ {
foreach (var a in muzzleFlashes.Values) foreach (var a in muzzleFlashes.Values)
if (a.DisableFunc == null || !a.DisableFunc()) {
yield return a.Image(self, wr, wr.Palette("effect")); if (a.DisableFunc != null && a.DisableFunc())
continue;
foreach (var r in a.Render(self, wr, wr.Palette("effect"), 1f))
yield return r;
}
} }
public void Tick(Actor self) public void Tick(Actor self)