Remove bib-related hacks from Building and FootprintUtils

2017-06-28 14:10:04 +02:00
parent 9b137afa6d
commit 3200f4fb0f
5 changed files with 20 additions and 24 deletions
--- a/OpenRA.Mods.Cnc/Traits/Render/WithBuildingBib.cs
+++ b/OpenRA.Mods.Cnc/Traits/Render/WithBuildingBib.cs
@@ -0,0 +1,138 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2017 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, either version 3 of
+ * the License, or (at your option) any later version. For more
+ * information, see COPYING.
+ */
+#endregion
+
+using System.Collections.Generic;
+using OpenRA.Graphics;
+using OpenRA.Mods.Common.Graphics;
+using OpenRA.Mods.Common.Traits;
+using OpenRA.Mods.Common.Traits.Render;
+using OpenRA.Traits;
+
+namespace OpenRA.Mods.Cnc.Traits
+{
+	public class WithBuildingBibInfo : ITraitInfo, Requires<BuildingInfo>, IRenderActorPreviewSpritesInfo, IActorPreviewInitInfo, Requires<RenderSpritesInfo>
+	{
+		[SequenceReference] public readonly string Sequence = "bib";
+
+		[PaletteReference] public readonly string Palette = TileSet.TerrainPaletteInternalName;
+
+		public readonly bool HasMinibib = false;
+
+		public object Create(ActorInitializer init) { return new WithBuildingBib(init.Self, this); }
+
+		public IEnumerable<IActorPreview> RenderPreviewSprites(ActorPreviewInitializer init, RenderSpritesInfo rs, string image, int facings, PaletteReference p)
+		{
+			if (init.Contains<HideBibPreviewInit>() && init.Get<HideBibPreviewInit, bool>())
+				yield break;
+
+			if (Palette != null)
+				p = init.WorldRenderer.Palette(Palette);
+
+			var bi = init.Actor.TraitInfo<BuildingInfo>();
+
+			var rows = HasMinibib ? 1 : 2;
+			var width = bi.Dimensions.X;
+			var bibOffset = bi.Dimensions.Y - rows;
+			var centerOffset = FootprintUtils.CenterOffset(init.World, bi);
+			var map = init.World.Map;
+			var location = CPos.Zero;
+
+			if (init.Contains<LocationInit>())
+				location = init.Get<LocationInit, CPos>();
+
+			for (var i = 0; i < rows * width; i++)
+			{
+				var index = i;
+				var anim = new Animation(init.World, image);
+				var cellOffset = new CVec(i % width, i / width + bibOffset);
+				var cell = location + cellOffset;
+
+				// Some mods may define terrain-specific bibs
+				var terrain = map.GetTerrainInfo(cell).Type;
+				var testSequence = Sequence + "-" + terrain;
+				var sequence = anim.HasSequence(testSequence) ? testSequence : Sequence;
+				anim.PlayFetchIndex(sequence, () => index);
+				anim.IsDecoration = true;
+
+				// Z-order is one set to the top of the footprint
+				var offset = map.CenterOfCell(cell) - map.CenterOfCell(location) - centerOffset;
+				yield return new SpriteActorPreview(anim, () => offset, () => -(offset.Y + centerOffset.Y + 512), p, rs.Scale);
+			}
+		}
+
+		IEnumerable<object> IActorPreviewInitInfo.ActorPreviewInits(ActorInfo ai, ActorPreviewType type)
+		{
+			yield return new HideBibPreviewInit();
+		}
+	}
+
+	public class WithBuildingBib : INotifyAddedToWorld, INotifyRemovedFromWorld
+	{
+		readonly WithBuildingBibInfo info;
+		readonly RenderSprites rs;
+		readonly BuildingInfo bi;
+		readonly List<AnimationWithOffset> anims = new List<AnimationWithOffset>();
+
+		public WithBuildingBib(Actor self, WithBuildingBibInfo info)
+		{
+			this.info = info;
+			rs = self.Trait<RenderSprites>();
+			bi = self.Info.TraitInfo<BuildingInfo>();
+		}
+
+		public void AddedToWorld(Actor self)
+		{
+			var rows = info.HasMinibib ? 1 : 2;
+			var width = bi.Dimensions.X;
+			var bibOffset = bi.Dimensions.Y - rows;
+			var centerOffset = FootprintUtils.CenterOffset(self.World, bi);
+			var location = self.Location;
+			var map = self.World.Map;
+
+			for (var i = 0; i < rows * width; i++)
+			{
+				var index = i;
+				var anim = new Animation(self.World, rs.GetImage(self));
+				var cellOffset = new CVec(i % width, i / width + bibOffset);
+				var cell = location + cellOffset;
+
+				// Some mods may define terrain-specific bibs
+				var terrain = map.GetTerrainInfo(cell).Type;
+				var testSequence = info.Sequence + "-" + terrain;
+				var sequence = anim.HasSequence(testSequence) ? testSequence : info.Sequence;
+				anim.PlayFetchIndex(sequence, () => index);
+				anim.IsDecoration = true;
+
+				// Z-order is one set to the top of the footprint
+				var offset = self.World.Map.CenterOfCell(cell) - self.World.Map.CenterOfCell(location) - centerOffset;
+				var awo = new AnimationWithOffset(anim, () => offset, null, -(offset.Y + centerOffset.Y + 512));
+				anims.Add(awo);
+				rs.Add(awo, info.Palette);
+			}
+		}
+
+		public void RemovedFromWorld(Actor self)
+		{
+			foreach (var a in anims)
+				rs.Remove(a);
+
+			anims.Clear();
+		}
+	}
+
+	class HideBibPreviewInit : IActorInit<bool>, ISuppressInitExport
+	{
+		[FieldFromYamlKey] readonly bool value = true;
+		public HideBibPreviewInit() { }
+		public HideBibPreviewInit(bool init) { value = init; }
+		public bool Value(World world) { return value; }
+	}
+}