Add DynamicFacingInit.

OpenRA.Mods.Common/ActorInitializer.cs

@@ -11,6 +11,13 @@ namespace OpenRA.Mods.Common
 		public int Value(World world) { return value; }
 	}
 
+	public class DynamicFacingInit : IActorInit<Func<int>>
+	{
+		readonly Func<int> func;
+		public DynamicFacingInit(Func<int> func) { this.func = func; }
+		public Func<int> Value(World world) { return func; }
+	}
+
 	public class SubCellInit : IActorInit<SubCell>
 	{
 		[FieldFromYamlKey] readonly int value = (int)SubCell.FullCell;

OpenRA.Mods.Common/Graphics/ActorPreview.cs

@@ -9,6 +9,7 @@
  */
 #endregion
 
+using System;
 using System.Collections.Generic;
 using OpenRA.Graphics;
 using OpenRA.Mods.Common.Traits;
@@ -42,6 +43,45 @@ namespace OpenRA.Mods.Common.Graphics
 		public U Get<T, U>() where T : IActorInit<U> { return dict.Get<T>().Value(World); }
 		public bool Contains<T>() where T : IActorInit { return dict.Contains<T>(); }
 
+		public Func<WRot> GetOrientation()
+		{
+			var facingInfo = Actor.TraitInfoOrDefault<IFacingInfo>();
+			if (facingInfo == null)
+				return () => WRot.Zero;
+
+			// Dynamic facing takes priority
+			var dynamicInit = dict.GetOrDefault<DynamicFacingInit>();
+			if (dynamicInit != null)
+			{
+				// TODO: Account for terrain slope
+				var getFacing = dynamicInit.Value(null);
+				return () => WRot.FromFacing(getFacing());
+			}
+
+			// Fall back to initial actor facing if an Init isn't available
+			var facingInit = dict.GetOrDefault<FacingInit>();
+			var facing = facingInit != null ? facingInit.Value(null) : facingInfo.GetInitialFacing();
+			var orientation = WRot.FromFacing(facing);
+			return () => orientation;
+		}
+
+		public Func<int> GetFacing()
+		{
+			var facingInfo = Actor.TraitInfoOrDefault<IFacingInfo>();
+			if (facingInfo == null)
+				return () => 0;
+
+			// Dynamic facing takes priority
+			var dynamicInit = dict.GetOrDefault<DynamicFacingInit>();
+			if (dynamicInit != null)
+				return dynamicInit.Value(null);
+
+			// Fall back to initial actor facing if an Init isn't available
+			var facingInit = dict.GetOrDefault<FacingInit>();
+			var facing = facingInit != null ? facingInit.Value(null) : facingInfo.GetInitialFacing();
+			return () => facing;
+		}
+
 		public DamageState GetDamageState()
 		{
 			var health = dict.GetOrDefault<HealthInit>();

OpenRA.Mods.Common/Traits/Render/RenderVoxels.cs

@@ -59,11 +59,8 @@ namespace OpenRA.Mods.Common.Traits.Render
 				body.QuantizedFacings;
 			var palette = init.WorldRenderer.Palette(Palette ?? PlayerPalette + ownerName);
 
-			var ifacing = init.Actor.TraitInfoOrDefault<IFacingInfo>();
-			var facing = ifacing != null ? init.Contains<FacingInit>() ? init.Get<FacingInit, int>() : ifacing.GetInitialFacing() : 0;
-			var orientation = WRot.FromFacing(facing);
 			var components = init.Actor.TraitInfos<IRenderActorPreviewVoxelsInfo>()
-				.SelectMany(rvpi => rvpi.RenderPreviewVoxels(init, this, image, () => orientation, facings, palette))
+				.SelectMany(rvpi => rvpi.RenderPreviewVoxels(init, this, image, init.GetOrientation(), facings, palette))
 				.ToArray();
 
 			yield return new VoxelPreview(components, WVec.Zero, 0, Scale, LightPitch,

OpenRA.Mods.Common/Traits/Render/WithFacingSpriteBody.cs

@@ -9,6 +9,7 @@
  */
 #endregion
 
+using System;
 using System.Collections.Generic;
 using OpenRA.Graphics;
 using OpenRA.Mods.Common.Graphics;
@@ -22,10 +23,7 @@ namespace OpenRA.Mods.Common.Traits.Render
 
 		public override IEnumerable<IActorPreview> RenderPreviewSprites(ActorPreviewInitializer init, RenderSpritesInfo rs, string image, int facings, PaletteReference p)
 		{
-			var ifacing = init.Actor.TraitInfoOrDefault<IFacingInfo>();
+			var anim = new Animation(init.World, image, init.GetFacing());
-			var facing = ifacing != null ? init.Contains<FacingInit>() ? init.Get<FacingInit, int>() : ifacing.GetInitialFacing() : 0;
-
-			var anim = new Animation(init.World, image, () => facing);
 			anim.PlayRepeating(RenderSprites.NormalizeSequence(anim, init.GetDamageState(), Sequence));
 
 			yield return new SpriteActorPreview(anim, () => WVec.Zero, () => 0, p, rs.Scale);

OpenRA.Mods.Common/Traits/Render/WithIdleOverlay.cs

@@ -9,6 +9,7 @@
  */
 #endregion
 
+using System;
 using System.Collections.Generic;
 using OpenRA.Graphics;
 using OpenRA.Mods.Common.Graphics;
@@ -46,15 +47,28 @@ namespace OpenRA.Mods.Common.Traits.Render
 			if (Palette != null)
 				p = init.WorldRenderer.Palette(Palette);
 
-			var body = init.Actor.TraitInfo<BodyOrientationInfo>();
+			Func<int> facing;
-			var facing = init.Contains<FacingInit>() ? init.Get<FacingInit, int>() : 0;
+			if (init.Contains<DynamicFacingInit>())
-			var anim = new Animation(init.World, image, () => facing);
+				facing = init.Get<DynamicFacingInit, Func<int>>();
+			else
+			{
+				var f = init.Contains<FacingInit>() ? init.Get<FacingInit, int>() : 0;
+				facing = () => f;
+			}
+
+			var anim = new Animation(init.World, image, facing);
 			anim.PlayRepeating(RenderSprites.NormalizeSequence(anim, init.GetDamageState(), Sequence));
 
-			var orientation = body.QuantizeOrientation(WRot.FromFacing(facing), facings);
+			var body = init.Actor.TraitInfo<BodyOrientationInfo>();
-			var offset = body.LocalToWorld(Offset.Rotate(orientation));
+			Func<WRot> orientation = () => body.QuantizeOrientation(WRot.FromFacing(facing()), facings);
-			var zOffset = offset.Y + offset.Z + 1;
+			Func<WVec> offset = () => body.LocalToWorld(Offset.Rotate(orientation()));
-			yield return new SpriteActorPreview(anim, () => offset, () => zOffset, p, rs.Scale);
+			Func<int> zOffset = () =>
+			{
+				var tmpOffset = offset();
+				return tmpOffset.Y + tmpOffset.Z + 1;
+			};
+
+			yield return new SpriteActorPreview(anim, offset, zOffset, p, rs.Scale);
 		}
 	}
 

OpenRA.Mods.Common/Traits/Render/WithInfantryBody.cs

@@ -9,6 +9,7 @@
  */
 #endregion
 
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using OpenRA.Graphics;
@@ -31,12 +32,7 @@ namespace OpenRA.Mods.Common.Traits.Render
 
 		public IEnumerable<IActorPreview> RenderPreviewSprites(ActorPreviewInitializer init, RenderSpritesInfo rs, string image, int facings, PaletteReference p)
 		{
-			var facing = 0;
+			var anim = new Animation(init.World, image, init.GetFacing());
-			var ifacing = init.Actor.TraitInfoOrDefault<IFacingInfo>();
-			if (ifacing != null)
-				facing = init.Contains<FacingInit>() ? init.Get<FacingInit, int>() : ifacing.GetInitialFacing();
-
-			var anim = new Animation(init.World, image, () => facing);
 			anim.PlayRepeating(RenderSprites.NormalizeSequence(anim, init.GetDamageState(), StandSequences.First()));
 			yield return new SpriteActorPreview(anim, () => WVec.Zero, () => 0, p, rs.Scale);
 		}

OpenRA.Mods.Common/Traits/Render/WithParachute.cs

@@ -9,6 +9,7 @@
  */
 #endregion
 
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using OpenRA.Graphics;
@@ -68,15 +69,28 @@ namespace OpenRA.Mods.Common.Traits.Render
 			if (Palette != null)
 				p = init.WorldRenderer.Palette(Palette);
 
+			Func<int> facing;
+			if (init.Contains<DynamicFacingInit>())
+				facing = init.Get<DynamicFacingInit, Func<int>>();
+			else
+			{
+				var f = init.Contains<FacingInit>() ? init.Get<FacingInit, int>() : 0;
+				facing = () => f;
+			}
+
 			var anim = new Animation(init.World, image);
 			anim.PlayThen(OpeningSequence, () => anim.PlayRepeating(Sequence));
 
 			var body = init.Actor.TraitInfo<BodyOrientationInfo>();
-			var facing = init.Contains<FacingInit>() ? init.Get<FacingInit, int>() : 0;
+			Func<WRot> orientation = () => body.QuantizeOrientation(WRot.FromFacing(facing()), facings);
-			var orientation = body.QuantizeOrientation(WRot.FromFacing(facing), facings);
+			Func<WVec> offset = () => body.LocalToWorld(Offset.Rotate(orientation()));
-			var offset = body.LocalToWorld(Offset.Rotate(orientation));
+			Func<int> zOffset = () =>
-			var zOffset = offset.Y + offset.Z + 1;
+			{
-			yield return new SpriteActorPreview(anim, () => offset, () => zOffset, p, rs.Scale);
+				var tmpOffset = offset();
+				return tmpOffset.Y + tmpOffset.Z + 1;
+			};
+
+			yield return new SpriteActorPreview(anim, offset, zOffset, p, rs.Scale);
 		}
 	}
 

