move render{building,buildingturreted,unit} into mods.ra; move all render traits into mods.ra.render

OpenRA.Game/OpenRA.Game.csproj

@@ -87,8 +87,6 @@
     <Compile Include="Traits\Player\PlayerResources.cs" />
     <Compile Include="Traits\Player\TechTreeCache.cs" />
     <Compile Include="Traits\Modifiers\HiddenUnderFog.cs" />
-    <Compile Include="Traits\Render\RenderBuilding.cs" />
-    <Compile Include="Traits\Render\RenderBuildingTurreted.cs" />
     <Compile Include="Traits\World\Shroud.cs" />
     <Compile Include="Widgets\Delegates\ConnectionDialogsDelegate.cs" />
     <Compile Include="Widgets\Delegates\CreateServerMenuDelegate.cs" />
@@ -189,7 +187,6 @@
     <Compile Include="Traits\Production.cs" />
     <Compile Include="Traits\RallyPoint.cs" />
     <Compile Include="Traits\Render\RenderSimple.cs" />
-    <Compile Include="Traits\Render\RenderUnit.cs" />
     <Compile Include="Traits\StoresOre.cs" />
     <Compile Include="Traits\Cloak.cs" />
     <Compile Include="Traits\TraitsInterfaces.cs" />

OpenRA.Game/Traits/Player/PlaceBuilding.cs

@@ -83,11 +83,10 @@ namespace OpenRA.Traits
 							   .Where( x => x.Actor.Info.Traits.Get<ProductionInfo>().Produces.Contains( unit.Category ) )
 							   .ToList();
 			var producer = producers.Where( x => x.Trait.IsPrimary ).Concat( producers )
-				.Select( x => x.Actor )
 				.FirstOrDefault();
 
-			if( producer != null )
+			if( producer.Actor != null )
-				producer.traits.Get<RenderBuilding>().PlayCustomAnim( producer, "build" );
+				producer.Actor.traits.WithInterface<RenderSimple>().First().PlayCustomAnim( producer.Actor, "build" );
 		}
 
 		static int GetNumBuildables(Player p)

OpenRA.Game/Traits/Render/RenderSimple.cs

@@ -72,6 +72,18 @@ namespace OpenRA.Traits
 				a.Animation.Tick();
 		}
 
