From bdf2d43176229dc152d2c943aa6c7dcbea9f9d16 Mon Sep 17 00:00:00 2001
From: yairm210 <yairm210@hotmail.com>
Date: Wed, 5 Feb 2025 09:16:59 +0200
Subject: [PATCH] perf(render): Minimized texture swaps for
 improvements/resources

---
 android/Images.Icons/ImprovementIcons/Circle.png | Bin 0 -> 1459 bytes
 android/Images.Icons/ResourceIcons/Circle.png    | Bin 0 -> 1459 bytes
 android/assets/Icons.atlas                       |  14 ++++++++++++++
 core/src/com/unciv/ui/images/Portrait.kt         |   4 ++++
 4 files changed, 18 insertions(+)
 create mode 100644 android/Images.Icons/ImprovementIcons/Circle.png
 create mode 100644 android/Images.Icons/ResourceIcons/Circle.png

diff --git a/android/Images.Icons/ImprovementIcons/Circle.png b/android/Images.Icons/ImprovementIcons/Circle.png
new file mode 100644
index 0000000000000000000000000000000000000000..3d919503e924b6f00bc3580841d00a5c08249cda
GIT binary patch
literal 1459
zcmZXUdo<K(7{`C((y1owL}J}pyT~P7SXoX?1}TP_h>^%GrE!~T%1L5e8%n86WzUpd
zsbLsthH=Sd><lJh9jjS05l1ub%4NnS`!=0AowJ{F-skx~?|Gj0dEWPrHwW$QuCn#V
ztq=sMczPW21HSt6+N=m{FE%m=I9QUOyDLQR)|G%jDca?z3j{H4z}Lc*LA)j2BQObq
z;M+ehSf4Ou4Qy%?+>R44aZ!YeVTqAYd{_*gV2zI?81A#)ZN0~K-Z174NZLRj!Mc6+
zUs;#4y1FWp$(H3T%2`-gn4O)So}QkPGdVf=C38iNR4N7e-%6I`ynXu?Q~~?t1d&Me
zQ4SD7p%6%5hlYked}aPS=Dq{;1qcL!H*$cU`5#~~fIM*)lmhY1f>S{U&<<EI4-nsO
z1jYpShGVSe!4qH!e%=@ex|(_|os^lCos&y0xO4a3{YNEF%AP(eub@{k7}eD^FKU=9
z7PGFlj$Pl-__DdBmDBzgm)Ft7@9FCw7<}`uKsYiwJ}!|=OoItP!^MTAy4OM<2vV%|
zJmi8U3Z{j5e(IhY%EQSAwpfIvm!(e9Y4F~%gq*G$Ql$S0g<K_#B+*8oCCw5uprj(9
zNRrECzYq6UIAWZf*25i;yi|vbA11uczINwpIpJ{6GN9;~o%$)mKHCf|NsvK8rGEUG
ztO^bTF}~7J)mWE`y`)q5Ye|ZUq08_Sa<w`dFB(Ub=<QcL3?B;f7Qp^g5=G_PDQ;C;
zvq>6&o9&Cgrz~#HP1~UvPEc09BfXiSt<kGT<hz~^leu2urRn`c^?S!~=P|CU6^*b<
z7@d8VZHcM+UNx}mnHz!6?6dKsK9+A{f{~*K)NAvzIrbEeMJ!61o->s8O6eknf3ixO
z`idmTE@K=i=3Xi9dtKWx=8sr*zOa#^N-!GipUbg+Xng9YLf+Z2y@CaM&2|gDKoqCs
z{W5|BJE2X@j+1cIb<eXg&kb5{&ghyvw)%~UqI$J-XCT@84szBKjPD&2oSNEZhhP(E
z>Dk7~mlYVE+{;D55sW?I59sGk`4zNxl2waw?o8g9NPJ)8rB&5@u?QEj;!4{)SE#@&
zFt5f^bPCa|xH$vUg#rouQFl>EcIK4~XSW7Y(8-%F_8*RQo_6D(FD>rftg#(yVuSYh
zyNT#ww9MzvU32xO4s=HJkb|ET-ltgkc0Q(5_;%{;P4+ggkJ9q()V4$)DKiczpz)54
zStRbL%MEs;%fpx0h;}veWR!XR<=YCZ#nO<VD1TZhg2uaT9ByWBidQomYZ{&{o_KjO
zrXay=89AtFKFT`dgvu#kxFc++EZxKLy_DfT=SJm1K^K;RgyDK{iB_ztb-e|qnmDfS
z;Dc^q#-~h^Hq8^s3L~$Q!o|IetA=a@HfAGO#}0uaOqfjR28jDj9o04wVhmcjh7pfw
zAExp~ie?(J*3n02hBewuSm%sB4h(WDiT$_2DEULFM`1dIQQKGxBJ!7zmQoUiy_+O*
zNl)ZDgdjN`1D@s0)=I3R!CAB;wB%E!_q<;9MH`vB-(UPb)?inIy+8HBnr#1ZB@*Ut
ztX62k+<_Jkv+Z^d^X!WAWO2=j*LH`RFDY8uh<}#e%_j+L;Y&@Mx^}V^O!KG3QtSMz
zE)&gnqo&7wdweB1wj})|rf;h-=>fm@_AR^=7w!GYdS1U>#v(7_o2Di$E^0;Y>L{iz
zI!D(8_z)K-yg~-AqbA^Z<k{w@Dna-e1YYDg;`4AQZl#`H$0SBCleMGkSvVtZO<Dl)
a>L!OjPFJdip0fgf1mx-FeTeQFn)V;;vn+xD

