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

Extract contrail fading for dead projectiles into an IEffect.

Browse Source
This commit is contained in:
Paul Chote
2013-10-21 18:12:34 +13:00
parent bb8f4494f5
commit 7ecf84dc61
4 changed files with 47 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,6 +1,6 @@
#region Copyright & License Information
/*
* Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
* Copyright 2007-2013 The OpenRA Developers (see AUTHORS)
* This file is part of OpenRA, which is free software. It is made
* available to you under the terms of the GNU General Public License
* as published by the Free Software Foundation. For more information,
@@ -110,13 +110,6 @@ namespace OpenRA.Mods.RA.Effects
public void Tick(World world)
{
// Fade the trail out gradually
if (ticks > length && info.ContrailLength > 0)
{
trail.Update(pos);
return;
}
if (anim != null)
anim.Tick();
@@ -166,9 +159,9 @@ namespace OpenRA.Mods.RA.Effects
void Explode(World world)
{
if (info.ContrailLength > 0)
world.AddFrameEndTask(w => w.Add(new DelayedAction(info.ContrailLength, () => w.Remove(this))));
else
world.AddFrameEndTask(w => w.Remove(this));
world.AddFrameEndTask(w => w.Add(new ContrailFader(pos, trail)));
world.AddFrameEndTask(w => w.Remove(this));
Combat.DoImpacts(pos, args.SourceActor, args.Weapon, args.FirepowerModifier);
}

38
OpenRA.Mods.RA/Effects/ContrailFader.cs Executable file
View File

@@ -0,0 +1,38 @@
#region Copyright & License Information
/*
* Copyright 2007-2013 The OpenRA Developers (see AUTHORS)
* This file is part of OpenRA, which is free software. It is made
* available to you under the terms of the GNU General Public License
* as published by the Free Software Foundation. For more information,
* see COPYING.
*/
#endregion
using System.Collections.Generic;
using OpenRA.Effects;
using OpenRA.Graphics;
namespace OpenRA.Mods.RA.Effects
{
class ContrailFader : IEffect
{
WPos pos;
ContrailRenderable trail;
public ContrailFader(WPos pos, ContrailRenderable trail)
{
this.pos = pos;
this.trail = trail;
}
public void Tick(World world)
{
trail.Update(pos);
}
public IEnumerable<IRenderable> Render(WorldRenderer wr)
{
yield return trail;
}
}
}

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

@@ -1,6 +1,6 @@
#region Copyright & License Information
/*
* Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
* Copyright 2007-2013 The OpenRA Developers (see AUTHORS)
* This file is part of OpenRA, which is free software. It is made
* available to you under the terms of the GNU General Public License
* as published by the Free Software Foundation. For more information,
@@ -63,7 +63,6 @@ namespace OpenRA.Mods.RA.Effects
[Sync] WPos targetPosition;
[Sync] WVec offset;
[Sync] int ticks;
[Sync] bool exploded;
[Sync] public Actor SourceActor { get { return args.SourceActor; } }
[Sync] public Target GuidedTarget { get { return args.GuidedTarget; } }
@@ -112,13 +111,6 @@ namespace OpenRA.Mods.RA.Effects
public void Tick(World world)
{
// Fade the trail out gradually
if (exploded && info.ContrailLength > 0)
{
trail.Update(pos);
return;
}
ticks++;
anim.Tick();
@@ -174,12 +166,10 @@ namespace OpenRA.Mods.RA.Effects
void Explode(World world)
{
exploded = true;
if (info.ContrailLength > 0)
world.AddFrameEndTask(w => w.Add(new DelayedAction(info.ContrailLength, () => w.Remove(this))));
else
world.AddFrameEndTask(w => w.Remove(this));
world.AddFrameEndTask(w => w.Add(new ContrailFader(pos, trail)));
world.AddFrameEndTask(w => w.Remove(this));
// Don't blow up in our launcher's face!
if (ticks <= info.Arm)