Optimize memory allocations away from render loop

Author: Rampastring

src/TSMapEditor/Constants.cs

@@ -4,7 +4,7 @@ namespace TSMapEditor
 {
     public static class Constants
     {
-        public const string ReleaseVersion = "1.6.5";
+        public const string ReleaseVersion = "1.6.6";
 
         public static int CellSizeX = 48;
         public static int CellSizeY = 24;

src/TSMapEditor/Rendering/MapView.cs

@@ -620,13 +620,29 @@ public void DrawTerrainTileAndRegisterObjects(MapTile tile)
             }
 
             if ((EditorState.RenderObjectFlags & RenderObjectFlags.Infantry) == RenderObjectFlags.Infantry)
-                tile.DoForAllInfantry(AddGameObjectToRender);
+            {
+                for (int i = 0; i < tile.Infantry.Length; i++)
+                {
+                    if (tile.Infantry[i] != null)
+                        AddGameObjectToRender(tile.Infantry[i]);
+                }
+            }
 
             if ((EditorState.RenderObjectFlags & RenderObjectFlags.Aircraft) == RenderObjectFlags.Aircraft)
-                tile.DoForAllAircraft(AddGameObjectToRender);
+            {
+                for (int i = 0; i < tile.Aircraft.Count; i++)
+                {
+                    AddGameObjectToRender(tile.Infantry[i]);
+                }
+            }
 
             if ((EditorState.RenderObjectFlags & RenderObjectFlags.Vehicles) == RenderObjectFlags.Vehicles)
-                tile.DoForAllVehicles(AddGameObjectToRender);
+            {
+                for (int i = 0; i < tile.Vehicles.Count; i++)
+                {
+                    AddGameObjectToRender(tile.Vehicles[i]);
+                }
+            }
 
             if ((EditorState.RenderObjectFlags & RenderObjectFlags.TerrainObjects) == RenderObjectFlags.TerrainObjects && tile.TerrainObject != null)
             {

src/TSMapEditor/Rendering/ObjectRenderers/BuildingRenderer.cs

@@ -10,12 +10,11 @@ public sealed class BuildingRenderer : ObjectRenderer<Structure>
     {
         public BuildingRenderer(RenderDependencies renderDependencies) : base(renderDependencies)
         {
-            buildingAnimRenderer = new AnimRenderer(renderDependencies);
         }
 
         protected override Color ReplacementColor => Color.Yellow;
 
-        private AnimRenderer buildingAnimRenderer;
+        private List<Animation> animationList = new List<Animation>();
 
         DepthRectangle cachedDepth;
 
@@ -302,22 +301,22 @@ protected override void Render(Structure gameObject, Point2D drawPoint, in Commo
             float depthAddition = Constants.DepthEpsilon * ObjectDepthAdjustments.Building;
 
             // Form the anims list
-            var animsList = new List<Animation>(gameObject.Anims.Length + gameObject.PowerUpAnims.Length + 1);
-            animsList.AddRange(gameObject.Anims);
-            animsList.AddRange(gameObject.PowerUpAnims);
+            animationList.Clear();
+            animationList.AddRange(gameObject.Anims);
+            animationList.AddRange(gameObject.PowerUpAnims);
             if (gameObject.TurretAnim != null)
-                animsList.Add(gameObject.TurretAnim);
-            
+                animationList.Add(gameObject.TurretAnim);
+
             // Sort the anims according to their settings
-            animsList.Sort((anim1, anim2) =>
+            animationList.Sort((anim1, anim2) =>
                 anim1.BuildingAnimDrawConfig.SortValue.CompareTo(anim2.BuildingAnimDrawConfig.SortValue));
 
             bool affectedByAmbient = !affectedByLighting;
 
             // The building itself has an offset of 0, so first draw all anims with sort values < 0
-            for (int i = 0; i < animsList.Count; i++)
+            for (int i = 0; i < animationList.Count; i++)
             {
-                var anim = animsList[i];
+                var anim = animationList[i];
 
                 if (anim.BuildingAnimDrawConfig.SortValue < 0)
                 {
@@ -348,9 +347,9 @@ protected override void Render(Structure gameObject, Point2D drawPoint, in Commo
                 DrawFoundationLines(gameObject);
 
             // Then draw all anims with sort values >= 0
-            for (int i = 0; i < animsList.Count; i++)
+            for (int i = 0; i < animationList.Count; i++)
             {
-                var anim = animsList[i];
+                var anim = animationList[i];
 
                 if (anim.BuildingAnimDrawConfig.SortValue >= 0)
                 {