Add annotation support to IOrderGenerator.

OpenRA.Game/Graphics/WorldRenderer.cs

@@ -166,8 +166,13 @@ namespace OpenRA.Graphics
 					.Where(t => !t.SpatiallyPartitionable || onScreenActors.Contains(a))
 					.SelectMany(t => t.RenderAnnotations(a, this)));
 
+			var orderGenerator = SpriteRenderable.None;
+			if (World.OrderGenerator != null)
+				orderGenerator = World.OrderGenerator.RenderAnnotations(this, World);
+
 			return actors
 				.Concat(selected)
+				.Concat(orderGenerator)
 				.Select(r => r.PrepareRender(this));
 		}
 

OpenRA.Game/Orders/IOrderGenerator.cs

@@ -20,6 +20,7 @@ namespace OpenRA
 		void Tick(World world);
 		IEnumerable<IRenderable> Render(WorldRenderer wr, World world);
 		IEnumerable<IRenderable> RenderAboveShroud(WorldRenderer wr, World world);
+		IEnumerable<IRenderable> RenderAnnotations(WorldRenderer wr, World world);
 		string GetCursor(World world, CPos cell, int2 worldPixel, MouseInput mi);
 		void Deactivate();
 		bool HandleKeyPress(KeyInput e);

OpenRA.Game/Orders/UnitOrderGenerator.cs

@@ -64,6 +64,7 @@ namespace OpenRA.Orders
 		public virtual void Tick(World world) { }
 		public virtual IEnumerable<IRenderable> Render(WorldRenderer wr, World world) { yield break; }
 		public virtual IEnumerable<IRenderable> RenderAboveShroud(WorldRenderer wr, World world) { yield break; }
+		public virtual IEnumerable<IRenderable> RenderAnnotations(WorldRenderer wr, World world) { yield break; }
 
 		public virtual string GetCursor(World world, CPos cell, int2 worldPixel, MouseInput mi)
 		{

OpenRA.Mods.Cnc/Traits/Minelayer.cs

@@ -222,6 +222,8 @@ namespace OpenRA.Mods.Cnc.Traits
 				}
 			}
 
+			protected override IEnumerable<IRenderable> RenderAnnotations(WorldRenderer wr, World world) { yield break; }
+
 			protected override string GetCursor(World world, CPos cell, int2 worldPixel, MouseInput mi)
 			{
 				return "ability";

OpenRA.Mods.Cnc/Traits/PortableChrono.cs

@@ -215,12 +215,11 @@ namespace OpenRA.Mods.Cnc.Traits
 				world.CancelInputMode();
 		}
 
-		protected override IEnumerable<IRenderable> Render(WorldRenderer wr, World world)
+		protected override IEnumerable<IRenderable> Render(WorldRenderer wr, World world) { yield break; }
-		{
-			yield break;
-		}
 
-		protected override IEnumerable<IRenderable> RenderAboveShroud(WorldRenderer wr, World world)
+		protected override IEnumerable<IRenderable> RenderAboveShroud(WorldRenderer wr, World world) { yield break; }
+
+		protected override IEnumerable<IRenderable> RenderAnnotations(WorldRenderer wr, World world)
 		{
 			if (!self.IsInWorld || self.Owner != self.World.LocalPlayer)
 				yield break;

OpenRA.Mods.Cnc/Traits/SupportPowers/AttackOrderPower.cs

@@ -113,8 +113,9 @@ namespace OpenRA.Mods.Cnc.Traits
 		}
 
 		protected override IEnumerable<IRenderable> Render(WorldRenderer wr, World world) { yield break; }
+		protected override IEnumerable<IRenderable> RenderAboveShroud(WorldRenderer wr, World world) { yield break; }
 
