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

remove VisualDest crap from bullets & combat code

Browse Source
This commit is contained in:
Chris Forbes
2010-04-30 12:20:22 +12:00
parent 66b1974237
commit 2d0f30a341
7 changed files with 15 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
OpenRA.Game/Effects/Bullet.cs
View File

@@ -45,7 +45,6 @@ namespace OpenRA.Effects
{
readonly BulletInfo Info;
readonly ProjectileArgs Args;
readonly int2 VisualDest;
int t = 0;
Animation anim;
@@ -63,8 +62,6 @@ namespace OpenRA.Effects
Args.dest += (info.Inaccuracy * factor * args.firedBy.World.SharedRandom.Gauss2D(2)).ToInt2();
}
VisualDest = Args.dest + (10 * Game.CosmeticRandom.Gauss2D(1)).ToInt2();
if (Info.Image != null)
{
anim = new Animation(Info.Image, () => Traits.Util.GetFacing(Args.dest - Args.src, 0));
@@ -84,11 +81,11 @@ namespace OpenRA.Effects
{
var at = (float)t / TotalTime();
var altitude = float2.Lerp(Args.srcAltitude, Args.destAltitude, at);
var pos = float2.Lerp(Args.src, VisualDest, at)
var pos = float2.Lerp(Args.src, Args.dest, at)
- 0.5f * anim.Image.size - new float2(0, altitude);
var highPos = (Info.High || Info.Arcing)
? (pos - new float2(0, (VisualDest - Args.src).Length * height * 4 * at * (1 - at)))
? (pos - new float2(0, (Args.dest - Args.src).Length * height * 4 * at * (1 - at)))
: pos;
world.AddFrameEndTask(w => w.Add(
@@ -105,7 +102,7 @@ namespace OpenRA.Effects
var at = (float)t / TotalTime();
var altitude = float2.Lerp(Args.srcAltitude, Args.destAltitude, at);
var pos = float2.Lerp( Args.src, VisualDest, at)
var pos = float2.Lerp( Args.src, Args.dest, at)
- 0.5f * anim.Image.size - new float2( 0, altitude );
if (Info.High || Info.Arcing)
@@ -113,7 +110,7 @@ namespace OpenRA.Effects
if (Info.Shadow)
yield return new Renderable(anim.Image, pos - .5f * anim.Image.size, "shadow");
var highPos = pos - new float2(0, (VisualDest - Args.src).Length * height * 4 * at * (1 - at));
var highPos = pos - new float2(0, (Args.dest - Args.src).Length * height * 4 * at * (1 - at));
yield return new Renderable(anim.Image, highPos - .5f * anim.Image.size, Args.firedBy.Owner.Palette);
}
@@ -126,7 +123,7 @@ namespace OpenRA.Effects
void Explode( World world )
{
world.AddFrameEndTask(w => w.Remove(this));
Combat.DoImpacts(Args, VisualDest - new int2(0, Args.destAltitude));
Combat.DoImpacts(Args);
}
}
}

2
OpenRA.Game/Effects/GravityBomb.cs
View File

@@ -54,7 +54,7 @@ namespace OpenRA.Effects
if (--altitude <= Args.destAltitude)
{
world.AddFrameEndTask(w => w.Remove(this));
Combat.DoImpacts(Args, Args.dest);
Combat.DoImpacts(Args);
}
anim.Tick();

2
OpenRA.Game/Effects/LaserZap.cs
View File

@@ -61,7 +61,7 @@ namespace OpenRA.Effects
if (!doneDamage)
{
Combat.DoImpacts(args, args.dest);
Combat.DoImpacts(args);
doneDamage = true;
}
}

2
OpenRA.Game/Effects/Missile.cs
View File

@@ -116,7 +116,7 @@ namespace OpenRA.Effects
world.AddFrameEndTask(w => w.Remove(this));
Args.dest = Pos.ToInt2();
if (t > Info.Arm * 40) /* don't blow up in our launcher's face! */
Combat.DoImpacts(Args, Pos.ToInt2());
Combat.DoImpacts(Args);
}
public IEnumerable<Renderable> Render()

2
OpenRA.Game/Effects/TeslaZap.cs
View File

@@ -51,7 +51,7 @@ namespace OpenRA.Effects
if (!doneDamage)
{
Combat.DoImpacts(Args, Args.dest);
Combat.DoImpacts(Args);
doneDamage = true;
}
}