Rename WithTurret, WithBarrel and WithReloadingTurret

Make them use RenderUtils.ZOffsetFromCenter.
2015-10-04 19:56:35 +02:00
parent 72ec431766
commit 35c4aca983
17 changed files with 99 additions and 45 deletions
--- a/OpenRA.Mods.Common/Traits/Render/WithSpriteBarrel.cs
+++ b/OpenRA.Mods.Common/Traits/Render/WithSpriteBarrel.cs
@@ -0,0 +1,108 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2015 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see COPYING.
+ */
+#endregion
+
+using System.Collections.Generic;
+using System.Linq;
+using OpenRA.Graphics;
+using OpenRA.Mods.Common.Graphics;
+using OpenRA.Traits;
+
+namespace OpenRA.Mods.Common.Traits
+{
+	[Desc("Renders barrels for units with the Turreted trait.")]
+	public class WithSpriteBarrelInfo : UpgradableTraitInfo, IRenderActorPreviewSpritesInfo, Requires<TurretedInfo>,
+		Requires<ArmamentInfo>, Requires<RenderSpritesInfo>, Requires<BodyOrientationInfo>
+	{
+		[Desc("Sequence name to use.")]
+		[SequenceReference] public readonly string Sequence = "barrel";
+
+		[Desc("Armament to use for recoil.")]
+		public readonly string Armament = "primary";
+
+		[Desc("Visual offset.")]
+		public readonly WVec LocalOffset = WVec.Zero;
+
+		public override object Create(ActorInitializer init) { return new WithSpriteBarrel(init.Self, this); }
+
+		public IEnumerable<IActorPreview> RenderPreviewSprites(ActorPreviewInitializer init, RenderSpritesInfo rs, string image, int facings, PaletteReference p)
+		{
+			if (UpgradeMinEnabledLevel > 0)
+				yield break;
+
+			var body = init.Actor.TraitInfo<BodyOrientationInfo>();
+			var armament = init.Actor.TraitInfos<ArmamentInfo>()
+				.First(a => a.Name == Armament);
+			var t = init.Actor.TraitInfos<TurretedInfo>()
+				.First(tt => tt.Turret == armament.Turret);
+
+			var anim = new Animation(init.World, image, () => t.InitialFacing);
+			anim.Play(RenderSprites.NormalizeSequence(anim, init.GetDamageState(), Sequence));
+
+			var turretOrientation = body.QuantizeOrientation(new WRot(WAngle.Zero, WAngle.Zero, WAngle.FromFacing(t.InitialFacing)), facings);
+			var turretOffset = body.LocalToWorld(t.Offset.Rotate(turretOrientation));
+
+			yield return new SpriteActorPreview(anim, turretOffset, turretOffset.Y + turretOffset.Z, p, rs.Scale);
+		}
+	}
+
+	public class WithSpriteBarrel : UpgradableTrait<WithSpriteBarrelInfo>
+	{
+		public readonly Animation DefaultAnimation;
+		readonly RenderSprites rs;
+		readonly Actor self;
+		readonly Armament armament;
+		readonly Turreted turreted;
+		readonly BodyOrientation body;
+
+		public WithSpriteBarrel(Actor self, WithSpriteBarrelInfo info)
+			: base(info)
+		{
+			this.self = self;
+			body = self.Trait<BodyOrientation>();
+			armament = self.TraitsImplementing<Armament>()
+				.First(a => a.Info.Name == Info.Armament);
+			turreted = self.TraitsImplementing<Turreted>()
+				.First(tt => tt.Name == armament.Info.Turret);
+
+			rs = self.Trait<RenderSprites>();
+			DefaultAnimation = new Animation(self.World, rs.GetImage(self), () => turreted.TurretFacing);
+			DefaultAnimation.PlayRepeating(NormalizeSequence(self, Info.Sequence));
+			rs.Add(new AnimationWithOffset(
+				DefaultAnimation, () => BarrelOffset(), () => IsTraitDisabled, () => false, p => RenderUtils.ZOffsetFromCenter(self, p, 0)));
+
+			// Restrict turret facings to match the sprite
+			turreted.QuantizedFacings = DefaultAnimation.CurrentSequence.Facings;
+		}
+
+		public string NormalizeSequence(Actor self, string sequence)
+		{
+			return RenderSprites.NormalizeSequence(DefaultAnimation, self.GetDamageState(), sequence);
+		}
+
+		WVec BarrelOffset()
+		{
+			var localOffset = Info.LocalOffset + new WVec(-armament.Recoil, WDist.Zero, WDist.Zero);
+			var turretOffset = turreted != null ? turreted.Position(self) : WVec.Zero;
+			var turretOrientation = turreted != null ? turreted.LocalOrientation(self) : WRot.Zero;
+
+			var quantizedBody = body.QuantizeOrientation(self, self.Orientation);
+			var quantizedTurret = body.QuantizeOrientation(self, turretOrientation);
+			return turretOffset + body.LocalToWorld(localOffset.Rotate(quantizedTurret).Rotate(quantizedBody));
+		}
+
+		IEnumerable<WRot> BarrelRotation()
+		{
+			var b = self.Orientation;
+			var qb = body.QuantizeOrientation(self, b);
+			yield return turreted.LocalOrientation(self) + WRot.FromYaw(b.Yaw - qb.Yaw);
+			yield return qb;
+		}
+	}
+}