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

Remove PaletteReference.FromName from TeslaZap.

Browse Source
This commit is contained in:
Paul Chote
2013-02-25 17:56:15 +13:00
parent ce39c79477
commit f2fe30a7bb
1 changed files with 38 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -29,21 +29,29 @@ namespace OpenRA.Mods.RA.Effects
class TeslaZap : IEffect class TeslaZap : IEffect
{ {
readonly ProjectileArgs Args; readonly ProjectileArgs Args;
readonly TeslaZapInfo Info;
IEnumerable<Renderable> renderables;
int timeUntilRemove = 2; // # of frames int timeUntilRemove = 2; // # of frames
bool doneDamage = false; bool doneDamage = false;
bool initialized = false;
readonly List<Renderable> renderables = new List<Renderable>();
public TeslaZap(TeslaZapInfo info, ProjectileArgs args) public TeslaZap(TeslaZapInfo info, ProjectileArgs args)
{ {
Args = args; Args = args;
var bright = SequenceProvider.GetSequence(info.Image, "bright"); Info = info;
var dim = SequenceProvider.GetSequence(info.Image, "dim"); }
for( var n = 0; n < info.DimZaps; n++ ) public IEnumerable<Renderable> GenerateRenderables(WorldRenderer wr)
renderables.AddRange(DrawZapWandering(args.src, args.dest, dim)); {
for( var n = 0; n < info.BrightZaps; n++ ) var bright = SequenceProvider.GetSequence(Info.Image, "bright");
renderables.AddRange(DrawZapWandering(args.src, args.dest, bright)); var dim = SequenceProvider.GetSequence(Info.Image, "dim");
for (var n = 0; n < Info.DimZaps; n++)
foreach (var z in DrawZapWandering(wr, Args.src, Args.dest, dim))
yield return z;
for (var n = 0; n < Info.BrightZaps; n++)
foreach (var z in DrawZapWandering(wr, Args.src, Args.dest, bright))
yield return z;
} }
public void Tick(World world) public void Tick(World world)
@@ -62,9 +70,18 @@ namespace OpenRA.Mods.RA.Effects
} }
} }
public IEnumerable<Renderable> Render(WorldRenderer wr) { return renderables; } public IEnumerable<Renderable> Render(WorldRenderer wr)
{
if (!initialized)
{
renderables = GenerateRenderables(wr);
initialized = true;
}
static IEnumerable<Renderable> DrawZapWandering(PPos from, PPos to, Sequence s) return renderables;
}
static IEnumerable<Renderable> DrawZapWandering(WorldRenderer wr, PPos from, PPos to, Sequence s)
{ {
var z = float2.Zero; /* hack */ var z = float2.Zero; /* hack */
var dist = to - from; var dist = to - from;
@@ -76,22 +93,22 @@ namespace OpenRA.Mods.RA.Effects
var p1 = from.ToFloat2() + (1 / 3f) * dist.ToFloat2() + Game.CosmeticRandom.Gauss1D(1) * .2f * dist.Length * norm; var p1 = from.ToFloat2() + (1 / 3f) * dist.ToFloat2() + Game.CosmeticRandom.Gauss1D(1) * .2f * dist.Length * norm;
var p2 = from.ToFloat2() + (2 / 3f) * dist.ToFloat2() + Game.CosmeticRandom.Gauss1D(1) * .2f * dist.Length * norm; var p2 = from.ToFloat2() + (2 / 3f) * dist.ToFloat2() + Game.CosmeticRandom.Gauss1D(1) * .2f * dist.Length * norm;
renderables.AddRange(DrawZap(from.ToFloat2(), p1, s, out p1)); renderables.AddRange(DrawZap(wr, from.ToFloat2(), p1, s, out p1));
renderables.AddRange(DrawZap(p1, p2, s, out p2)); renderables.AddRange(DrawZap(wr, p1, p2, s, out p2));
renderables.AddRange(DrawZap(p2, to.ToFloat2(), s, out z)); renderables.AddRange(DrawZap(wr, p2, to.ToFloat2(), s, out z));
} }
else else
{ {
var p1 = from.ToFloat2() + (1 / 2f) * dist.ToFloat2() + Game.CosmeticRandom.Gauss1D(1) * .2f * dist.Length * norm; var p1 = from.ToFloat2() + (1 / 2f) * dist.ToFloat2() + Game.CosmeticRandom.Gauss1D(1) * .2f * dist.Length * norm;
renderables.AddRange(DrawZap(from.ToFloat2(), p1, s, out p1)); renderables.AddRange(DrawZap(wr, from.ToFloat2(), p1, s, out p1));
renderables.AddRange(DrawZap(p1, to.ToFloat2(), s, out z)); renderables.AddRange(DrawZap(wr, p1, to.ToFloat2(), s, out z));
} }
return renderables; return renderables;
} }
static IEnumerable<Renderable> DrawZap(float2 from, float2 to, Sequence s, out float2 p) static IEnumerable<Renderable> DrawZap(WorldRenderer wr, float2 from, float2 to, Sequence s, out float2 p)
{ {
var dist = to - from; var dist = to - from;
var q = new float2(-dist.Y, dist.X); var q = new float2(-dist.Y, dist.X);
@@ -105,7 +122,7 @@ namespace OpenRA.Mods.RA.Effects
.OrderBy(t => Math.Abs(float2.Dot(z + new float2(t[0], t[1]), q) + c)).First(); .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 Renderable(s.GetSprite(step[4]), z + new float2(step[2], step[3]),
PaletteReference.FromName("effect"), (int)from.Y)); wr.Palette("effect"), (int)from.Y));
z += new float2(step[0], step[1]); z += new float2(step[0], step[1]);
if( rs.Count >= 1000 ) if( rs.Count >= 1000 )
break; break;