Use new IAutoRenderSize for determining actor render bounds

OpenRA.Mods.Common/OpenRA.Mods.Common.csproj

@@ -328,6 +328,7 @@
     <Compile Include="Traits\Crushable.cs" />
     <Compile Include="Traits\CustomSellValue.cs" />
     <Compile Include="Traits\CustomSelectionSize.cs" />
+    <Compile Include="Traits\Render\CustomRenderSize.cs" />
     <Compile Include="Traits\DamagedByTerrain.cs" />
     <Compile Include="Traits\DeliversCash.cs" />
     <Compile Include="Traits\DeliversExperience.cs" />
@@ -417,6 +418,7 @@
     <Compile Include="Traits\BodyOrientation.cs" />
     <Compile Include="Traits\QuantizeFacingsFromSequence.cs" />
     <Compile Include="Traits\Render\AutoSelectionSize.cs" />
+    <Compile Include="Traits\Render\AutoRenderSize.cs" />
     <Compile Include="Traits\Render\CashTricklerBar.cs" />
     <Compile Include="Traits\Render\CustomTerrainDebugOverlay.cs" />
     <Compile Include="Traits\Render\Hovers.cs" />

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

@@ -0,0 +1,32 @@
+#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 OpenRA.Traits;
+
+namespace OpenRA.Mods.Common.Traits.Render
+{
+	[Desc("Automatically calculates the screen map boundaries from the sprite size.")]
+	public class AutoRenderSizeInfo : ITraitInfo, Requires<RenderSpritesInfo>, IAutoRenderSizeInfo
+	{
+		public object Create(ActorInitializer init) { return new AutoRenderSize(this); }
+	}
+
+	public class AutoRenderSize : IAutoRenderSize
+	{
+		public AutoRenderSize(AutoRenderSizeInfo info) { }
+
+		public int2 RenderSize(Actor self)
+		{
+			var rs = self.Trait<RenderSprites>();
+			return rs.AutoRenderSize(self);
+		}
+	}
+}

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

@@ -0,0 +1,35 @@
+#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 OpenRA.Traits;
+
+namespace OpenRA.Mods.Common.Traits
+{
+	[Desc("Special case trait for actors that need to define targetable area and screen map bounds manually.")]
+	public class CustomRenderSizeInfo : ITraitInfo, IAutoRenderSizeInfo
+	{
+		[FieldLoader.Require]
+		public readonly int[] CustomBounds = null;
+
+		public object Create(ActorInitializer init) { return new CustomRenderSize(this); }
+	}
+
+	public class CustomRenderSize : IAutoRenderSize
+	{
+		readonly CustomRenderSizeInfo info;
+		public CustomRenderSize(CustomRenderSizeInfo info) { this.info = info; }
+
+		public int2 RenderSize(Actor self)
+		{
+			return new int2(info.CustomBounds[0], info.CustomBounds[1]);
+		}
+	}
+}

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

@@ -238,6 +238,12 @@ namespace OpenRA.Mods.Common.Traits.Render
 
 		// Required by WithSpriteBody and WithInfantryBody
 		public int2 AutoSelectionSize(Actor self)
+		{
+			return AutoRenderSize(self);
+		}
+
+		// Required by WithSpriteBody and WithInfantryBody
+		public int2 AutoRenderSize(Actor self)
 		{
 			return anims.Where(b => b.IsVisible
 				&& b.Animation.Animation.CurrentSequence != null)

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

@@ -19,7 +19,7 @@ using OpenRA.Traits;
 namespace OpenRA.Mods.Common.Traits.Render
 {
 	[Desc("Also returns a default selection size that is calculated automatically from the voxel dimensions.")]
-	public class WithVoxelBodyInfo : ConditionalTraitInfo, IRenderActorPreviewVoxelsInfo, Requires<RenderVoxelsInfo>, IAutoSelectionSizeInfo
+	public class WithVoxelBodyInfo : ConditionalTraitInfo, IRenderActorPreviewVoxelsInfo, Requires<RenderVoxelsInfo>, IAutoSelectionSizeInfo, IAutoRenderSizeInfo
 	{
 		public readonly string Sequence = "idle";
 
@@ -39,7 +39,7 @@ namespace OpenRA.Mods.Common.Traits.Render
 		}
 	}
 
-	public class WithVoxelBody : ConditionalTrait<WithVoxelBodyInfo>, IAutoSelectionSize
+	public class WithVoxelBody : ConditionalTrait<WithVoxelBodyInfo>, IAutoSelectionSize, IAutoRenderSize
 	{
 		readonly int2 size;
 
@@ -61,5 +61,6 @@ namespace OpenRA.Mods.Common.Traits.Render
 		}
 
 		public int2 SelectionSize(Actor self) { return size; }
+		public int2 RenderSize(Actor self) { return size; }
 	}
 }

OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs

@@ -1234,6 +1234,25 @@ namespace OpenRA.Mods.Common.UtilityCommands
 					}
 				}
 
+				// Split Selection- and RenderSize
+				if (engineVersion < 20171115)
+				{
+					var autoSelSize = node.Value.Nodes.FirstOrDefault(n => n.Key.StartsWith("AutoSelectionSize", StringComparison.Ordinal));
+					if (autoSelSize != null)
+						node.Value.Nodes.Add(new MiniYamlNode("AutoRenderSize", ""));
+
+					var customSelSize = node.Value.Nodes.FirstOrDefault(n => n.Key.StartsWith("CustomSelectionSize", StringComparison.Ordinal));
+					if (customSelSize != null)
+					{
+						var bounds = customSelSize.Value.Nodes.FirstOrDefault(n => n.Key == "CustomBounds");
+						var customRenderSize = new MiniYamlNode("CustomRenderSize", "");
+						if (bounds != null)
+							customRenderSize.Value.Nodes.Add(bounds);
+
+						node.Value.Nodes.Add(customRenderSize);
+					}
+				}
+
 				UpgradeActorRules(modData, engineVersion, ref node.Value.Nodes, node, depth + 1);
 			}