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

Animation facing -> WAngle.

Browse Source
This commit is contained in:
Paul Chote
2020-05-08 18:57:28 +01:00
committed by atlimit8
parent 361e2d463c
commit fe58ed1283
26 changed files with 74 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
OpenRA.Mods.Common/Traits/Render/WithMuzzleOverlay.cs
View File

@@ -31,7 +31,7 @@ namespace OpenRA.Mods.Common.Traits.Render
{
readonly Dictionary<Barrel, bool> visible = new Dictionary<Barrel, bool>();
readonly Dictionary<Barrel, AnimationWithOffset> anims = new Dictionary<Barrel, AnimationWithOffset>();
readonly Func<int> getFacing;
readonly Func<WAngle> getFacing;
readonly Armament[] armaments;
public WithMuzzleOverlay(Actor self, WithMuzzleOverlayInfo info)
@@ -55,11 +55,11 @@ namespace OpenRA.Mods.Common.Traits.Render
// Workaround for broken ternary operators in certain versions of mono (3.10 and
// certain versions of the 3.8 series): https://bugzilla.xamarin.com/show_bug.cgi?id=23319
if (turreted != null)
getFacing = () => turreted.TurretFacing;
getFacing = () => WAngle.FromFacing(turreted.TurretFacing);
else if (facing != null)
getFacing = () => facing.Facing;
getFacing = () => WAngle.FromFacing(facing.Facing);
else
getFacing = () => 0;
getFacing = () => WAngle.Zero;
var muzzleFlash = new Animation(self.World, render.GetImage(self), getFacing);
visible.Add(barrel, false);
@@ -79,7 +79,7 @@ namespace OpenRA.Mods.Common.Traits.Render
var sequence = a.Info.MuzzleSequence;
if (a.Info.MuzzleSplitFacings > 0)
sequence += Util.QuantizeFacing(getFacing(), a.Info.MuzzleSplitFacings).ToString();
sequence += Util.QuantizeFacing(getFacing().Facing, a.Info.MuzzleSplitFacings).ToString();
visible[barrel] = true;
anims[barrel].Animation.PlayThen(sequence, () => visible[barrel] = false);