Move turret animation frame selection logic to Animation.GetFrameInde…

…x instead of AnimRenderer
CnCNet · Oct 19, 2024 · 343c99d · 343c99d
1 parent 223ca63
commit 343c99d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/src/TSMapEditor/Models/Animation.cs b/src/TSMapEditor/Models/Animation.cs
@@ -41,6 +41,14 @@ public override int GetXDrawOffset()
 
         public override int GetFrameIndex(int frameCount)
         {
+            if (IsTurretAnim)
+            {
+                // Turret anims have their facing frames reversed
+                // Turret anims also only have 32 facings
+                byte facing = (byte)(255 - Facing - 31);
+                return facing / (256 / 32);
+            }
+
             if (IsBuildingAnim && ParentBuilding != null)
             {
                 if (frameCount > 1 && ParentBuilding.HP < Constants.ConditionYellowHP)

diff --git a/src/TSMapEditor/Rendering/ObjectRenderers/AnimRenderer.cs b/src/TSMapEditor/Rendering/ObjectRenderers/AnimRenderer.cs
@@ -58,13 +58,6 @@ protected override void Render(Animation gameObject, Point2D drawPoint, in Commo
                 return;
 
             int frameIndex = gameObject.GetFrameIndex(drawParams.ShapeImage.GetFrameCount());
-            if (gameObject.IsTurretAnim)
-            {
-                // Turret anims have their facing frames reversed
-                // Turret anims also only have 32 facings
-                byte facing = (byte)(255 - gameObject.Facing - 31);
-                frameIndex = facing / (256 / 32);
-            }
 
             float alpha = 1.0f;