+		protected virtual string GetPrefix(Actor self)
+		{
+			return self.GetDamageState() == DamageState.Half ? "damaged-" : "";
+		}
+
+		public void PlayCustomAnim(Actor self, string name)
+		{
+			if (anim.HasSequence(name))
+				anim.PlayThen(GetPrefix(self) + name,
+					() => anim.PlayRepeating(GetPrefix(self) + "idle"));
+		}
+
 		public class AnimationWithOffset
 		{
 			public Animation Animation;

OpenRA.Mods.Cnc/TiberiumRefineryDockAction.cs

@@ -16,14 +16,12 @@
  *  You should have received a copy of the GNU General Public License
  *  along with OpenRA.  If not, see <http://www.gnu.org/licenses/>.
  */
-#endregion
+#endregion
-
+
-using System;
+using OpenRA.Mods.RA;
-using System.Linq;
+using OpenRA.Mods.RA.Activities;
-using System.Collections.Generic;
+using OpenRA.Mods.RA.Render;
-using OpenRA.Mods.RA;
+using OpenRA.Traits;
-using OpenRA.Mods.RA.Activities;
-using OpenRA.Traits;
 using OpenRA.Traits.Activities;
 
 namespace OpenRA.Mods.Cnc

OpenRA.Mods.RA/Activities/Attack.cs

@@ -18,6 +18,7 @@
  */
 #endregion
 
+using OpenRA.Mods.RA.Render;
 using OpenRA.Traits;
 using OpenRA.Traits.Activities;
 

OpenRA.Mods.RA/Activities/Harvest.cs

@@ -19,7 +19,7 @@
 #endregion
 
 using System.Linq;
-using OpenRA.GameRules;
+using OpenRA.Mods.RA.Render;
 using OpenRA.Traits;
 using OpenRA.Traits.Activities;
 

OpenRA.Mods.RA/Activities/Leap.cs

@@ -18,8 +18,10 @@
  */
 #endregion
 
-using OpenRA.Traits;
 using System.Linq;
+using OpenRA.Mods.RA.Render;
+using OpenRA.Traits;
+
 namespace OpenRA.Mods.RA.Activities
 {
 	class Leap : IActivity

OpenRA.Mods.RA/Activities/Rearm.cs

@@ -19,6 +19,7 @@
 #endregion
 
 using System.Linq;
+using OpenRA.Mods.RA.Render;
 using OpenRA.Traits;
 
 namespace OpenRA.Mods.RA.Activities

OpenRA.Mods.RA/Activities/Repair.cs

@@ -19,7 +19,7 @@
 #endregion
 
 using System;
-using System.Linq;
+using OpenRA.Mods.RA.Render;
 using OpenRA.Traits;
 
 namespace OpenRA.Mods.RA.Activities

OpenRA.Mods.RA/Activities/UndeployMcv.cs

@@ -18,6 +18,7 @@
  */
 #endregion
 
+using OpenRA.Mods.RA.Render;
 using OpenRA.Traits;
 
 namespace OpenRA.Mods.RA.Activities

OpenRA.Mods.RA/Activities/UnloadCargo.cs

@@ -19,7 +19,7 @@
 #endregion
 
 using System.Linq;
-using OpenRA.GameRules;
+using OpenRA.Mods.RA.Render;
 using OpenRA.Traits;
 using OpenRA.Traits.Activities;
 

OpenRA.Mods.RA/AttackTesla.cs

@@ -19,6 +19,7 @@
 #endregion
 
 using System;
+using OpenRA.Mods.RA.Render;
 using OpenRA.Traits;
 
 namespace OpenRA.Mods.RA

OpenRA.Mods.RA/Combat.cs

@@ -22,6 +22,7 @@ using System;
 using System.Linq;
 using OpenRA.Effects;
 using OpenRA.GameRules;
+using OpenRA.Mods.RA.Render;
 using OpenRA.Traits;
 
 namespace OpenRA.Mods.RA

OpenRA.Mods.RA/OpenRA.Mods.RA.csproj

@@ -82,7 +82,10 @@
     <Compile Include="Hazardous.cs" />
     <Compile Include="Player\ActorGroupProxy.cs" />
     <Compile Include="Aircraft.cs" />
-    <Compile Include="RenderUnitTurreted.cs" />
+    <Compile Include="Render\RenderBuilding.cs" />
+    <Compile Include="Render\RenderBuildingTurreted.cs" />
+    <Compile Include="Render\RenderUnit.cs" />
+    <Compile Include="Render\RenderUnitTurreted.cs" />
     <Compile Include="SupportPowers\AirstrikePower.cs" />
     <Compile Include="AttackFrontal.cs" />
     <Compile Include="AttackHeli.cs" />
@@ -150,22 +153,22 @@
     <Compile Include="Passenger.cs" />
     <Compile Include="Plane.cs" />
     <Compile Include="ProductionSurround.cs" />
-    <Compile Include="RenderBuildingCharge.cs" />
+    <Compile Include="Render\RenderBuildingCharge.cs" />
-    <Compile Include="RenderBuildingOre.cs" />
+    <Compile Include="Render\RenderBuildingOre.cs" />
-    <Compile Include="RenderBuildingWall.cs" />
+    <Compile Include="Render\RenderBuildingWall.cs" />
-    <Compile Include="RenderBuildingWarFactory.cs" />
+    <Compile Include="Render\RenderBuildingWarFactory.cs" />
-    <Compile Include="RenderFlare.cs" />
+    <Compile Include="Render\RenderFlare.cs" />
-    <Compile Include="RenderInfantry.cs" />
+    <Compile Include="Render\RenderInfantry.cs" />
-    <Compile Include="RenderUnitReload.cs" />
+    <Compile Include="Render\RenderUnitReload.cs" />
-    <Compile Include="RenderUnitRotor.cs" />
+    <Compile Include="Render\RenderUnitRotor.cs" />
-    <Compile Include="RenderUnitSpinner.cs" />
+    <Compile Include="Render\RenderUnitSpinner.cs" />
     <Compile Include="Repairable.cs" />
     <Compile Include="RepairsUnits.cs" />
     <Compile Include="RequiresPower.cs" />
     <Compile Include="Mine.cs" />
     <Compile Include="Minelayer.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="RenderSpy.cs" />
+    <Compile Include="Render\RenderSpy.cs" />
     <Compile Include="RepairableNear.cs" />
     <Compile Include="Crates\SpeedUpgradeCrateAction.cs" />
     <Compile Include="Reservable.cs" />

OpenRA.Mods.RA/OreRefineryDockAction.cs

@@ -18,8 +18,9 @@
  */
 #endregion
 
-using OpenRA.Mods.RA.Activities;
+using OpenRA.Mods.RA.Activities;
-using OpenRA.Traits;
+using OpenRA.Mods.RA.Render;
+using OpenRA.Traits;
 using OpenRA.Traits.Activities;
 
 namespace OpenRA.Mods.RA

OpenRA.Mods.RA/Render/RenderBuilding.cs

@@ -20,8 +20,9 @@
 
 using System;
 using OpenRA.Effects;
+using OpenRA.Traits;
 
-namespace OpenRA.Traits
+namespace OpenRA.Mods.RA.Render
 {
 	public class RenderBuildingInfo : RenderSimpleInfo
 	{
@@ -52,18 +53,6 @@ namespace OpenRA.Traits
 				x.BuildingComplete( self );
 		}
 
-		protected string GetPrefix(Actor self)
-		{
-			return self.GetDamageState() == DamageState.Half ? "damaged-" : "";
-		}
-
-		public void PlayCustomAnim(Actor self, string name)
-		{
-			if (anim.HasSequence(name))
-				anim.PlayThen(GetPrefix(self) + name,
-					() => anim.PlayRepeating(GetPrefix(self) + "idle"));
-		}
-
 		public void PlayCustomAnimThen(Actor self, string name, Action a)
 		{
 			anim.PlayThen(GetPrefix(self) + name,

OpenRA.Mods.RA/Render/RenderBuildingCharge.cs

@@ -18,9 +18,7 @@
  */
 #endregion
 
-using OpenRA.Traits;
+namespace OpenRA.Mods.RA.Render
-
-namespace OpenRA.Mods.RA
 {
 	class RenderBuildingChargeInfo : RenderBuildingInfo
 	{

OpenRA.Mods.RA/Render/RenderBuildingOre.cs

@@ -20,7 +20,7 @@
 
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA
+namespace OpenRA.Mods.RA.Render
 {
 	class RenderBuildingOreInfo : RenderBuildingInfo
 	{

OpenRA.Mods.RA/Render/RenderBuildingTurreted.cs

@@ -18,7 +18,9 @@
  */
 #endregion
 
-namespace OpenRA.Traits
+using OpenRA.Traits;
+
+namespace OpenRA.Mods.RA.Render
 {
 	class RenderBuildingTurretedInfo : RenderBuildingInfo
 	{

OpenRA.Mods.RA/Render/RenderBuildingWall.cs

@@ -19,10 +19,9 @@
 #endregion
 
 using System.Linq;
-using System;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA
+namespace OpenRA.Mods.RA.Render
 {
 	class RenderBuildingWallInfo : RenderBuildingInfo
 	{

OpenRA.Mods.RA/Render/RenderBuildingWarFactory.cs

@@ -22,7 +22,7 @@ using System.Linq;
 using OpenRA.Graphics;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA
+namespace OpenRA.Mods.RA.Render
 {
 	class RenderWarFactoryInfo : ITraitInfo, ITraitPrerequisite<RenderSimpleInfo>
 	{

OpenRA.Mods.RA/Render/RenderFlare.cs

@@ -20,7 +20,7 @@
 
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA
+namespace OpenRA.Mods.RA.Render
 {
 	class RenderFlareInfo : RenderSimpleInfo
 	{

OpenRA.Mods.RA/Render/RenderInfantry.cs

@@ -22,7 +22,7 @@ using OpenRA.Traits;
 using OpenRA.Traits.Activities;
 using OpenRA.Mods.RA.Effects;
 
-namespace OpenRA.Mods.RA
+namespace OpenRA.Mods.RA.Render
 {
 	public class RenderInfantryInfo : RenderSimpleInfo
 	{

OpenRA.Mods.RA/Render/RenderSpy.cs

@@ -22,7 +22,7 @@ using System.Collections.Generic;
 using System.Linq;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA
+namespace OpenRA.Mods.RA.Render
 {
 	class RenderSpyInfo : RenderInfantryInfo
 	{

OpenRA.Mods.RA/Render/RenderUnit.cs

@@ -20,8 +20,9 @@
 
 using System;
 using OpenRA.Graphics;
+using OpenRA.Traits;
 
-namespace OpenRA.Traits
+namespace OpenRA.Mods.RA.Render
 {
 	public class RenderUnitInfo : RenderSimpleInfo
 	{

OpenRA.Mods.RA/Render/RenderUnitReload.cs

@@ -21,7 +21,7 @@
 using OpenRA.Mods.RA.Activities;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA
+namespace OpenRA.Mods.RA.Render
 {
 	class RenderUnitReloadInfo : RenderUnitInfo
 	{

OpenRA.Mods.RA/Render/RenderUnitRotor.cs

@@ -21,7 +21,7 @@
 using OpenRA.Graphics;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA
+namespace OpenRA.Mods.RA.Render
 {
 	class RenderUnitRotorInfo : RenderUnitInfo
 	{

OpenRA.Mods.RA/Render/RenderUnitSpinner.cs

@@ -21,7 +21,7 @@
 using OpenRA.Graphics;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA
+namespace OpenRA.Mods.RA.Render
 {
 	class RenderUnitSpinnerInfo : RenderUnitInfo
 	{

OpenRA.Mods.RA/Render/RenderUnitTurreted.cs

@@ -21,7 +21,7 @@
 using OpenRA.Graphics;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA
+namespace OpenRA.Mods.RA.Render
 {
 	class RenderUnitTurretedInfo : RenderUnitInfo
 	{

OpenRA.Mods.RA/SeedsResource.cs

@@ -21,6 +21,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using OpenRA.Mods.RA.Render;
 using OpenRA.Traits;
 
 namespace OpenRA.Mods.RA

OpenRA.Mods.RA/SupportPowers/ChronoshiftPower.cs

@@ -21,6 +21,7 @@
 using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
+using OpenRA.Mods.RA.Render;
 using OpenRA.Traits;
 
 namespace OpenRA.Mods.RA

OpenRA.Mods.RA/SupportPowers/IronCurtainPower.cs

@@ -20,6 +20,7 @@
 
 using System.Collections.Generic;
 using System.Linq;
+using OpenRA.Mods.RA.Render;
 using OpenRA.Traits;
 
 namespace OpenRA.Mods.RA

OpenRA.Mods.RA/SupportPowers/NukePower.cs

@@ -20,6 +20,7 @@
 
 using System.Linq;
 using OpenRA.Mods.RA.Effects;
+using OpenRA.Mods.RA.Render;
 using OpenRA.Orders;
 using OpenRA.Traits;
 

OpenRA.Mods.RA/ThrowsParticles.cs

@@ -19,6 +19,7 @@
 #endregion
 
 using OpenRA.Graphics;
+using OpenRA.Mods.RA.Render;
 using OpenRA.Traits;
 
 namespace OpenRA.Mods.RA