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

Replace LaunchEffect with updated SpriteEffect

Browse Source
This commit is contained in:
reaperrr
2018-10-07 17:23:56 +02:00
committed by Paul Chote
parent c2d6b78b18
commit 4de0d0fcb9
3 changed files with 1 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
OpenRA.Mods.Common/Effects/LaunchEffect.cs
View File

@@ -1,57 +0,0 @@
#region Copyright & License Information
/*
* Copyright 2007-2018 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, either version 3 of
* the License, or (at your option) any later version. For more
* information, see COPYING.
*/
#endregion
using System;
using System.Collections.Generic;
using OpenRA.Effects;
using OpenRA.Graphics;
namespace OpenRA.Mods.Common.Effects
{
public class LaunchEffect : IEffect, ISpatiallyPartitionable
{
readonly World world;
readonly Animation anim;
readonly string palette;
WPos pos;
Func<WPos> posFunc;
public LaunchEffect(World world, string image, string sequence, string palette)
: this(world, () => WPos.Zero, () => 0, image, sequence, palette) { }
public LaunchEffect(World world, Func<WPos> posFunc, Func<int> facingFunc, string image, string sequence, string palette)
{
this.world = world;
this.posFunc = posFunc;
this.palette = palette;
anim = new Animation(world, image, facingFunc);
anim.PlayThen(sequence, () => world.AddFrameEndTask(w => { w.Remove(this); w.ScreenMap.Remove(this); }));
pos = posFunc();
world.ScreenMap.Add(this, pos, anim.Image);
}
public void Tick(World world)
{
anim.Tick();
pos = posFunc();
world.ScreenMap.Update(this, pos, anim.Image);
}
public IEnumerable<IRenderable> Render(WorldRenderer wr)
{
if (world.FogObscures(pos))
return SpriteRenderable.None;
return anim.Render(pos, wr.Palette(palette));
}
}
}

1
OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
View File

@@ -148,7 +148,6 @@
<Compile Include="Effects\SpriteEffect.cs" /> <Compile Include="Effects\SpriteEffect.cs" />
<Compile Include="FileFormats\Png.cs" /> <Compile Include="FileFormats\Png.cs" />
<Compile Include="Graphics\RailgunRenderable.cs" /> <Compile Include="Graphics\RailgunRenderable.cs" />
<Compile Include="Effects\LaunchEffect.cs" />
<Compile Include="Lint\CheckNotifications.cs" /> <Compile Include="Lint\CheckNotifications.cs" />
<Compile Include="Projectiles\AreaBeam.cs" /> <Compile Include="Projectiles\AreaBeam.cs" />
<Compile Include="Projectiles\Bullet.cs" /> <Compile Include="Projectiles\Bullet.cs" />

2
OpenRA.Mods.Common/Projectiles/LaserZap.cs
View File

@@ -140,7 +140,7 @@ namespace OpenRA.Mods.Common.Projectiles
source = args.CurrentSource(); source = args.CurrentSource();
if (hasLaunchEffect && ticks == 0) if (hasLaunchEffect && ticks == 0)
world.AddFrameEndTask(w => w.Add(new LaunchEffect(world, args.CurrentSource, args.CurrentMuzzleFacing, world.AddFrameEndTask(w => w.Add(new SpriteEffect(args.CurrentSource, args.CurrentMuzzleFacing, world,
info.LaunchEffectImage, info.LaunchEffectSequence, info.LaunchEffectPalette))); info.LaunchEffectImage, info.LaunchEffectSequence, info.LaunchEffectPalette)));
// Beam tracks target // Beam tracks target