-		protected override IEnumerable<IRenderable> RenderAboveShroud(WorldRenderer wr, World world)
+		protected override IEnumerable<IRenderable> RenderAnnotations(WorldRenderer wr, World world)
 		{
 			foreach (var a in instance.Instances.Where(i => !i.IsTraitPaused))
 			{

OpenRA.Mods.Cnc/Traits/SupportPowers/ChronoshiftPower.cs

@@ -167,7 +167,9 @@ namespace OpenRA.Mods.Cnc.Traits
 					world.CancelInputMode();
 			}
 
-			protected override IEnumerable<IRenderable> RenderAboveShroud(WorldRenderer wr, World world)
+			protected override IEnumerable<IRenderable> RenderAboveShroud(WorldRenderer wr, World world) { yield break; }
+
+			protected override IEnumerable<IRenderable> RenderAnnotations(WorldRenderer wr, World world)
 			{
 				var xy = wr.Viewport.ViewToWorld(Viewport.LastMousePos);
 				var targetUnits = power.UnitsInRange(xy).Where(a => !world.FogObscures(a));
@@ -291,7 +293,10 @@ namespace OpenRA.Mods.Cnc.Traits
 						foreach (var r in unit.Render(wr))
 							yield return r.OffsetBy(offset);
 				}
+			}
 
+			protected override IEnumerable<IRenderable> RenderAnnotations(WorldRenderer wr, World world)
+			{
 				foreach (var unit in power.UnitsInRange(sourceLocation))
 				{
 					if (unit.CanBeViewedByPlayer(manager.Self.Owner))

OpenRA.Mods.Common/Orders/BeaconOrderGenerator.cs

@@ -28,6 +28,7 @@ namespace OpenRA.Mods.Common.Orders
 		protected override void Tick(World world) { }
 		protected override IEnumerable<IRenderable> Render(WorldRenderer wr, World world) { yield break; }
 		protected override IEnumerable<IRenderable> RenderAboveShroud(WorldRenderer wr, World world) { yield break; }
+		protected override IEnumerable<IRenderable> RenderAnnotations(WorldRenderer wr, World world) { yield break; }
 		protected override string GetCursor(World world, CPos cell, int2 worldPixel, MouseInput mi)
 		{
 			return "ability";

OpenRA.Mods.Common/Orders/GlobalButtonOrderGenerator.cs

@@ -63,6 +63,7 @@ namespace OpenRA.Mods.Common.Orders
 
 		protected override IEnumerable<IRenderable> Render(WorldRenderer wr, World world) { yield break; }
 		protected override IEnumerable<IRenderable> RenderAboveShroud(WorldRenderer wr, World world) { yield break; }
+		protected override IEnumerable<IRenderable> RenderAnnotations(WorldRenderer wr, World world) { yield break; }
 
 		protected abstract override string GetCursor(World world, CPos cell, int2 worldPixel, MouseInput mi);
 	}

OpenRA.Mods.Common/Orders/OrderGenerator.cs

@@ -28,6 +28,7 @@ namespace OpenRA.Mods.Common.Orders
 		void IOrderGenerator.Tick(World world) { Tick(world); }
 		IEnumerable<IRenderable> IOrderGenerator.Render(WorldRenderer wr, World world) { return Render(wr, world); }
 		IEnumerable<IRenderable> IOrderGenerator.RenderAboveShroud(WorldRenderer wr, World world) { return RenderAboveShroud(wr, world); }
+		IEnumerable<IRenderable> IOrderGenerator.RenderAnnotations(WorldRenderer wr, World world) { return RenderAnnotations(wr, world); }
 		string IOrderGenerator.GetCursor(World world, CPos cell, int2 worldPixel, MouseInput mi) { return GetCursor(world, cell, worldPixel, mi); }
 		void IOrderGenerator.Deactivate() { }
 		bool IOrderGenerator.HandleKeyPress(KeyInput e) { return false; }
@@ -35,6 +36,7 @@ namespace OpenRA.Mods.Common.Orders
 		protected abstract void Tick(World world);
 		protected abstract IEnumerable<IRenderable> Render(WorldRenderer wr, World world);
 		protected abstract IEnumerable<IRenderable> RenderAboveShroud(WorldRenderer wr, World world);
+		protected abstract IEnumerable<IRenderable> RenderAnnotations(WorldRenderer wr, World world);
 		protected abstract string GetCursor(World world, CPos cell, int2 worldPixel, MouseInput mi);
 		protected abstract IEnumerable<Order> OrderInner(World world, CPos cell, int2 worldPixel, MouseInput mi);
 	}

OpenRA.Mods.Common/Orders/PlaceBuildingOrderGenerator.cs

@@ -281,6 +281,8 @@ namespace OpenRA.Mods.Common.Orders
 			return preview != null ? preview.Render(wr, topLeft, footprint) : Enumerable.Empty<IRenderable>();
 		}
 
