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

Move effects to WorldRenderer palette lookup.

Browse Source
This commit is contained in:
Paul Chote
2013-02-24 11:32:32 +13:00
parent 95871e6cc1
commit 885eec7444
24 changed files with 45 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
OpenRA.Game/Effects/DelayedAction.cs
View File

@@ -10,6 +10,7 @@
using System;
using System.Collections.Generic;
using OpenRA.Graphics;
using OpenRA.Traits;
namespace OpenRA.Effects
@@ -25,12 +26,12 @@ namespace OpenRA.Effects
this.delay = delay;
}
public void Tick( World world )
public void Tick(World world)
{
if (--delay <= 0)
world.AddFrameEndTask(w => { w.Remove(this); a(); });
}
public IEnumerable<Renderable> Render() { yield break; }
public IEnumerable<Renderable> Render(WorldRenderer wr) { yield break; }
}
}

4
OpenRA.Game/Effects/FlashTarget.cs
View File

@@ -33,14 +33,14 @@ namespace OpenRA.Effects
world.AddFrameEndTask(w => w.Remove(this));
}
public IEnumerable<Renderable> Render()
public IEnumerable<Renderable> Render(WorldRenderer wr)
{
if (!target.IsInWorld)
yield break;
if (remainingTicks % 2 == 0)
foreach (var r in target.Render())
yield return r.WithPalette(PaletteReference.FromName("highlight"));
yield return r.WithPalette(wr.Palette("highlight"));
}
}
}

5
OpenRA.Game/Effects/IEffect.cs
View File

@@ -9,13 +9,14 @@
#endregion
using System.Collections.Generic;
using OpenRA.Graphics;
using OpenRA.Traits;
namespace OpenRA.Effects
{
public interface IEffect
{
void Tick( World world );
IEnumerable<Renderable> Render();
void Tick(World world);
IEnumerable<Renderable> Render(WorldRenderer r);
}
}

2
OpenRA.Game/Graphics/WorldRenderer.cs
View File

@@ -95,7 +95,7 @@ namespace OpenRA.Graphics
var renderables = actors.SelectMany(a => a.Render())
.OrderBy(r => r, comparer);
var effects = world.Effects.SelectMany(e => e.Render());
var effects = world.Effects.SelectMany(e => e.Render(this));
return renderables.Concat(effects);
}

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

@@ -32,11 +32,11 @@ namespace OpenRA.Mods.Cnc.Effects
public void Tick(World world) { anim.Tick(); }
public IEnumerable<Renderable> Render()
public IEnumerable<Renderable> Render(WorldRenderer wr)
{
yield return new Renderable(anim.Image,
target.CenterLocation.ToFloat2() - new float2(.5f * anim.Image.size.X, anim.Image.size.Y - Game.CellSize),
PaletteReference.FromName("effect"), (int)target.CenterLocation.Y);
wr.Palette("effect"), (int)target.CenterLocation.Y);
}
void Finish( World world )

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

@@ -144,7 +144,7 @@ namespace OpenRA.Mods.RA.Effects
const float height = .1f;
public IEnumerable<Renderable> Render()
public IEnumerable<Renderable> Render(WorldRenderer wr)
{
if (anim != null)
{
@@ -158,15 +158,15 @@ namespace OpenRA.Mods.RA.Effects
if (Info.High || Info.Angle > 0)
{
if (Info.Shadow)
yield return new Renderable(anim.Image, pos - .5f * anim.Image.size, PaletteReference.FromName("shadow"), (int)pos.Y);
yield return new Renderable(anim.Image, pos - .5f * anim.Image.size, wr.Palette("shadow"), (int)pos.Y);
var highPos = pos - new float2(0, GetAltitude());
yield return new Renderable(anim.Image, highPos - .5f * anim.Image.size, PaletteReference.FromName("effect"), (int)pos.Y);
yield return new Renderable(anim.Image, highPos - .5f * anim.Image.size, wr.Palette("effect"), (int)pos.Y);
}
else
yield return new Renderable(anim.Image, pos - .5f * anim.Image.size,
PaletteReference.FromName(Args.weapon.Underwater ? "shadow" : "effect"), (int)pos.Y);
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()
public IEnumerable<Renderable> Render(WorldRenderer wr)
{
font.DrawTextWithContrast(s, Game.viewport.Zoom*(pos.ToFloat2() - Game.viewport.Location) - offset, color, Color.Black,1);
yield break;

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

@@ -34,7 +34,7 @@ namespace OpenRA.Mods.RA.Effects
public void Tick( World world ) { anim.Tick(); }
public IEnumerable<Renderable> Render()
public IEnumerable<Renderable> Render(WorldRenderer wr)
{
yield return new Renderable(anim.Image, pos - .5f * anim.Image.size, palette, (int)pos.Y);
}

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

@@ -39,12 +39,12 @@ namespace OpenRA.Mods.RA.Effects
anim.Tick();
}
public IEnumerable<Renderable> Render()
public IEnumerable<Renderable> Render(WorldRenderer wr)
{
if (a.IsInWorld)
yield return new Renderable(anim.Image,
a.CenterLocation.ToFloat2() - .5f * anim.Image.size + offset,
PaletteReference.FromName("effect"), (int)a.CenterLocation.Y);
wr.Palette("effect"), (int)a.CenterLocation.Y);
}
}
}

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

