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

SpriteEffect facing -> WAngle.

Browse Source
This commit is contained in:
Paul Chote
2020-05-08 20:12:32 +01:00
committed by atlimit8
parent fe58ed1283
commit 552bceb07c
5 changed files with 25 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
OpenRA.Mods.Common/Effects/SpriteEffect.cs
View File

@@ -31,14 +31,18 @@ namespace OpenRA.Mods.Common.Effects
// Facing is last on these overloads partially for backwards compatibility with previous main ctor revision
// and partially because most effects don't need it. The latter is also the reason for placement of 'delay'.
public SpriteEffect(WPos pos, World world, string image, string sequence, string palette,
bool visibleThroughFog = false, int facing = 0, int delay = 0)
: this(() => pos, () => facing, world, image, sequence, palette, visibleThroughFog, delay) { }
bool visibleThroughFog = false, int delay = 0)
: this(() => pos, () => WAngle.Zero, world, image, sequence, palette, visibleThroughFog, delay) { }
public SpriteEffect(Actor actor, World world, string image, string sequence, string palette,
bool visibleThroughFog = false, int facing = 0, int delay = 0)
: this(() => actor.CenterPosition, () => facing, world, image, sequence, palette, visibleThroughFog, delay) { }
bool visibleThroughFog = false, int delay = 0)
: this(() => actor.CenterPosition, () => WAngle.Zero, world, image, sequence, palette, visibleThroughFog, delay) { }
public SpriteEffect(Func<WPos> posFunc, Func<int> facingFunc, World world, string image, string sequence, string palette,
public SpriteEffect(WPos pos, WAngle facing, World world, string image, string sequence, string palette,
bool visibleThroughFog = false, int delay = 0)
: this(() => pos, () => facing, world, image, sequence, palette, visibleThroughFog, delay) { }
public SpriteEffect(Func<WPos> posFunc, Func<WAngle> facingFunc, World world, string image, string sequence, string palette,
bool visibleThroughFog = false, int delay = 0)
{
this.world = world;
@@ -48,7 +52,7 @@ namespace OpenRA.Mods.Common.Effects
this.visibleThroughFog = visibleThroughFog;
this.delay = delay;
pos = posFunc();
anim = new Animation(world, image, () => WAngle.FromFacing(facingFunc()));
anim = new Animation(world, image, facingFunc);
}
public void Tick(World world)