+		IEnumerable<IRenderable> IOrderGenerator.RenderAnnotations(WorldRenderer wr, World world) { yield break; }
+
 		string IOrderGenerator.GetCursor(World world, CPos cell, int2 worldPixel, MouseInput mi) { return "default"; }
 
 		bool IOrderGenerator.HandleKeyPress(KeyInput e)

OpenRA.Mods.Common/Orders/RepairOrderGenerator.cs

@@ -85,6 +85,7 @@ namespace OpenRA.Mods.Common.Orders
 
 		protected override IEnumerable<IRenderable> Render(WorldRenderer wr, World world) { yield break; }
 		protected override IEnumerable<IRenderable> RenderAboveShroud(WorldRenderer wr, World world) { yield break; }
+		protected override IEnumerable<IRenderable> RenderAnnotations(WorldRenderer wr, World world) { yield break; }
 
 		protected override string GetCursor(World world, CPos cell, int2 worldPixel, MouseInput mi)
 		{

OpenRA.Mods.Common/Traits/SupportPowers/GrantExternalConditionPower.cs

@@ -138,7 +138,9 @@ namespace OpenRA.Mods.Common.Traits
 					world.CancelInputMode();
 			}
 
-			protected override IEnumerable<IRenderable> RenderAboveShroud(WorldRenderer wr, World world)
+			protected override IEnumerable<IRenderable> RenderAboveShroud(WorldRenderer wr, World world) { yield break; }
+
+			protected override IEnumerable<IRenderable> RenderAnnotations(WorldRenderer wr, World world)
 			{
 				var xy = wr.Viewport.ViewToWorld(Viewport.LastMousePos);
 				foreach (var unit in power.UnitsInRange(xy))

OpenRA.Mods.Common/Traits/SupportPowers/SelectDirectionalTarget.cs

@@ -118,6 +118,7 @@ namespace OpenRA.Mods.Common.Traits
 		IEnumerable<IRenderable> IOrderGenerator.Render(WorldRenderer wr, World world) { yield break; }
 
 		IEnumerable<IRenderable> IOrderGenerator.RenderAboveShroud(WorldRenderer wr, World world) { yield break; }
+		IEnumerable<IRenderable> IOrderGenerator.RenderAnnotations(WorldRenderer wr, World world) { yield break; }
 
 		string IOrderGenerator.GetCursor(World world, CPos cell, int2 worldPixel, MouseInput mi)
 		{

OpenRA.Mods.Common/Traits/SupportPowers/SupportPowerManager.cs

@@ -296,6 +296,7 @@ namespace OpenRA.Mods.Common.Traits
 
 		protected override IEnumerable<IRenderable> Render(WorldRenderer wr, World world) { yield break; }
 		protected override IEnumerable<IRenderable> RenderAboveShroud(WorldRenderer wr, World world) { yield break; }
+		protected override IEnumerable<IRenderable> RenderAnnotations(WorldRenderer wr, World world) { yield break; }
 		protected override string GetCursor(World world, CPos cell, int2 worldPixel, MouseInput mi)
 		{
 			return world.Map.Contains(cell) ? cursor : "generic-blocked";