@@ -32,11 +32,11 @@ namespace OpenRA.Mods.RA.Effects
public void Tick( World world ) { anim.Tick(); }
public IEnumerable<Renderable> Render()
public IEnumerable<Renderable> Render(WorldRenderer wr)
{
yield return new Renderable(anim.Image,
pos.ToFloat2() - .5f * anim.Image.size - new int2(0,altitude),
PaletteReference.FromName("effect"), (int)pos.Y - altitude);
wr.Palette("effect"), (int)pos.Y - altitude);
}
public Player Owner { get { return null; } }

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

@@ -66,7 +66,7 @@ namespace OpenRA.Mods.RA.Effects
}
}
public IEnumerable<Renderable> Render()
public IEnumerable<Renderable> Render(WorldRenderer wr)
{
if (show && !self.Destroyed)
{

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()
public IEnumerable<Renderable> Render(WorldRenderer wr)
{
yield return new Renderable(anim.Image,offset, PaletteReference.FromName("effect"), (int)offset.Y);
yield return new Renderable(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()
public IEnumerable<Renderable> Render(WorldRenderer wr)
{
var pos = Args.dest.ToInt2() - new int2(0, altitude) - .5f * anim.Image.size;
yield return new Renderable(anim.Image, pos, PaletteReference.FromName("effect"), Args.dest.Y);
yield return new Renderable(anim.Image, pos, wr.Palette("effect"), Args.dest.Y);
}
}
}

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

@@ -32,13 +32,13 @@ namespace OpenRA.Mods.RA.Effects
world.AddFrameEndTask(w => w.Remove(this));
}
public IEnumerable<Renderable> Render()
public IEnumerable<Renderable> Render(WorldRenderer wr)
{
if (a.Destroyed) // Tick will clean up
yield break;
foreach (var r in a.Render())
yield return r.WithPalette(PaletteReference.FromName("invuln"));
yield return r.WithPalette(wr.Palette("invuln"));
}
}
}

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

@@ -74,11 +74,11 @@ namespace OpenRA.Mods.RA.Effects
world.AddFrameEndTask(w => w.Remove(this));
}
public IEnumerable<Renderable> Render()
public IEnumerable<Renderable> Render(WorldRenderer wr)
{
if (explosion != null)
yield return new Renderable(explosion.Image, args.dest.ToFloat2() - .5f * explosion.Image.size,
PaletteReference.FromName("effect"), (int)args.dest.Y);
wr.Palette("effect"), (int)args.dest.Y);
if (ticks >= info.BeamDuration)
yield break;

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

@@ -152,11 +152,11 @@ namespace OpenRA.Mods.RA.Effects
Combat.DoImpacts(Args);
}
public IEnumerable<Renderable> Render()
public IEnumerable<Renderable> Render(WorldRenderer wr)
{
if (Args.firedBy.World.RenderedShroud.IsVisible(PxPosition.ToCPos()))
yield return new Renderable(anim.Image, PxPosition.ToFloat2() - 0.5f * anim.Image.size - new float2(0, Altitude),
PaletteReference.FromName(Args.weapon.Underwater ? "shadow" : "effect"), PxPosition.Y);
wr.Palette(Args.weapon.Underwater ? "shadow" : "effect"), PxPosition.Y);
if (Trail != null)
Trail.Render(Args.firedBy);

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

