AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-28 06:16:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

More texture switch savings in the CityButton

Browse Source
This commit is contained in:
Yair Morgenstern 2020-11-23 23:21:51 +02:00
parent 7b0bb55045
commit 9dd7b2abf3
1 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
core/src/com/unciv/ui/tilegroups/CityButton.kt
View File

@ -228,8 +228,16 @@ class CityButton(val city: CityInfo, private val tileGroup: WorldTileGroup): Tab
label.toBack() // this is so the label is rendered right before the population group, label.toBack() // this is so the label is rendered right before the population group,
// so we save the font texture and avoid another texture switch // so we save the font texture and avoid another texture switch
if (uncivGame.viewEntireMapForDebug || belongsToViewingCiv() || worldScreen.viewingCiv.isSpectator()) if (uncivGame.viewEntireMapForDebug || belongsToViewingCiv() || worldScreen.viewingCiv.isSpectator()) {
iconTable.add(getConstructionGroup(city.cityConstructions)) val constructionGroup = getConstructionGroup(city.cityConstructions)
iconTable.add(constructionGroup)
constructionGroup.toBack() // We do this so the construction group is right before the label.
// What we end up with is construction group > label > population group.
// Since the label in the construction group is rendered *last* (toFront()),
// and the two labels in the the population group are rendered *first* (toBack()),
// What we get is that ALL 4 LABELS are rendered one after the other,
// and so the glyph texture only needs to be swapped in once rather than 4 times! :)
}
else if (city.civInfo.isMajorCiv()) { else if (city.civInfo.isMajorCiv()) {
val nationIcon = ImageGetter.getNationIcon(city.civInfo.nation.name) val nationIcon = ImageGetter.getNationIcon(city.civInfo.nation.name)
nationIcon.color = secondaryColor nationIcon.color = secondaryColor
@ -339,17 +347,17 @@ class CityButton(val city: CityInfo, private val tileGroup: WorldTileGroup): Tab
val circle = ImageGetter.getCircle() val circle = ImageGetter.getCircle()
circle.setSize(25f, 25f) circle.setSize(25f, 25f)
val image = ImageGetter.getConstructionImage(cityConstructions.currentConstructionFromQueue) val constructionImage = ImageGetter.getConstructionImage(cityConstructions.currentConstructionFromQueue)
image.setSize(18f, 18f) constructionImage.setSize(18f, 18f)
image.centerY(group) constructionImage.centerY(group)
image.x = group.width - image.width constructionImage.x = group.width - constructionImage.width
// center the circle on the production image // center the circle on the production image
circle.x = image.x + (image.width - circle.width) / 2 circle.x = constructionImage.x + (constructionImage.width - circle.width) / 2
circle.y = image.y + (image.height - circle.height) / 2 circle.y = constructionImage.y + (constructionImage.height - circle.height) / 2
group.addActor(circle) group.addActor(circle)
group.addActor(image) group.addActor(constructionImage)
val secondaryColor = cityConstructions.cityInfo.civInfo.nation.getInnerColor() val secondaryColor = cityConstructions.cityInfo.civInfo.nation.getInnerColor()
if (cityCurrentConstruction !is PerpetualConstruction) { if (cityCurrentConstruction !is PerpetualConstruction) {
@ -365,6 +373,12 @@ class CityButton(val city: CityInfo, private val tileGroup: WorldTileGroup): Tab
productionBar.x = 10f productionBar.x = 10f
label.x = productionBar.x - label.width - 3 label.x = productionBar.x - label.width - 3
group.addActor(productionBar) group.addActor(productionBar)
productionBar.toBack() // Since the production bar is based on whiteDot.png in the MAIN texture,
// and the constructionImage may be a building or unit which have their own textures,
// we move the production bar's rendering to be next to the circle's rendering,
// so we have circle - bar - constructionImage - label (2 texture switches and ending with label)
// which is the minimal amount of switches we can have here
label.toFront()
} }
return group return group
} }