OpenRA.Mods.Common/Traits/Render/WithSpriteTurret.cs

@@ -9,6 +9,7 @@
  */
 #endregion
 
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using OpenRA.Graphics;
@@ -44,17 +45,20 @@ namespace OpenRA.Mods.Common.Traits.Render
 			var t = init.Actor.TraitInfos<TurretedInfo>()
 				.First(tt => tt.Turret == Turret);
 
-			var ifacing = init.Actor.TraitInfoOrDefault<IFacingInfo>();
-			var bodyFacing = ifacing != null ? init.Contains<FacingInit>() ? init.Get<FacingInit, int>() : ifacing.GetInitialFacing() : 0;
 			var turretFacing = Turreted.GetInitialTurretFacing(init, t.InitialFacing, Turret);
-
 			var anim = new Animation(init.World, image, () => turretFacing);
 			anim.Play(RenderSprites.NormalizeSequence(anim, init.GetDamageState(), Sequence));
 
-			var orientation = body.QuantizeOrientation(WRot.FromFacing(bodyFacing), facings);
+			Func<int> facing = init.GetFacing();
-			var offset = body.LocalToWorld(t.Offset.Rotate(orientation));
+			Func<WRot> orientation = () => body.QuantizeOrientation(WRot.FromFacing(facing()), facings);
-			var zOffset = -(offset.Y + offset.Z) + 1;
+			Func<WVec> offset = () => body.LocalToWorld(t.Offset.Rotate(orientation()));
-			yield return new SpriteActorPreview(anim, () => offset, () => zOffset, p, rs.Scale);
+			Func<int> zOffset = () =>
+			{
+				var tmpOffset = offset();
+				return -(tmpOffset.Y + tmpOffset.Z) + 1;
+			};
+
+			yield return new SpriteActorPreview(anim, offset, zOffset, p, rs.Scale);
 		}
 	}
 