literal 0
HcmV?d00001

diff --git a/android/Images.Icons/ResourceIcons/Circle.png b/android/Images.Icons/ResourceIcons/Circle.png
new file mode 100644
index 0000000000000000000000000000000000000000..3d919503e924b6f00bc3580841d00a5c08249cda
GIT binary patch
literal 1459
zcmZXUdo<K(7{`C((y1owL}J}pyT~P7SXoX?1}TP_h>^%GrE!~T%1L5e8%n86WzUpd
zsbLsthH=Sd><lJh9jjS05l1ub%4NnS`!=0AowJ{F-skx~?|Gj0dEWPrHwW$QuCn#V
ztq=sMczPW21HSt6+N=m{FE%m=I9QUOyDLQR)|G%jDca?z3j{H4z}Lc*LA)j2BQObq
z;M+ehSf4Ou4Qy%?+>R44aZ!YeVTqAYd{_*gV2zI?81A#)ZN0~K-Z174NZLRj!Mc6+
zUs;#4y1FWp$(H3T%2`-gn4O)So}QkPGdVf=C38iNR4N7e-%6I`ynXu?Q~~?t1d&Me
zQ4SD7p%6%5hlYked}aPS=Dq{;1qcL!H*$cU`5#~~fIM*)lmhY1f>S{U&<<EI4-nsO
z1jYpShGVSe!4qH!e%=@ex|(_|os^lCos&y0xO4a3{YNEF%AP(eub@{k7}eD^FKU=9
z7PGFlj$Pl-__DdBmDBzgm)Ft7@9FCw7<}`uKsYiwJ}!|=OoItP!^MTAy4OM<2vV%|
zJmi8U3Z{j5e(IhY%EQSAwpfIvm!(e9Y4F~%gq*G$Ql$S0g<K_#B+*8oCCw5uprj(9
zNRrECzYq6UIAWZf*25i;yi|vbA11uczINwpIpJ{6GN9;~o%$)mKHCf|NsvK8rGEUG
ztO^bTF}~7J)mWE`y`)q5Ye|ZUq08_Sa<w`dFB(Ub=<QcL3?B;f7Qp^g5=G_PDQ;C;
zvq>6&o9&Cgrz~#HP1~UvPEc09BfXiSt<kGT<hz~^leu2urRn`c^?S!~=P|CU6^*b<
z7@d8VZHcM+UNx}mnHz!6?6dKsK9+A{f{~*K)NAvzIrbEeMJ!61o->s8O6eknf3ixO
z`idmTE@K=i=3Xi9dtKWx=8sr*zOa#^N-!GipUbg+Xng9YLf+Z2y@CaM&2|gDKoqCs
z{W5|BJE2X@j+1cIb<eXg&kb5{&ghyvw)%~UqI$J-XCT@84szBKjPD&2oSNEZhhP(E
z>Dk7~mlYVE+{;D55sW?I59sGk`4zNxl2waw?o8g9NPJ)8rB&5@u?QEj;!4{)SE#@&
zFt5f^bPCa|xH$vUg#rouQFl>EcIK4~XSW7Y(8-%F_8*RQo_6D(FD>rftg#(yVuSYh
zyNT#ww9MzvU32xO4s=HJkb|ET-ltgkc0Q(5_;%{;P4+ggkJ9q()V4$)DKiczpz)54
zStRbL%MEs;%fpx0h;}veWR!XR<=YCZ#nO<VD1TZhg2uaT9ByWBidQomYZ{&{o_KjO
zrXay=89AtFKFT`dgvu#kxFc++EZxKLy_DfT=SJm1K^K;RgyDK{iB_ztb-e|qnmDfS
z;Dc^q#-~h^Hq8^s3L~$Q!o|IetA=a@HfAGO#}0uaOqfjR28jDj9o04wVhmcjh7pfw
zAExp~ie?(J*3n02hBewuSm%sB4h(WDiT$_2DEULFM`1dIQQKGxBJ!7zmQoUiy_+O*
zNl)ZDgdjN`1D@s0)=I3R!CAB;wB%E!_q<;9MH`vB-(UPb)?inIy+8HBnr#1ZB@*Ut
ztX62k+<_Jkv+Z^d^X!WAWO2=j*LH`RFDY8uh<}#e%_j+L;Y&@Mx^}V^O!KG3QtSMz
zE)&gnqo&7wdweB1wj})|rf;h-=>fm@_AR^=7w!GYdS1U>#v(7_o2Di$E^0;Y>L{iz
zI!D(8_z)K-yg~-AqbA^Z<k{w@Dna-e1YYDg;`4AQZl#`H$0SBCleMGkSvVtZO<Dl)
a>L!OjPFJdip0fgf1mx-FeTeQFn)V;;vn+xD

