From ca5f2c37859d473194918a2c672ef6503d581da5 Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Sun, 12 May 2013 23:07:39 +1200 Subject: [PATCH] Split Renderable into an IRenderable interface and SpriteRenderable implementation. --- OpenRA.Game/Actor.cs | 6 +- OpenRA.Game/Effects/DelayedAction.cs | 2 +- OpenRA.Game/Effects/FlashTarget.cs | 2 +- OpenRA.Game/Effects/IEffect.cs | 2 +- OpenRA.Game/Graphics/AnimationWithOffset.cs | 6 +- OpenRA.Game/Graphics/Renderable.cs | 84 ++++++++++++------- OpenRA.Game/Traits/Render/RenderSimple.cs | 6 +- OpenRA.Game/Traits/TraitsInterfaces.cs | 6 +- OpenRA.Mods.Cnc/Effects/IonCannon.cs | 4 +- OpenRA.Mods.Cnc/WithCargo.cs | 2 +- OpenRA.Mods.RA/BelowUnits.cs | 4 +- OpenRA.Mods.RA/Bridge.cs | 4 +- OpenRA.Mods.RA/Cloak.cs | 4 +- OpenRA.Mods.RA/Effects/Bullet.cs | 8 +- OpenRA.Mods.RA/Effects/CashTick.cs | 2 +- OpenRA.Mods.RA/Effects/Corpse.cs | 4 +- OpenRA.Mods.RA/Effects/CrateEffect.cs | 4 +- OpenRA.Mods.RA/Effects/Explosion.cs | 4 +- OpenRA.Mods.RA/Effects/GpsDot.cs | 4 +- OpenRA.Mods.RA/Effects/GpsSatellite.cs | 4 +- OpenRA.Mods.RA/Effects/GravityBomb.cs | 4 +- OpenRA.Mods.RA/Effects/InvulnEffect.cs | 2 +- OpenRA.Mods.RA/Effects/LaserZap.cs | 6 +- OpenRA.Mods.RA/Effects/Missile.cs | 6 +- OpenRA.Mods.RA/Effects/NukeLaunch.cs | 4 +- OpenRA.Mods.RA/Effects/Parachute.cs | 4 +- OpenRA.Mods.RA/Effects/PowerdownIndicator.cs | 4 +- OpenRA.Mods.RA/Effects/RallyPoint.cs | 6 +- OpenRA.Mods.RA/Effects/RepairIndicator.cs | 4 +- OpenRA.Mods.RA/Effects/SatelliteLaunch.cs | 4 +- OpenRA.Mods.RA/Effects/Smoke.cs | 4 +- OpenRA.Mods.RA/Effects/TeslaZap.cs | 16 ++-- OpenRA.Mods.RA/GainsExperience.cs | 6 +- OpenRA.Mods.RA/Modifiers/FrozenUnderFog.cs | 4 +- OpenRA.Mods.RA/Modifiers/HiddenUnderFog.cs | 4 +- .../Orders/PlaceBuildingOrderGenerator.cs | 2 +- OpenRA.Mods.RA/Render/RenderBuilding.cs | 4 +- .../Render/RenderBuildingWarFactory.cs | 6 +- OpenRA.Mods.RA/Render/RenderEditorOnly.cs | 4 +- OpenRA.Mods.RA/Render/WithMuzzleFlash.cs | 2 +- OpenRA.Mods.RA/Render/WithShadow.cs | 2 +- 41 files changed, 140 insertions(+), 120 deletions(-) diff --git a/OpenRA.Game/Actor.cs b/OpenRA.Game/Actor.cs index dfcdd8cdca..08fbaf0a17 100755 --- a/OpenRA.Game/Actor.cs +++ b/OpenRA.Game/Actor.cs @@ -143,9 +143,9 @@ namespace OpenRA OpenRA.FileFormats.Lazy Size; // note: these delegates are cached to avoid massive allocation. - Func> ApplyIRender; - Func, IRenderModifier, WorldRenderer, IEnumerable> ApplyRenderModifier; - public IEnumerable Render(WorldRenderer wr) + Func> ApplyIRender; + Func, IRenderModifier, WorldRenderer, IEnumerable> ApplyRenderModifier; + public IEnumerable Render(WorldRenderer wr) { var mods = TraitsImplementing(); var sprites = TraitsImplementing().SelectMany(x => ApplyIRender(x, wr)); diff --git a/OpenRA.Game/Effects/DelayedAction.cs b/OpenRA.Game/Effects/DelayedAction.cs index 609af16c4a..1cb1440874 100755 --- a/OpenRA.Game/Effects/DelayedAction.cs +++ b/OpenRA.Game/Effects/DelayedAction.cs @@ -32,6 +32,6 @@ namespace OpenRA.Effects world.AddFrameEndTask(w => { w.Remove(this); a(); }); } - public IEnumerable Render(WorldRenderer wr) { yield break; } + public IEnumerable Render(WorldRenderer wr) { yield break; } } } diff --git a/OpenRA.Game/Effects/FlashTarget.cs b/OpenRA.Game/Effects/FlashTarget.cs index c8c422d791..a3fffc49b8 100755 --- a/OpenRA.Game/Effects/FlashTarget.cs +++ b/OpenRA.Game/Effects/FlashTarget.cs @@ -33,7 +33,7 @@ namespace OpenRA.Effects world.AddFrameEndTask(w => w.Remove(this)); } - public IEnumerable Render(WorldRenderer wr) + public IEnumerable Render(WorldRenderer wr) { if (!target.IsInWorld) yield break; diff --git a/OpenRA.Game/Effects/IEffect.cs b/OpenRA.Game/Effects/IEffect.cs index 5bab9cfcf3..33d4ada440 100755 --- a/OpenRA.Game/Effects/IEffect.cs +++ b/OpenRA.Game/Effects/IEffect.cs @@ -17,6 +17,6 @@ namespace OpenRA.Effects public interface IEffect { void Tick(World world); - IEnumerable Render(WorldRenderer r); + IEnumerable Render(WorldRenderer r); } } diff --git a/OpenRA.Game/Graphics/AnimationWithOffset.cs b/OpenRA.Game/Graphics/AnimationWithOffset.cs index a1196c23eb..6e259cb1ec 100644 --- a/OpenRA.Game/Graphics/AnimationWithOffset.cs +++ b/OpenRA.Game/Graphics/AnimationWithOffset.cs @@ -31,18 +31,18 @@ namespace OpenRA.Graphics this.ZOffset = zOffset; } - public Renderable Image(Actor self, WorldRenderer wr, PaletteReference pal) + public IRenderable Image(Actor self, WorldRenderer wr, PaletteReference pal) { return Image(self, wr, pal, 1f); } - public Renderable Image(Actor self, WorldRenderer wr, PaletteReference pal, float scale) + public IRenderable Image(Actor self, WorldRenderer wr, PaletteReference pal, float scale) { var p = self.CenterPosition; if (OffsetFunc != null) p += OffsetFunc(); - return new Renderable(Animation.Image, p, ZOffset, pal, scale); + return new SpriteRenderable(Animation.Image, p, ZOffset, pal, scale); } public static implicit operator AnimationWithOffset(Animation a) diff --git a/OpenRA.Game/Graphics/Renderable.cs b/OpenRA.Game/Graphics/Renderable.cs index bb6924b13f..10e15b7fc3 100644 --- a/OpenRA.Game/Graphics/Renderable.cs +++ b/OpenRA.Game/Graphics/Renderable.cs @@ -13,7 +13,7 @@ using System.Drawing; namespace OpenRA.Graphics { - public class RenderableComparer : IComparer + public class RenderableComparer : IComparer { WorldRenderer wr; public RenderableComparer(WorldRenderer wr) @@ -21,54 +21,74 @@ namespace OpenRA.Graphics this.wr = wr; } - public int Compare(Renderable x, Renderable y) + public int Compare(IRenderable x, IRenderable y) { - return x.SortOrder(wr).CompareTo(y.SortOrder(wr)); + var xOrder = wr.ScreenZPosition(x.Pos) + x.ZOffset; + var yOrder = wr.ScreenZPosition(y.Pos) + y.ZOffset; + return xOrder.CompareTo(yOrder); } } - public struct Renderable + public interface IRenderable { - public readonly WPos Pos; - public readonly float Scale; - public readonly PaletteReference Palette; - public readonly int ZOffset; - readonly Sprite Sprite; + WPos Pos { get; } + float Scale { get; } + PaletteReference Palette { get; } + int ZOffset { get; } - public Renderable(Sprite sprite, WPos pos, int zOffset, PaletteReference palette, float scale) + IRenderable WithScale(float newScale); + IRenderable WithPalette(PaletteReference newPalette); + IRenderable WithZOffset(int newOffset); + IRenderable WithPos(WPos pos); + void Render(WorldRenderer wr); + WVec Size(WorldRenderer wr); + } + + public struct SpriteRenderable : IRenderable + { + readonly Sprite sprite; + readonly WPos pos; + readonly int zOffset; + readonly PaletteReference palette; + readonly float scale; + readonly float2 pxCenter; + + public SpriteRenderable(Sprite sprite, WPos pos, int zOffset, PaletteReference palette, float scale) + : this(sprite, pos, zOffset, palette, scale, 0.5f*scale*sprite.size) {} + + public SpriteRenderable(Sprite sprite, WPos pos, int zOffset, PaletteReference palette, float scale, float2 pxCenter) { - Sprite = sprite; - Pos = pos; - Palette = palette; - ZOffset = zOffset; - Scale = scale; + this.sprite = sprite; + this.pos = pos; + this.zOffset = zOffset; + this.palette = palette; + this.scale = scale; + this.pxCenter = pxCenter; } - public Renderable(Sprite sprite, float2 pos, PaletteReference palette, int z) + // Provided for legacy support only - Don't use for new things! + public SpriteRenderable(Sprite sprite, float2 pos, PaletteReference palette, int z) : this(sprite, new PPos((int)pos.X, (int)pos.Y).ToWPos(0), z, palette, 1f) { } - public Renderable WithScale(float newScale) { return new Renderable(Sprite, Pos, ZOffset, Palette, newScale); } - public Renderable WithPalette(PaletteReference newPalette) { return new Renderable(Sprite, Pos, ZOffset, newPalette, Scale); } - public Renderable WithZOffset(int newOffset) { return new Renderable(Sprite, Pos, newOffset, Palette, Scale); } - public Renderable WithPos(WPos pos) { return new Renderable(Sprite, pos, ZOffset, Palette, Scale); } + public WPos Pos { get { return pos; } } + public float Scale { get { return scale; } } + public PaletteReference Palette { get { return palette; } } + public int ZOffset { get { return zOffset; } } + + public IRenderable WithScale(float newScale) { return new SpriteRenderable(sprite, pos, zOffset, palette, newScale); } + public IRenderable WithPalette(PaletteReference newPalette) { return new SpriteRenderable(sprite, pos, zOffset, newPalette, scale); } + public IRenderable WithZOffset(int newOffset) { return new SpriteRenderable(sprite, pos, newOffset, palette, scale); } + public IRenderable WithPos(WPos pos) { return new SpriteRenderable(sprite, pos, zOffset, palette, scale); } public void Render(WorldRenderer wr) { - Sprite.DrawAt(wr.ScreenPxPosition(Pos) - 0.5f*Scale*Sprite.size, Palette.Index, Scale); + sprite.DrawAt(wr.ScreenPxPosition(pos) - pxCenter, palette.Index, scale); } - public Size Size + public WVec Size(WorldRenderer wr) { - get - { - var size = (Scale*Sprite.size).ToInt2(); - return new Size(size.X, size.Y); - } - } - - public int SortOrder(WorldRenderer wr) - { - return (int)wr.ScreenZPosition(Pos) + ZOffset; + var size = (scale*sprite.size).ToInt2(); + return new WVec(size.X, size.Y, size.Y); } } } diff --git a/OpenRA.Game/Traits/Render/RenderSimple.cs b/OpenRA.Game/Traits/Render/RenderSimple.cs index f470569007..f26e73ea2a 100755 --- a/OpenRA.Game/Traits/Render/RenderSimple.cs +++ b/OpenRA.Game/Traits/Render/RenderSimple.cs @@ -34,12 +34,12 @@ namespace OpenRA.Traits public readonly WAngle CameraPitch = WAngle.FromDegrees(40); public virtual object Create(ActorInitializer init) { return new RenderSimple(init.self); } - public virtual IEnumerable RenderPreview(ActorInfo ai, PaletteReference pr) + public virtual IEnumerable RenderPreview(ActorInfo ai, PaletteReference pr) { var anim = new Animation(RenderSimple.GetImage(ai), () => 0); anim.PlayRepeating("idle"); - yield return new Renderable(anim.Image, WPos.Zero, 0, pr, 1f); + yield return new SpriteRenderable(anim.Image, WPos.Zero, 0, pr, 1f); } } @@ -99,7 +99,7 @@ namespace OpenRA.Traits protected void UpdatePalette() { initializePalette = true; } public void OnOwnerChanged(Actor self, Player oldOwner, Player newOwner) { UpdatePalette(); } - public virtual IEnumerable Render(Actor self, WorldRenderer wr) + public virtual IEnumerable Render(Actor self, WorldRenderer wr) { if (initializePalette) { diff --git a/OpenRA.Game/Traits/TraitsInterfaces.cs b/OpenRA.Game/Traits/TraitsInterfaces.cs index 6b94417d81..0fb4bb2de7 100755 --- a/OpenRA.Game/Traits/TraitsInterfaces.cs +++ b/OpenRA.Game/Traits/TraitsInterfaces.cs @@ -35,7 +35,7 @@ namespace OpenRA.Traits public interface ITick { void Tick(Actor self); } public interface ITickRender { void TickRender(WorldRenderer wr, Actor self); } - public interface IRender { IEnumerable Render(Actor self, WorldRenderer wr); } + public interface IRender { IEnumerable Render(Actor self, WorldRenderer wr); } public interface IAutoSelectionSize { int2 SelectionSize(Actor self); } public interface IIssueOrder @@ -116,7 +116,7 @@ namespace OpenRA.Traits } public interface INotifyAttack { void Attacking(Actor self, Target target); } - public interface IRenderModifier { IEnumerable ModifyRender(Actor self, WorldRenderer wr, IEnumerable r); } + public interface IRenderModifier { IEnumerable ModifyRender(Actor self, WorldRenderer wr, IEnumerable r); } public interface IDamageModifier { float GetDamageModifier(Actor attacker, WarheadInfo warhead); } public interface ISpeedModifier { decimal GetSpeedModifier(); } public interface IFirepowerModifier { float GetFirepowerModifier(); } @@ -179,7 +179,7 @@ namespace OpenRA.Traits public interface IPostRenderSelection { void RenderAfterWorld(WorldRenderer wr); } public interface IPreRenderSelection { void RenderBeforeWorld(WorldRenderer wr, Actor self); } - public interface IRenderAsTerrain { IEnumerable RenderAsTerrain(WorldRenderer wr, Actor self); } + public interface IRenderAsTerrain { IEnumerable RenderAsTerrain(WorldRenderer wr, Actor self); } public interface ILocalCoordinatesModel { WVec LocalToWorld(WVec vec); diff --git a/OpenRA.Mods.Cnc/Effects/IonCannon.cs b/OpenRA.Mods.Cnc/Effects/IonCannon.cs index aa9121a455..697efece23 100644 --- a/OpenRA.Mods.Cnc/Effects/IonCannon.cs +++ b/OpenRA.Mods.Cnc/Effects/IonCannon.cs @@ -32,9 +32,9 @@ namespace OpenRA.Mods.Cnc.Effects public void Tick(World world) { anim.Tick(); } - public IEnumerable Render(WorldRenderer wr) + public IEnumerable Render(WorldRenderer wr) { - yield return new Renderable(anim.Image, + yield return new SpriteRenderable(anim.Image, target.CenterLocation.ToFloat2() - new float2(0, 0.5f*anim.Image.size.Y - Game.CellSize), wr.Palette("effect"), (int)target.CenterLocation.Y); } diff --git a/OpenRA.Mods.Cnc/WithCargo.cs b/OpenRA.Mods.Cnc/WithCargo.cs index 590f578a44..906e00db52 100644 --- a/OpenRA.Mods.Cnc/WithCargo.cs +++ b/OpenRA.Mods.Cnc/WithCargo.cs @@ -51,7 +51,7 @@ namespace OpenRA.Mods.Cnc positions[i] = new WVec(info.LocalOffset[3*i], info.LocalOffset[3*i + 1], info.LocalOffset[3*i + 2]); } - public IEnumerable ModifyRender(Actor self, WorldRenderer wr, IEnumerable r) + public IEnumerable ModifyRender(Actor self, WorldRenderer wr, IEnumerable r) { foreach (var rr in r) yield return rr; diff --git a/OpenRA.Mods.RA/BelowUnits.cs b/OpenRA.Mods.RA/BelowUnits.cs index 9bc68c4e17..64c5c36bc2 100644 --- a/OpenRA.Mods.RA/BelowUnits.cs +++ b/OpenRA.Mods.RA/BelowUnits.cs @@ -19,9 +19,9 @@ namespace OpenRA.Mods.RA class BelowUnits : IRenderModifier { - public IEnumerable ModifyRender(Actor self, WorldRenderer wr, IEnumerable r) + public IEnumerable ModifyRender(Actor self, WorldRenderer wr, IEnumerable r) { - return r.Select(a => a.WithZOffset(-a.Size.Height)); + return r.Select(a => a.WithZOffset(-a.Size(wr).Z)); } } } diff --git a/OpenRA.Mods.RA/Bridge.cs b/OpenRA.Mods.RA/Bridge.cs index 8119bfa00a..f8d78a43d5 100644 --- a/OpenRA.Mods.RA/Bridge.cs +++ b/OpenRA.Mods.RA/Bridge.cs @@ -142,7 +142,7 @@ namespace OpenRA.Mods.RA bool initializePalettes = true; PaletteReference terrainPalette; - public IEnumerable RenderAsTerrain(WorldRenderer wr, Actor self) + public IEnumerable RenderAsTerrain(WorldRenderer wr, Actor self) { if (initializePalettes) { @@ -151,7 +151,7 @@ namespace OpenRA.Mods.RA } foreach (var t in TileSprites[currentTemplate]) - yield return new Renderable(t.Value, Traits.Util.CenterOfCell(t.Key).ToFloat2(), terrainPalette, Game.CellSize * t.Key.Y); + yield return new SpriteRenderable(t.Value, Traits.Util.CenterOfCell(t.Key).ToFloat2(), terrainPalette, Game.CellSize * t.Key.Y); } void KillUnitsOnBridge() diff --git a/OpenRA.Mods.RA/Cloak.cs b/OpenRA.Mods.RA/Cloak.cs index b5a1cf770a..81fa26ede3 100644 --- a/OpenRA.Mods.RA/Cloak.cs +++ b/OpenRA.Mods.RA/Cloak.cs @@ -66,9 +66,9 @@ namespace OpenRA.Mods.RA if (!canCloak) Uncloak(); } - static readonly Renderable[] Nothing = { }; + static readonly IRenderable[] Nothing = { }; - public IEnumerable ModifyRender(Actor self, WorldRenderer wr, IEnumerable r) + public IEnumerable ModifyRender(Actor self, WorldRenderer wr, IEnumerable r) { if (remainingTime > 0) return r; diff --git a/OpenRA.Mods.RA/Effects/Bullet.cs b/OpenRA.Mods.RA/Effects/Bullet.cs index de99316eea..1a9ec4ecad 100755 --- a/OpenRA.Mods.RA/Effects/Bullet.cs +++ b/OpenRA.Mods.RA/Effects/Bullet.cs @@ -151,7 +151,7 @@ namespace OpenRA.Mods.RA.Effects const float height = .1f; - public IEnumerable Render(WorldRenderer wr) + public IEnumerable Render(WorldRenderer wr) { if (anim != null) { @@ -166,14 +166,14 @@ namespace OpenRA.Mods.RA.Effects if (Info.High || Info.Angle > 0) { if (Info.Shadow) - yield return new Renderable(anim.Image, pos, wr.Palette("shadow"), (int)pos.Y); + yield return new SpriteRenderable(anim.Image, pos, wr.Palette("shadow"), (int)pos.Y); var highPos = pos - new float2(0, GetAltitude()); - yield return new Renderable(anim.Image, highPos, wr.Palette("effect"), (int)pos.Y); + yield return new SpriteRenderable(anim.Image, highPos, wr.Palette("effect"), (int)pos.Y); } else - yield return new Renderable(anim.Image, pos, + yield return new SpriteRenderable(anim.Image, pos, wr.Palette(Args.weapon.Underwater ? "shadow" : "effect"), (int)pos.Y); } } diff --git a/OpenRA.Mods.RA/Effects/CashTick.cs b/OpenRA.Mods.RA/Effects/CashTick.cs index 77d220e453..ef84230ec2 100644 --- a/OpenRA.Mods.RA/Effects/CashTick.cs +++ b/OpenRA.Mods.RA/Effects/CashTick.cs @@ -49,7 +49,7 @@ namespace OpenRA.Mods.RA.Effects pos -= new PVecInt(0, velocity); } - public IEnumerable Render(WorldRenderer wr) + public IEnumerable Render(WorldRenderer wr) { font.DrawTextWithContrast(s, Game.viewport.Zoom*(pos.ToFloat2() - Game.viewport.Location) - offset, color, Color.Black,1); yield break; diff --git a/OpenRA.Mods.RA/Effects/Corpse.cs b/OpenRA.Mods.RA/Effects/Corpse.cs index 7922fc2b50..d541db69c9 100644 --- a/OpenRA.Mods.RA/Effects/Corpse.cs +++ b/OpenRA.Mods.RA/Effects/Corpse.cs @@ -31,9 +31,9 @@ namespace OpenRA.Mods.RA.Effects public void Tick(World world) { anim.Tick(); } - public IEnumerable Render(WorldRenderer wr) + public IEnumerable Render(WorldRenderer wr) { - yield return new Renderable(anim.Image, pos, wr.Palette(paletteName), (int)pos.Y); + yield return new SpriteRenderable(anim.Image, pos, wr.Palette(paletteName), (int)pos.Y); } } } diff --git a/OpenRA.Mods.RA/Effects/CrateEffect.cs b/OpenRA.Mods.RA/Effects/CrateEffect.cs index f0a26a6794..b7f1b8a8e5 100644 --- a/OpenRA.Mods.RA/Effects/CrateEffect.cs +++ b/OpenRA.Mods.RA/Effects/CrateEffect.cs @@ -39,10 +39,10 @@ namespace OpenRA.Mods.RA.Effects anim.Tick(); } - public IEnumerable Render(WorldRenderer wr) + public IEnumerable Render(WorldRenderer wr) { if (a.IsInWorld) - yield return new Renderable(anim.Image, + yield return new SpriteRenderable(anim.Image, a.CenterLocation.ToFloat2() + offset, wr.Palette("effect"), (int)a.CenterLocation.Y); } diff --git a/OpenRA.Mods.RA/Effects/Explosion.cs b/OpenRA.Mods.RA/Effects/Explosion.cs index 937be75390..7463e3c2ce 100644 --- a/OpenRA.Mods.RA/Effects/Explosion.cs +++ b/OpenRA.Mods.RA/Effects/Explosion.cs @@ -32,10 +32,10 @@ namespace OpenRA.Mods.RA.Effects public void Tick( World world ) { anim.Tick(); } - public IEnumerable Render(WorldRenderer wr) + public IEnumerable Render(WorldRenderer wr) { var p = pos.ToInt2() - new int2(0, altitude); - yield return new Renderable(anim.Image, p, wr.Palette("effect"), p.Y); + yield return new SpriteRenderable(anim.Image, p, wr.Palette("effect"), p.Y); } public Player Owner { get { return null; } } diff --git a/OpenRA.Mods.RA/Effects/GpsDot.cs b/OpenRA.Mods.RA/Effects/GpsDot.cs index 25b51a04ce..821fbb8074 100644 --- a/OpenRA.Mods.RA/Effects/GpsDot.cs +++ b/OpenRA.Mods.RA/Effects/GpsDot.cs @@ -77,14 +77,14 @@ namespace OpenRA.Mods.RA.Effects show = hasGps && hasDot && !dotHidden; } - public IEnumerable Render(WorldRenderer wr) + public IEnumerable Render(WorldRenderer wr) { if (!show || self.Destroyed) yield break; var p = self.CenterLocation; var palette = wr.Palette(info.IndicatorPalettePrefix+self.Owner.InternalName); - yield return new Renderable(anim.Image, p.ToFloat2(), palette, p.Y) + yield return new SpriteRenderable(anim.Image, p.ToFloat2(), palette, p.Y) .WithScale(1.5f); } } diff --git a/OpenRA.Mods.RA/Effects/GpsSatellite.cs b/OpenRA.Mods.RA/Effects/GpsSatellite.cs index 40af4efdd7..55f3eaeab9 100644 --- a/OpenRA.Mods.RA/Effects/GpsSatellite.cs +++ b/OpenRA.Mods.RA/Effects/GpsSatellite.cs @@ -36,9 +36,9 @@ namespace OpenRA.Mods.RA.Effects world.AddFrameEndTask(w => w.Remove(this)); } - public IEnumerable Render(WorldRenderer wr) + public IEnumerable Render(WorldRenderer wr) { - yield return new Renderable(anim.Image, offset, wr.Palette("effect"), (int)offset.Y); + yield return new SpriteRenderable(anim.Image, offset, wr.Palette("effect"), (int)offset.Y); } } } diff --git a/OpenRA.Mods.RA/Effects/GravityBomb.cs b/OpenRA.Mods.RA/Effects/GravityBomb.cs index 090c776995..3ecedf622b 100755 --- a/OpenRA.Mods.RA/Effects/GravityBomb.cs +++ b/OpenRA.Mods.RA/Effects/GravityBomb.cs @@ -51,10 +51,10 @@ namespace OpenRA.Mods.RA.Effects anim.Tick(); } - public IEnumerable Render(WorldRenderer wr) + public IEnumerable Render(WorldRenderer wr) { var pos = Args.dest.ToInt2() - new int2(0, altitude) - .5f * anim.Image.size; - yield return new Renderable(anim.Image, pos, wr.Palette("effect"), Args.dest.Y); + yield return new SpriteRenderable(anim.Image, pos, wr.Palette("effect"), Args.dest.Y); } } } diff --git a/OpenRA.Mods.RA/Effects/InvulnEffect.cs b/OpenRA.Mods.RA/Effects/InvulnEffect.cs index d16dd233a9..bd0b856fc9 100644 --- a/OpenRA.Mods.RA/Effects/InvulnEffect.cs +++ b/OpenRA.Mods.RA/Effects/InvulnEffect.cs @@ -32,7 +32,7 @@ namespace OpenRA.Mods.RA.Effects world.AddFrameEndTask(w => w.Remove(this)); } - public IEnumerable Render(WorldRenderer wr) + public IEnumerable Render(WorldRenderer wr) { if (a.Destroyed) // Tick will clean up yield break; diff --git a/OpenRA.Mods.RA/Effects/LaserZap.cs b/OpenRA.Mods.RA/Effects/LaserZap.cs index f1391fedc0..c3e0864609 100755 --- a/OpenRA.Mods.RA/Effects/LaserZap.cs +++ b/OpenRA.Mods.RA/Effects/LaserZap.cs @@ -76,11 +76,11 @@ namespace OpenRA.Mods.RA.Effects world.AddFrameEndTask(w => w.Remove(this)); } - public IEnumerable Render(WorldRenderer wr) + public IEnumerable Render(WorldRenderer wr) { if (explosion != null) - yield return new Renderable(explosion.Image, args.dest.ToFloat2(), - wr.Palette("effect"), (int)args.dest.Y); + yield return new SpriteRenderable(explosion.Image, args.dest.ToFloat2(), + wr.Palette("effect"), (int)args.dest.Y); if (ticks >= info.BeamDuration) yield break; diff --git a/OpenRA.Mods.RA/Effects/Missile.cs b/OpenRA.Mods.RA/Effects/Missile.cs index 6058482daf..f234899806 100755 --- a/OpenRA.Mods.RA/Effects/Missile.cs +++ b/OpenRA.Mods.RA/Effects/Missile.cs @@ -174,11 +174,11 @@ namespace OpenRA.Mods.RA.Effects Combat.DoImpacts(Args); } - public IEnumerable Render(WorldRenderer wr) + public IEnumerable Render(WorldRenderer wr) { if (!Args.firedBy.World.FogObscures(PxPosition.ToCPos())) - yield return new Renderable(anim.Image, PxPosition.ToFloat2() - new float2(0, Altitude), - wr.Palette(Args.weapon.Underwater ? "shadow" : "effect"), PxPosition.Y); + yield return new SpriteRenderable(anim.Image, PxPosition.ToFloat2() - new float2(0, Altitude), + wr.Palette(Args.weapon.Underwater ? "shadow" : "effect"), PxPosition.Y); if (Trail != null) Trail.Render(wr, Args.firedBy); diff --git a/OpenRA.Mods.RA/Effects/NukeLaunch.cs b/OpenRA.Mods.RA/Effects/NukeLaunch.cs index efee4114fe..ac13568f77 100755 --- a/OpenRA.Mods.RA/Effects/NukeLaunch.cs +++ b/OpenRA.Mods.RA/Effects/NukeLaunch.cs @@ -77,9 +77,9 @@ namespace OpenRA.Mods.RA.Effects a.Trait.Enable(); } - public IEnumerable Render(WorldRenderer wr) + public IEnumerable Render(WorldRenderer wr) { - yield return new Renderable(anim.Image, pos.ToFloat2() - new float2(0, altitude), + yield return new SpriteRenderable(anim.Image, pos.ToFloat2() - new float2(0, altitude), wr.Palette("effect"), (int)pos.Y); } } diff --git a/OpenRA.Mods.RA/Effects/Parachute.cs b/OpenRA.Mods.RA/Effects/Parachute.cs index 54d169feec..97ac756ce8 100644 --- a/OpenRA.Mods.RA/Effects/Parachute.cs +++ b/OpenRA.Mods.RA/Effects/Parachute.cs @@ -61,7 +61,7 @@ namespace OpenRA.Mods.RA.Effects } } - public IEnumerable Render(WorldRenderer wr) + public IEnumerable Render(WorldRenderer wr) { var rc = cargo.Render(wr); @@ -76,7 +76,7 @@ namespace OpenRA.Mods.RA.Effects yield return c.WithPos(pos); } - yield return new Renderable(paraAnim.Image, pos + parachuteOffset, 1, rc.First().Palette, 1f); + yield return new SpriteRenderable(paraAnim.Image, pos + parachuteOffset, 1, rc.First().Palette, 1f); } } } diff --git a/OpenRA.Mods.RA/Effects/PowerdownIndicator.cs b/OpenRA.Mods.RA/Effects/PowerdownIndicator.cs index b7861027a0..27cc956cbf 100644 --- a/OpenRA.Mods.RA/Effects/PowerdownIndicator.cs +++ b/OpenRA.Mods.RA/Effects/PowerdownIndicator.cs @@ -34,10 +34,10 @@ namespace OpenRA.Mods.RA.Effects anim.Tick(); } - public IEnumerable Render(WorldRenderer wr) + public IEnumerable Render(WorldRenderer wr) { if (!a.Destroyed && a.Owner.IsAlliedWith(a.World.RenderPlayer)) - yield return new Renderable(anim.Image, a.CenterLocation.ToFloat2(), + yield return new SpriteRenderable(anim.Image, a.CenterLocation.ToFloat2(), wr.Palette("chrome"), (int)a.CenterLocation.Y); } } diff --git a/OpenRA.Mods.RA/Effects/RallyPoint.cs b/OpenRA.Mods.RA/Effects/RallyPoint.cs index 555d597bd6..e2603633a6 100755 --- a/OpenRA.Mods.RA/Effects/RallyPoint.cs +++ b/OpenRA.Mods.RA/Effects/RallyPoint.cs @@ -48,7 +48,7 @@ namespace OpenRA.Mods.RA.Effects world.AddFrameEndTask(w => w.Remove(this)); } - public IEnumerable Render(WorldRenderer wr) + public IEnumerable Render(WorldRenderer wr) { if (building.IsInWorld && building.Owner == building.World.LocalPlayer && building.World.Selection.Actors.Contains(building)) @@ -56,11 +56,11 @@ namespace OpenRA.Mods.RA.Effects var pos = Traits.Util.CenterOfCell(rp.rallyPoint); var palette = wr.Palette(palettePrefix+building.Owner.InternalName); - yield return new Renderable(circles.Image, + yield return new SpriteRenderable(circles.Image, pos.ToFloat2() - .5f * circles.Image.size, palette, (int)pos.Y); - yield return new Renderable(flag.Image, + yield return new SpriteRenderable(flag.Image, pos.ToFloat2() + new float2(-1,-17), palette, (int)pos.Y); } diff --git a/OpenRA.Mods.RA/Effects/RepairIndicator.cs b/OpenRA.Mods.RA/Effects/RepairIndicator.cs index 3757bb493d..2948b9f497 100755 --- a/OpenRA.Mods.RA/Effects/RepairIndicator.cs +++ b/OpenRA.Mods.RA/Effects/RepairIndicator.cs @@ -42,11 +42,11 @@ namespace OpenRA.Mods.RA.Effects anim.Tick(); } - public IEnumerable Render(WorldRenderer wr) + public IEnumerable Render(WorldRenderer wr) { if (!building.Destroyed) { - yield return new Renderable(anim.Image, + yield return new SpriteRenderable(anim.Image, building.CenterLocation.ToFloat2(), wr.Palette(palettePrefix+player.InternalName), (int)building.CenterLocation.Y); } diff --git a/OpenRA.Mods.RA/Effects/SatelliteLaunch.cs b/OpenRA.Mods.RA/Effects/SatelliteLaunch.cs index cfcb8d0873..ef097bf258 100644 --- a/OpenRA.Mods.RA/Effects/SatelliteLaunch.cs +++ b/OpenRA.Mods.RA/Effects/SatelliteLaunch.cs @@ -40,9 +40,9 @@ namespace OpenRA.Mods.RA.Effects } } - public IEnumerable Render(WorldRenderer wr) + public IEnumerable Render(WorldRenderer wr) { - yield return new Renderable(doors.Image, pos, wr.Palette("effect"), (int)doorOffset.Y); + yield return new SpriteRenderable(doors.Image, pos, wr.Palette("effect"), (int)doorOffset.Y); } } } diff --git a/OpenRA.Mods.RA/Effects/Smoke.cs b/OpenRA.Mods.RA/Effects/Smoke.cs index 4406536795..97e8aa6410 100644 --- a/OpenRA.Mods.RA/Effects/Smoke.cs +++ b/OpenRA.Mods.RA/Effects/Smoke.cs @@ -33,9 +33,9 @@ namespace OpenRA.Mods.RA.Effects anim.Tick(); } - public IEnumerable Render(WorldRenderer wr) + public IEnumerable Render(WorldRenderer wr) { - yield return new Renderable(anim.Image, pos.ToFloat2(), + yield return new SpriteRenderable(anim.Image, pos.ToFloat2(), wr.Palette("effect"), (int)pos.Y); } } diff --git a/OpenRA.Mods.RA/Effects/TeslaZap.cs b/OpenRA.Mods.RA/Effects/TeslaZap.cs index 74e0fd1707..6b5fe75f00 100755 --- a/OpenRA.Mods.RA/Effects/TeslaZap.cs +++ b/OpenRA.Mods.RA/Effects/TeslaZap.cs @@ -30,7 +30,7 @@ namespace OpenRA.Mods.RA.Effects { readonly ProjectileArgs Args; readonly TeslaZapInfo Info; - IEnumerable renderables; + IEnumerable renderables; int timeUntilRemove = 2; // # of frames bool doneDamage = false; bool initialized = false; @@ -41,7 +41,7 @@ namespace OpenRA.Mods.RA.Effects Info = info; } - public IEnumerable GenerateRenderables(WorldRenderer wr) + public IEnumerable GenerateRenderables(WorldRenderer wr) { var bright = SequenceProvider.GetSequence(Info.Image, "bright"); var dim = SequenceProvider.GetSequence(Info.Image, "dim"); @@ -72,7 +72,7 @@ namespace OpenRA.Mods.RA.Effects } } - public IEnumerable Render(WorldRenderer wr) + public IEnumerable Render(WorldRenderer wr) { if (!initialized) { @@ -83,13 +83,13 @@ namespace OpenRA.Mods.RA.Effects return renderables; } - static IEnumerable DrawZapWandering(WorldRenderer wr, PPos from, PPos to, Sequence s) + static IEnumerable DrawZapWandering(WorldRenderer wr, PPos from, PPos to, Sequence s) { var z = float2.Zero; /* hack */ var dist = to - from; var norm = (1f / dist.Length) * new float2(-dist.Y, dist.X); - var renderables = new List(); + var renderables = new List(); if (Game.CosmeticRandom.Next(2) != 0) { var p1 = from.ToFloat2() + (1 / 3f) * dist.ToFloat2() + Game.CosmeticRandom.Gauss1D(1) * .2f * dist.Length * norm; @@ -110,12 +110,12 @@ namespace OpenRA.Mods.RA.Effects return renderables; } - static IEnumerable DrawZap(WorldRenderer wr, float2 from, float2 to, Sequence s, out float2 p) + static IEnumerable DrawZap(WorldRenderer wr, float2 from, float2 to, Sequence s, out float2 p) { var dist = to - from; var q = new float2(-dist.Y, dist.X); var c = -float2.Dot(from, q); - var rs = new List(); + var rs = new List(); var z = from; while ((to - z).X > 5 || (to - z).X < -5 || (to - z).Y > 5 || (to - z).Y < -5) @@ -123,7 +123,7 @@ namespace OpenRA.Mods.RA.Effects var step = steps.Where(t => (to - (z + new float2(t[0],t[1]))).LengthSquared < (to - z).LengthSquared ) .OrderBy(t => Math.Abs(float2.Dot(z + new float2(t[0], t[1]), q) + c)).First(); - rs.Add(new Renderable(s.GetSprite(step[4]), z + new float2(step[2], step[3]), + rs.Add(new SpriteRenderable(s.GetSprite(step[4]), z + new float2(step[2], step[3]), wr.Palette("effect"), (int)from.Y)); z += new float2(step[0], step[1]); if( rs.Count >= 1000 ) diff --git a/OpenRA.Mods.RA/GainsExperience.cs b/OpenRA.Mods.RA/GainsExperience.cs index a646756f6c..80d8ec61d1 100644 --- a/OpenRA.Mods.RA/GainsExperience.cs +++ b/OpenRA.Mods.RA/GainsExperience.cs @@ -98,7 +98,7 @@ namespace OpenRA.Mods.RA return Level > 0 ? Info.SpeedModifier[Level - 1] : 1m; } - public IEnumerable ModifyRender(Actor self, WorldRenderer wr, IEnumerable r) + public IEnumerable ModifyRender(Actor self, WorldRenderer wr, IEnumerable r) { // TODO: Make this consistent with everything else that adds animations to RenderSimple. if (self.Owner.IsAlliedWith(self.World.RenderPlayer) && Level > 0) @@ -107,7 +107,7 @@ namespace OpenRA.Mods.RA return r; } - IEnumerable InnerModifyRender(Actor self, WorldRenderer wr, IEnumerable r) + IEnumerable InnerModifyRender(Actor self, WorldRenderer wr, IEnumerable r) { foreach (var rs in r) yield return rs; @@ -119,7 +119,7 @@ namespace OpenRA.Mods.RA var bounds = self.Bounds.Value; var pos = new float2(bounds.Right, bounds.Bottom - 2); - yield return new Renderable(RankAnim.Image, pos, wr.Palette("effect"), self.CenterLocation.Y); + yield return new SpriteRenderable(RankAnim.Image, pos, wr.Palette("effect"), self.CenterLocation.Y); } } diff --git a/OpenRA.Mods.RA/Modifiers/FrozenUnderFog.cs b/OpenRA.Mods.RA/Modifiers/FrozenUnderFog.cs index 22b207ade7..3ec4839eaa 100644 --- a/OpenRA.Mods.RA/Modifiers/FrozenUnderFog.cs +++ b/OpenRA.Mods.RA/Modifiers/FrozenUnderFog.cs @@ -24,8 +24,8 @@ namespace OpenRA.Mods.RA return byPlayer == null || Shroud.GetVisOrigins(self).Any(o => byPlayer.Shroud.IsVisible(o)); } - Renderable[] cache = { }; - public IEnumerable ModifyRender(Actor self, WorldRenderer wr, IEnumerable r) + IRenderable[] cache = { }; + public IEnumerable ModifyRender(Actor self, WorldRenderer wr, IEnumerable r) { if (IsVisible(self, self.World.RenderPlayer)) cache = r.ToArray(); diff --git a/OpenRA.Mods.RA/Modifiers/HiddenUnderFog.cs b/OpenRA.Mods.RA/Modifiers/HiddenUnderFog.cs index 0686b0941a..7d098af3b8 100644 --- a/OpenRA.Mods.RA/Modifiers/HiddenUnderFog.cs +++ b/OpenRA.Mods.RA/Modifiers/HiddenUnderFog.cs @@ -24,8 +24,8 @@ namespace OpenRA.Mods.RA return byPlayer == null || Shroud.GetVisOrigins(self).Any(o => byPlayer.Shroud.IsVisible(o)); } - static Renderable[] Nothing = { }; - public IEnumerable ModifyRender(Actor self, WorldRenderer wr, IEnumerable r) + static IRenderable[] Nothing = { }; + public IEnumerable ModifyRender(Actor self, WorldRenderer wr, IEnumerable r) { return IsVisible(self, self.World.RenderPlayer) ? r : Nothing; } diff --git a/OpenRA.Mods.RA/Orders/PlaceBuildingOrderGenerator.cs b/OpenRA.Mods.RA/Orders/PlaceBuildingOrderGenerator.cs index 3f784b10aa..84cb7a52b7 100755 --- a/OpenRA.Mods.RA/Orders/PlaceBuildingOrderGenerator.cs +++ b/OpenRA.Mods.RA/Orders/PlaceBuildingOrderGenerator.cs @@ -22,7 +22,7 @@ namespace OpenRA.Mods.RA.Orders readonly Actor Producer; readonly string Building; readonly BuildingInfo BuildingInfo; - IEnumerable preview; + IEnumerable preview; Sprite buildOk, buildBlocked; bool initialized = false; diff --git a/OpenRA.Mods.RA/Render/RenderBuilding.cs b/OpenRA.Mods.RA/Render/RenderBuilding.cs index 1836c86d02..7fd16390df 100755 --- a/OpenRA.Mods.RA/Render/RenderBuilding.cs +++ b/OpenRA.Mods.RA/Render/RenderBuilding.cs @@ -28,7 +28,7 @@ namespace OpenRA.Mods.RA.Render public readonly WVec Origin = WVec.Zero; public override object Create(ActorInitializer init) { return new RenderBuilding(init, this);} - public override IEnumerable RenderPreview(ActorInfo building, PaletteReference pr) + public override IEnumerable RenderPreview(ActorInfo building, PaletteReference pr) { return base.RenderPreview(building, pr).Select(a => a.WithPos(a.Pos + Origin)); } @@ -65,7 +65,7 @@ namespace OpenRA.Mods.RA.Render self.QueueActivity(new CallFunc(() => Complete(self))); } - public IEnumerable ModifyRender(Actor self, WorldRenderer wr, IEnumerable r) + public IEnumerable ModifyRender(Actor self, WorldRenderer wr, IEnumerable r) { var disabled = self.IsDisabled(); foreach (var a in r) diff --git a/OpenRA.Mods.RA/Render/RenderBuildingWarFactory.cs b/OpenRA.Mods.RA/Render/RenderBuildingWarFactory.cs index ea901b8d9d..1c2ab4b950 100755 --- a/OpenRA.Mods.RA/Render/RenderBuildingWarFactory.cs +++ b/OpenRA.Mods.RA/Render/RenderBuildingWarFactory.cs @@ -20,12 +20,12 @@ namespace OpenRA.Mods.RA.Render public override object Create(ActorInitializer init) { return new RenderBuildingWarFactory( init, this ); } /* get around unverifiability */ - IEnumerable BaseBuildingPreview(ActorInfo building, PaletteReference pr) + IEnumerable BaseBuildingPreview(ActorInfo building, PaletteReference pr) { return base.RenderPreview(building, pr); } - public override IEnumerable RenderPreview(ActorInfo building, PaletteReference pr) + public override IEnumerable RenderPreview(ActorInfo building, PaletteReference pr) { var p = BaseBuildingPreview(building, pr); foreach (var r in p) @@ -33,7 +33,7 @@ namespace OpenRA.Mods.RA.Render var anim = new Animation(RenderSimple.GetImage(building), () => 0); anim.PlayRepeating("idle-top"); - yield return new Renderable(anim.Image, WPos.Zero + Origin, 0, pr, 1f); + yield return new SpriteRenderable(anim.Image, WPos.Zero + Origin, 0, pr, 1f); } } diff --git a/OpenRA.Mods.RA/Render/RenderEditorOnly.cs b/OpenRA.Mods.RA/Render/RenderEditorOnly.cs index 4f2825fb8a..a6bbfdc0cd 100644 --- a/OpenRA.Mods.RA/Render/RenderEditorOnly.cs +++ b/OpenRA.Mods.RA/Render/RenderEditorOnly.cs @@ -23,7 +23,7 @@ namespace OpenRA.Mods.RA.Render { public RenderEditorOnly(Actor self) : base(self, () => 0) { } - static readonly Renderable[] Nothing = { }; - public override IEnumerable Render(Actor self, WorldRenderer wr) { return Nothing; } + static readonly IRenderable[] Nothing = { }; + public override IEnumerable Render(Actor self, WorldRenderer wr) { return Nothing; } } } diff --git a/OpenRA.Mods.RA/Render/WithMuzzleFlash.cs b/OpenRA.Mods.RA/Render/WithMuzzleFlash.cs index fea544b4d5..6886cf8e02 100644 --- a/OpenRA.Mods.RA/Render/WithMuzzleFlash.cs +++ b/OpenRA.Mods.RA/Render/WithMuzzleFlash.cs @@ -59,7 +59,7 @@ namespace OpenRA.Mods.RA.Render mf.Animation.PlayThen("muzzle", () => isShowing = false); } - public IEnumerable Render(Actor self, WorldRenderer wr) + public IEnumerable Render(Actor self, WorldRenderer wr) { foreach (var a in muzzleFlashes.Values) if (a.DisableFunc == null || !a.DisableFunc()) diff --git a/OpenRA.Mods.RA/Render/WithShadow.cs b/OpenRA.Mods.RA/Render/WithShadow.cs index d1d33f8f5f..b866d6c2e3 100644 --- a/OpenRA.Mods.RA/Render/WithShadow.cs +++ b/OpenRA.Mods.RA/Render/WithShadow.cs @@ -22,7 +22,7 @@ namespace OpenRA.Mods.RA.Render class WithShadow : IRenderModifier { - public IEnumerable ModifyRender(Actor self, WorldRenderer wr, IEnumerable r) + public IEnumerable ModifyRender(Actor self, WorldRenderer wr, IEnumerable r) { var move = self.Trait();