OpenRA.Mods.Common/Traits/ThrowsParticle.cs

@@ -9,6 +9,7 @@
  */
 #endregion
 
+using System;
 using OpenRA.Graphics;
 using OpenRA.Mods.Common.Traits.Render;
 using OpenRA.Traits;
@@ -64,7 +65,8 @@ namespace OpenRA.Mods.Common.Traits
 			var body = self.Trait<BodyOrientation>();
 
 			// TODO: Carry orientation over from the parent instead of just facing
-			var bodyFacing = init.Contains<FacingInit>() ? init.Get<FacingInit, int>() : 0;
+			var bodyFacing = init.Contains<DynamicFacingInit>() ? init.Get<DynamicFacingInit, Func<int>>()()
+				: init.Contains<FacingInit>() ? init.Get<FacingInit, int>() : 0;
 			facing = WAngle.FromFacing(Turreted.GetInitialTurretFacing(init, 0));
 
 			// Calculate final position

OpenRA.Mods.Common/Traits/Turreted.cs

@@ -9,6 +9,7 @@
  */
 #endregion
 
+using System;
 using System.Collections.Generic;
 using OpenRA.Primitives;
 using OpenRA.Traits;
@@ -61,6 +62,9 @@ namespace OpenRA.Mods.Common.Traits
 			if (init.Contains<TurretFacingInit>())
 				return init.Get<TurretFacingInit, int>();
 
+			if (init.Contains<DynamicFacingInit>())
+				return init.Get<DynamicFacingInit, Func<int>>()();
+
 			if (init.Contains<FacingInit>())
 				return init.Get<FacingInit, int>();