literal 0
HcmV?d00001

diff --git a/android/assets/Icons.atlas b/android/assets/Icons.atlas
index 1972f3245c..3934d07d58 100644
--- a/android/assets/Icons.atlas
+++ b/android/assets/Icons.atlas
@@ -627,6 +627,20 @@ OtherIcons/Circle
   orig: 178, 178
   offset: 0, 0
   index: -1
+ImprovementIcons/Circle
+  rotate: false
+  xy: 289, 1590
+  size: 178, 178
+  orig: 178, 178
+  offset: 0, 0
+  index: -1
+ResourceIcons/Circle
+  rotate: false
+  xy: 289, 1590
+  size: 178, 178
+  orig: 178, 178
+  offset: 0, 0
+  index: -1
 OtherIcons/Cities
   rotate: false
   xy: 208, 1436
diff --git a/core/src/com/unciv/ui/images/Portrait.kt b/core/src/com/unciv/ui/images/Portrait.kt
index 4f2e65e8ad..f6a6dfdefc 100644
--- a/core/src/com/unciv/ui/images/Portrait.kt
+++ b/core/src/com/unciv/ui/images/Portrait.kt
@@ -163,6 +163,8 @@ class PortraitResource(name: String, size: Float, amount: Int = 0) : Portrait(Ty
         }
     }
 
+    override fun getCircleImage() = ImageGetter.getImage("ResourceIcons/Circle")
+
     override fun getDefaultInnerBackgroundTint(): Color =
         ruleset.tileResources[imageName]?.resourceType?.getColor() ?: Color.WHITE
 
@@ -220,6 +222,8 @@ class PortraitImprovement(name: String, size: Float, dim: Boolean = false, isPil
             addActor(pillagedIcon)
         }
     }
+    
+    override fun getCircleImage() = ImageGetter.getImage("ImprovementIcons/Circle")
 
     private fun getColorFromStats(stats: Stats): Color {
         if (stats.asSequence().none { it.value > 0 })