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

8
OpenRA.Mods.Common/Traits/Render/RenderSprites.cs
View File

@@ -157,11 +157,13 @@ namespace OpenRA.Mods.Common.Traits.Render
readonly List<AnimationWrapper> anims = new List<AnimationWrapper>();
string cachedImage;
public static Func<int> MakeFacingFunc(Actor self)
public static Func<WAngle> MakeFacingFunc(Actor self)
{
var facing = self.TraitOrDefault<IFacing>();
if (facing == null) return () => 0;
return () => facing.Facing;
if (facing == null)
return () => WAngle.Zero;
return () => WAngle.FromFacing(facing.Facing);
}
public RenderSprites(ActorInitializer init, RenderSpritesInfo info)

2
OpenRA.Mods.Common/Traits/Render/WithBridgeSpriteBody.cs
View File

@@ -61,7 +61,7 @@ namespace OpenRA.Mods.Common.Traits.Render
readonly Actor self;
public WithBridgeSpriteBody(ActorInitializer init, WithBridgeSpriteBodyInfo info)
: base(init, info, () => 0)
: base(init, info)
{
self = init.Self;
bridgeInfo = info;

2
OpenRA.Mods.Common/Traits/Render/WithChargeSpriteBody.cs
View File

@@ -39,7 +39,7 @@ namespace OpenRA.Mods.Common.Traits.Render
readonly AttackCharges attackCharges;
public WithChargeSpriteBody(ActorInitializer init, WithChargeSpriteBodyInfo info)
: base(init, info, () => 0)
: base(init, info)
{
attackCharges = init.Self.Trait<AttackCharges>();
ConfigureAnimation(init.Self);

2
OpenRA.Mods.Common/Traits/Render/WithCrateBody.cs
View File

@@ -40,7 +40,7 @@ namespace OpenRA.Mods.Common.Traits.Render
public IEnumerable<IActorPreview> RenderPreviewSprites(ActorPreviewInitializer init, RenderSpritesInfo rs, string image, int facings, PaletteReference p)
{
var anim = new Animation(init.World, rs.Image, () => 0);
var anim = new Animation(init.World, rs.Image);
anim.PlayRepeating(RenderSprites.NormalizeSequence(anim, init.GetDamageState(), IdleSequence));
yield return new SpriteActorPreview(anim, () => WVec.Zero, () => 0, p, rs.Scale);
}

2
OpenRA.Mods.Common/Traits/Render/WithDeadBridgeSpriteBody.cs
View File

@@ -66,7 +66,7 @@ namespace OpenRA.Mods.Common.Traits.Render
readonly BridgeLayer bridgeLayer;
public WithDeadBridgeSpriteBody(ActorInitializer init, WithDeadBridgeSpriteBodyInfo info)
: base(init, info, () => 0)
: base(init, info)
{
bridgeInfo = info;
bridgeLayer = init.World.WorldActor.Trait<BridgeLayer>();

2
OpenRA.Mods.Common/Traits/Render/WithGateSpriteBody.cs
View File

@@ -54,7 +54,7 @@ namespace OpenRA.Mods.Common.Traits.Render
bool renderOpen;
public WithGateSpriteBody(ActorInitializer init, WithGateSpriteBodyInfo info)
: base(init, info, () => 0)
: base(init, info)
{
gateBodyInfo = info;
gate = init.Self.Trait<Gate>();

11
OpenRA.Mods.Common/Traits/Render/WithIdleOverlay.cs
View File

@@ -48,12 +48,15 @@ namespace OpenRA.Mods.Common.Traits.Render
if (Palette != null)
p = init.WorldRenderer.Palette(Palette);
Func<int> facing;
Func<WAngle> facing;
if (init.Contains<DynamicFacingInit>())
facing = init.Get<DynamicFacingInit, Func<int>>();
{
var getFacing = init.Get<DynamicFacingInit, Func<int>>();
facing = () => WAngle.FromFacing(getFacing());
}
else
{
var f = init.Contains<FacingInit>() ? init.Get<FacingInit, int>() : 0;
var f = WAngle.FromFacing(init.Contains<FacingInit>() ? init.Get<FacingInit, int>() : 0);
facing = () => f;
}
@@ -61,7 +64,7 @@ namespace OpenRA.Mods.Common.Traits.Render
anim.PlayRepeating(RenderSprites.NormalizeSequence(anim, init.GetDamageState(), Sequence));
var body = init.Actor.TraitInfo<BodyOrientationInfo>();
Func<WRot> orientation = () => body.QuantizeOrientation(WRot.FromFacing(facing()), facings);
Func<WRot> orientation = () => body.QuantizeOrientation(WRot.FromYaw(facing()), facings);
Func<WVec> offset = () => body.LocalToWorld(Offset.Rotate(orientation()));
Func<int> zOffset = () =>
{

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);

2
OpenRA.Mods.Common/Traits/Render/WithProductionDoorOverlay.cs
View File

@@ -24,7 +24,7 @@ namespace OpenRA.Mods.Common.Traits.Render
public IEnumerable<IActorPreview> RenderPreviewSprites(ActorPreviewInitializer init, RenderSpritesInfo rs, string image, int facings, PaletteReference p)
{
var anim = new Animation(init.World, image, () => 0);
var anim = new Animation(init.World, image);
anim.PlayFetchIndex(RenderSprites.NormalizeSequence(anim, init.GetDamageState(), Sequence), () => 0);
var bi = init.Actor.TraitInfo<BuildingInfo>();

2
OpenRA.Mods.Common/Traits/Render/WithResourceLevelSpriteBody.cs
View File

@@ -43,7 +43,7 @@ namespace OpenRA.Mods.Common.Traits.Render
PlayerResources playerResources;
public WithResourceLevelSpriteBody(ActorInitializer init, WithResourceLevelSpriteBodyInfo info)
: base(init, info, () => 0)
: base(init, info)
{
this.info = info;
playerResources = init.Self.Owner.PlayerActor.Trait<PlayerResources>();

8
OpenRA.Mods.Common/Traits/Render/WithSpriteBarrel.cs
View File

@@ -46,11 +46,11 @@ namespace OpenRA.Mods.Common.Traits.Render
.First(tt => tt.Turret == armament.Turret);
var turretFacing = Turreted.TurretFacingFromInit(init, t.InitialFacing, armament.Turret);
var anim = new Animation(init.World, image, turretFacing);
var anim = new Animation(init.World, image, () => WAngle.FromFacing(turretFacing()));
anim.Play(RenderSprites.NormalizeSequence(anim, init.GetDamageState(), Sequence));
Func<int> facing = init.GetFacing();
Func<WRot> orientation = () => body.QuantizeOrientation(WRot.FromFacing(facing()), facings);
var facing = init.GetFacing();
Func<WRot> orientation = () => body.QuantizeOrientation(WRot.FromYaw(facing()), facings);
Func<WVec> turretOffset = () => body.LocalToWorld(t.Offset.Rotate(orientation()));
Func<int> zOffset = () =>
{
@@ -82,7 +82,7 @@ namespace OpenRA.Mods.Common.Traits.Render
.First(tt => tt.Name == armament.Info.Turret);
rs = self.Trait<RenderSprites>();
DefaultAnimation = new Animation(self.World, rs.GetImage(self), () => turreted.TurretFacing);
DefaultAnimation = new Animation(self.World, rs.GetImage(self), () => WAngle.FromFacing(turreted.TurretFacing));
DefaultAnimation.PlayRepeating(NormalizeSequence(self, Info.Sequence));
rs.Add(new AnimationWithOffset(
DefaultAnimation, () => BarrelOffset(), () => IsTraitDisabled, p => RenderUtils.ZOffsetFromCenter(self, p, 0)));

4
OpenRA.Mods.Common/Traits/Render/WithSpriteBody.cs
View File

@@ -56,9 +56,9 @@ namespace OpenRA.Mods.Common.Traits.Render
readonly Animation boundsAnimation;
public WithSpriteBody(ActorInitializer init, WithSpriteBodyInfo info)
: this(init, info, () => 0) { }
: this(init, info, () => WAngle.Zero) { }
protected WithSpriteBody(ActorInitializer init, WithSpriteBodyInfo info, Func<int> baseFacing)
protected WithSpriteBody(ActorInitializer init, WithSpriteBodyInfo info, Func<WAngle> baseFacing)
: base(info)
{
rs = init.Self.Trait<RenderSprites>();

8
OpenRA.Mods.Common/Traits/Render/WithSpriteTurret.cs
View File

@@ -51,11 +51,11 @@ namespace OpenRA.Mods.Common.Traits.Render
.First(tt => tt.Turret == Turret);
var turretFacing = Turreted.TurretFacingFromInit(init, t.InitialFacing, Turret);
var anim = new Animation(init.World, image, turretFacing);
var anim = new Animation(init.World, image, () => WAngle.FromFacing(turretFacing()));
anim.Play(RenderSprites.NormalizeSequence(anim, init.GetDamageState(), Sequence));
Func<int> facing = init.GetFacing();
Func<WRot> orientation = () => body.QuantizeOrientation(WRot.FromFacing(facing()), facings);
var facing = init.GetFacing();
Func<WRot> orientation = () => body.QuantizeOrientation(WRot.FromYaw(facing()), facings);
Func<WVec> offset = () => body.LocalToWorld(t.Offset.Rotate(orientation()));
Func<int> zOffset = () =>
{
@@ -90,7 +90,7 @@ namespace OpenRA.Mods.Common.Traits.Render
arms = self.TraitsImplementing<Armament>()
.Where(w => w.Info.Turret == info.Turret).ToArray();
DefaultAnimation = new Animation(self.World, rs.GetImage(self), () => t.TurretFacing);
DefaultAnimation = new Animation(self.World, rs.GetImage(self), () => WAngle.FromFacing(t.TurretFacing));
DefaultAnimation.PlayRepeating(NormalizeSequence(self, info.Sequence));
rs.Add(new AnimationWithOffset(DefaultAnimation,
() => TurretOffset(self),

4
OpenRA.Mods.Common/Traits/Render/WithWallSpriteBody.cs
View File

@@ -72,7 +72,7 @@ namespace OpenRA.Mods.Common.Traits.Render
}
}
var anim = new Animation(init.World, image, () => 0);
var anim = new Animation(init.World, image);
anim.PlayFetchIndex(RenderSprites.NormalizeSequence(anim, init.GetDamageState(), Sequence), () => adjacent);
yield return new SpriteActorPreview(anim, () => WVec.Zero, () => 0, p, rs.Scale);
@@ -99,7 +99,7 @@ namespace OpenRA.Mods.Common.Traits.Render
void IWallConnector.SetDirty() { dirty = true; }
public WithWallSpriteBody(ActorInitializer init, WithWallSpriteBodyInfo info)
: base(init, info, () => 0)
: base(init, info)
{
wallInfo = info;
}