From 55d92b97352d7add5dc2b45685e9a81413f439fe Mon Sep 17 00:00:00 2001
From: Yair Morgenstern <yairm210@hotmail.com>
Date: Fri, 11 Feb 2022 10:49:07 +0200
Subject: [PATCH] Rendering performance improvements - only act on city button
 groups for tiles that are city centers, and only act on the group and not its
 subgroups

---
 .../src/com/unciv/ui/tilegroups/CityButton.kt |  4 ++++
 core/src/com/unciv/ui/tilegroups/TileGroup.kt | 22 +++++++++++++------
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/core/src/com/unciv/ui/tilegroups/CityButton.kt b/core/src/com/unciv/ui/tilegroups/CityButton.kt
index ded30567bd..04d5c27f33 100644
--- a/core/src/com/unciv/ui/tilegroups/CityButton.kt
+++ b/core/src/com/unciv/ui/tilegroups/CityButton.kt
@@ -502,4 +502,8 @@ class CityButton(val city: CityInfo, private val tileGroup: WorldTileGroup): Tab
         super.draw(batch, parentAlpha)
     }
 
+    override fun act(delta: Float) {
+        return // actions should only be for the CityButtonLayerGroup
+    }
+
 }
\ No newline at end of file
diff --git a/core/src/com/unciv/ui/tilegroups/TileGroup.kt b/core/src/com/unciv/ui/tilegroups/TileGroup.kt
index b3bdcee0c5..5f40e84003 100644
--- a/core/src/com/unciv/ui/tilegroups/TileGroup.kt
+++ b/core/src/com/unciv/ui/tilegroups/TileGroup.kt
@@ -14,7 +14,6 @@ import com.unciv.logic.civilization.CivilizationInfo
 import com.unciv.logic.map.MapUnit
 import com.unciv.logic.map.RoadStatus
 import com.unciv.logic.map.TileInfo
-import com.unciv.models.*
 import com.unciv.models.helpers.MapArrowType
 import com.unciv.models.helpers.MiscArrowTypes
 import com.unciv.models.helpers.TintedMapArrow
@@ -119,14 +118,23 @@ open class TileGroup(var tileInfo: TileInfo, val tileSetStrings:TileSetStrings,
     val unitLayerGroup = UnitLayerGroupClass().apply { isTransform = false; setSize(groupSize, groupSize);touchable = Touchable.disabled }
     val unitImageLayerGroup = UnitImageLayerGroupClass().apply { isTransform = false; setSize(groupSize, groupSize);touchable = Touchable.disabled }
 
-    class CityButtonLayerGroupClass:Group() {
-        override fun draw(batch: Batch?, parentAlpha: Float) = super.draw(batch, parentAlpha)
-        override fun act(delta: Float) = super.act(delta)
-        override fun hit(x: Float, y: Float, touchable: Boolean) = super.hit(x, y, touchable)
+    class CityButtonLayerGroupClass(val tileInfo: TileInfo) :Group() {
+        override fun draw(batch: Batch?, parentAlpha: Float) {
+            if (!tileInfo.isCityCenter()) return
+            super.draw(batch, parentAlpha)
+        }
+        override fun act(delta: Float) {
+            if (!tileInfo.isCityCenter()) return
+            super.act(delta)
+        }
+        override fun hit(x: Float, y: Float, touchable: Boolean): Actor? {
+            if (!tileInfo.isCityCenter()) return null
+            return super.hit(x, y, touchable)
+        }
     }
 
-    val cityButtonLayerGroup = CityButtonLayerGroupClass().apply { isTransform = false; setSize(groupSize, groupSize)
-        touchable = Touchable.childrenOnly; setOrigin(Align.center) }
+    val cityButtonLayerGroup = CityButtonLayerGroupClass(tileInfo).apply { isTransform = false; setSize(groupSize, groupSize)
+        touchable = Touchable.childrenOnly; setOrigin(Align.center);  }
 
     val highlightCrosshairFogLayerGroup = ActionlessGroup().apply { isTransform = false; setSize(groupSize, groupSize) }
     val highlightImage = ImageGetter.getImage(tileSetStrings.highlight) // for blue and red circles/emphasis on the tile