Convert (Dynamic)FacingInit, (Dynamic)TurretFacingInit to WAngle.

This commit is contained in:
Paul Chote
2020-06-26 00:33:08 +01:00
committed by abcdefg30
parent e8f443f4a9
commit a2269e7ee7
36 changed files with 133 additions and 155 deletions

View File

@@ -77,13 +77,13 @@ namespace OpenRA.Mods.Common.Traits.Render
if (Palette != null)
p = init.WorldRenderer.Palette(Palette);
Func<int> facing;
Func<WAngle> facing;
var dynamicfacingInit = init.GetOrDefault<DynamicFacingInit>();
if (dynamicfacingInit != null)
facing = dynamicfacingInit.Value;
else
{
var f = init.GetValue<FacingInit, int>(0);
var f = init.GetValue<FacingInit, WAngle>(WAngle.Zero);
facing = () => f;
}
@@ -91,7 +91,7 @@ namespace OpenRA.Mods.Common.Traits.Render
anim.PlayThen(OpeningSequence, () => anim.PlayRepeating(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 = () =>
{