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

Split Renderable into an IRenderable interface and SpriteRenderable implementation.

Browse Source
This commit is contained in:
Paul Chote
2013-05-12 23:07:39 +12:00
parent 9b7aaebcbc
commit ca5f2c3785
41 changed files with 140 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenRA.Mods.RA/Effects/Bullet.cs
View File

@@ -151,7 +151,7 @@ namespace OpenRA.Mods.RA.Effects
const float height = .1f;
public IEnumerable<Renderable> Render(WorldRenderer wr)
public IEnumerable<IRenderable> 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);
}
}

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

@@ -49,7 +49,7 @@ namespace OpenRA.Mods.RA.Effects
pos -= new PVecInt(0, velocity);
}
public IEnumerable<Renderable> Render(WorldRenderer wr)
public IEnumerable<IRenderable> Render(WorldRenderer wr)
{
font.DrawTextWithContrast(s, Game.viewport.Zoom*(pos.ToFloat2() - Game.viewport.Location) - offset, color, Color.Black,1);
yield break;

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

@@ -31,9 +31,9 @@ namespace OpenRA.Mods.RA.Effects
public void Tick(World world) { anim.Tick(); }
public IEnumerable<Renderable> Render(WorldRenderer wr)
public IEnumerable<IRenderable> 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);
}
}
}

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

@@ -39,10 +39,10 @@ namespace OpenRA.Mods.RA.Effects
anim.Tick();
}
public IEnumerable<Renderable> Render(WorldRenderer wr)
public IEnumerable<IRenderable> 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);
}

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

@@ -32,10 +32,10 @@ namespace OpenRA.Mods.RA.Effects
public void Tick( World world ) { anim.Tick(); }
public IEnumerable<Renderable> Render(WorldRenderer wr)
public IEnumerable<IRenderable> 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; } }

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

@@ -77,14 +77,14 @@ namespace OpenRA.Mods.RA.Effects
show = hasGps && hasDot && !dotHidden;
}
public IEnumerable<Renderable> Render(WorldRenderer wr)
public IEnumerable<IRenderable> 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);
}
}

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

@@ -36,9 +36,9 @@ namespace OpenRA.Mods.RA.Effects
world.AddFrameEndTask(w => w.Remove(this));
}
public IEnumerable<Renderable> Render(WorldRenderer wr)
public IEnumerable<IRenderable> 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);
}
}
}

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

@@ -51,10 +51,10 @@ namespace OpenRA.Mods.RA.Effects
anim.Tick();
}
public IEnumerable<Renderable> Render(WorldRenderer wr)
public IEnumerable<IRenderable> 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);
}
}
}

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

@@ -32,7 +32,7 @@ namespace OpenRA.Mods.RA.Effects
world.AddFrameEndTask(w => w.Remove(this));
}
public IEnumerable<Renderable> Render(WorldRenderer wr)
public IEnumerable<IRenderable> Render(WorldRenderer wr)
{
if (a.Destroyed) // Tick will clean up
yield break;

6
OpenRA.Mods.RA/Effects/LaserZap.cs
View File

@@ -76,11 +76,11 @@ namespace OpenRA.Mods.RA.Effects
world.AddFrameEndTask(w => w.Remove(this));
}
public IEnumerable<Renderable> Render(WorldRenderer wr)
public IEnumerable<IRenderable> 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;

6
OpenRA.Mods.RA/Effects/Missile.cs
View File

@@ -174,11 +174,11 @@ namespace OpenRA.Mods.RA.Effects
Combat.DoImpacts(Args);
}
public IEnumerable<Renderable> Render(WorldRenderer wr)
public IEnumerable<IRenderable> 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);

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

@@ -77,9 +77,9 @@ namespace OpenRA.Mods.RA.Effects
a.Trait.Enable();
}
public IEnumerable<Renderable> Render(WorldRenderer wr)
public IEnumerable<IRenderable> 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);
}
}

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

@@ -61,7 +61,7 @@ namespace OpenRA.Mods.RA.Effects
}
}
public IEnumerable<Renderable> Render(WorldRenderer wr)
public IEnumerable<IRenderable> 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);
}
}
}

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

@@ -34,10 +34,10 @@ namespace OpenRA.Mods.RA.Effects
anim.Tick();
}
public IEnumerable<Renderable> Render(WorldRenderer wr)
public IEnumerable<IRenderable> 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);
}
}

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

@@ -48,7 +48,7 @@ namespace OpenRA.Mods.RA.Effects
world.AddFrameEndTask(w => w.Remove(this));
}
public IEnumerable<Renderable> Render(WorldRenderer wr)
public IEnumerable<IRenderable> 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);
}

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

@@ -42,11 +42,11 @@ namespace OpenRA.Mods.RA.Effects
anim.Tick();
}
public IEnumerable<Renderable> Render(WorldRenderer wr)
public IEnumerable<IRenderable> 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);
}

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

@@ -40,9 +40,9 @@ namespace OpenRA.Mods.RA.Effects
}
}
public IEnumerable<Renderable> Render(WorldRenderer wr)
public IEnumerable<IRenderable> 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);
}
}
}

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

@@ -33,9 +33,9 @@ namespace OpenRA.Mods.RA.Effects
anim.Tick();
}
public IEnumerable<Renderable> Render(WorldRenderer wr)
public IEnumerable<IRenderable> 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);
}
}

16
OpenRA.Mods.RA/Effects/TeslaZap.cs
View File

@@ -30,7 +30,7 @@ namespace OpenRA.Mods.RA.Effects
{
readonly ProjectileArgs Args;
readonly TeslaZapInfo Info;
IEnumerable<Renderable> renderables;
IEnumerable<IRenderable> 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<Renderable> GenerateRenderables(WorldRenderer wr)
public IEnumerable<IRenderable> 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<Renderable> Render(WorldRenderer wr)
public IEnumerable<IRenderable> Render(WorldRenderer wr)
{
if (!initialized)
{
@@ -83,13 +83,13 @@ namespace OpenRA.Mods.RA.Effects
return renderables;
}
static IEnumerable<Renderable> DrawZapWandering(WorldRenderer wr, PPos from, PPos to, Sequence s)
static IEnumerable<IRenderable> 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<Renderable>();
var renderables = new List<IRenderable>();
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<Renderable> DrawZap(WorldRenderer wr, float2 from, float2 to, Sequence s, out float2 p)
static IEnumerable<IRenderable> 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<Renderable>();
var rs = new List<IRenderable>();
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 )