@@ -77,10 +77,10 @@ namespace OpenRA.Mods.RA.Effects
a.Trait.Enable();
}
public IEnumerable<Renderable> Render()
public IEnumerable<Renderable> Render(WorldRenderer wr)
{
yield return new Renderable(anim.Image, pos.ToFloat2() - 0.5f * anim.Image.size - new float2(0, altitude),
PaletteReference.FromName("effect"), (int)pos.Y);
wr.Palette("effect"), (int)pos.Y);
}
}
}

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

@@ -73,10 +73,10 @@ namespace OpenRA.Mods.RA.Effects
});
}
public IEnumerable<Renderable> Render()
public IEnumerable<Renderable> Render(WorldRenderer wr)
{
var pos = location.ToFloat2() - new float2(0, altitude);
yield return new Renderable(anim.Image, location.ToFloat2() - .5f * anim.Image.size, PaletteReference.FromName("shadow"), 0);
yield return new Renderable(anim.Image, location.ToFloat2() - .5f * anim.Image.size, wr.Palette("shadow"), 0);
yield return new Renderable(anim.Image, pos - .5f * anim.Image.size, palette, 2);
yield return new Renderable(paraAnim.Image, pos - .5f * paraAnim.Image.size + offset, palette, 3);
}

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

@@ -34,11 +34,11 @@ namespace OpenRA.Mods.RA.Effects
anim.Tick();
}
public IEnumerable<Renderable> Render()
public IEnumerable<Renderable> Render(WorldRenderer wr)
{
if (!a.Destroyed && (a.World.LocalPlayer == null || a.Owner.Stances[a.Owner.World.LocalPlayer] == Stance.Ally))
yield return new Renderable(anim.Image, a.CenterLocation.ToFloat2() - .5f * anim.Image.size,
PaletteReference.FromName("chrome"), (int)a.CenterLocation.Y);
wr.Palette("chrome"), (int)a.CenterLocation.Y);
}
}
}

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

@@ -46,7 +46,7 @@ namespace OpenRA.Mods.RA.Effects
world.AddFrameEndTask(w => w.Remove(this));
}
public IEnumerable<Renderable> Render()
public IEnumerable<Renderable> Render(WorldRenderer wr)
{
if (building.IsInWorld && building.Owner == building.World.LocalPlayer
&& building.World.Selection.Actors.Contains(building))

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

@@ -40,7 +40,7 @@ namespace OpenRA.Mods.RA.Effects
anim.Tick();
}
public IEnumerable<Renderable> Render()
public IEnumerable<Renderable> Render(WorldRenderer wr)
{
if (!building.Destroyed)
{

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

@@ -40,9 +40,9 @@ namespace OpenRA.Mods.RA.Effects
}
}
public IEnumerable<Renderable> Render()
public IEnumerable<Renderable> Render(WorldRenderer wr)
{
yield return new Renderable(doors.Image, pos, PaletteReference.FromName("effect"), (int)doorOffset.Y);
yield return new Renderable(doors.Image, pos, wr.Palette("effect"), (int)doorOffset.Y);
}
}
}

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

@@ -33,10 +33,10 @@ namespace OpenRA.Mods.RA.Effects
anim.Tick();
}
public IEnumerable<Renderable> Render()
public IEnumerable<Renderable> Render(WorldRenderer wr)
{
yield return new Renderable(anim.Image, pos.ToFloat2() - .5f * anim.Image.size,
PaletteReference.FromName("effect"), (int)pos.Y);
wr.Palette("effect"), (int)pos.Y);
}
}
}

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

@@ -62,7 +62,7 @@ namespace OpenRA.Mods.RA.Effects
}
}
public IEnumerable<Renderable> Render() { return renderables; }
public IEnumerable<Renderable> Render(WorldRenderer wr) { return renderables; }
static IEnumerable<Renderable> DrawZapWandering(PPos from, PPos to, Sequence s)
{