mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2024-12-22 23:14:25 +07:00
Code Issues Packages Projects Releases Wiki Activity

perf(mem): Only create terrainOverlay images when needed

Browse Source
This commit is contained in:
yairm210 2024-12-05 20:37:59 +02:00
parent c267096f6b
commit 2dfeb4a142
1 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
core/src/com/unciv/ui/components/tilegroups/layers/TileLayerMisc.kt
View File

@ -50,12 +50,7 @@ private class MapArrow(val targetTile: Tile, val arrowType: MapArrowType, val st
class TileLayerMisc(tileGroup: TileGroup, size: Float) : TileLayer(tileGroup, size) {
// For different unit views, we want to effectively "ignore" the terrain and color it by special view
private val terrainOverlay = ImageGetter.getImage(strings().hexagon).setHexagonSize()
init {
terrainOverlay.isVisible = false
addActor(terrainOverlay)
}
private var terrainOverlay: Image? = ImageGetter.getImage(strings().hexagon).setHexagonSize()
override fun act(delta: Float) {}
override fun hit(x: Float, y: Float, touchable: Boolean): Actor? {
@ -337,21 +332,23 @@ class TileLayerMisc(tileGroup: TileGroup, size: Float) : TileLayer(tileGroup, si
}
/** Activates a colored semitransparent overlay. [color] is cloned, brightened by 0.3f and an alpha of 0.4f applied. */
fun overlayTerrain(color: Color) {
terrainOverlay.color = color.brighten(0.3f).apply { a = 0.4f }
terrainOverlay.isVisible = true
determineVisibility()
}
fun overlayTerrain(color: Color) = overlayTerrainInner(color.brighten(0.3f).apply { a = 0.4f })
/** Activates a colored semitransparent overlay. [color] is cloned and [alpha] applied. No brightening unlike the overload without explicit alpha! */
fun overlayTerrain(color: Color, alpha: Float) {
terrainOverlay.color = color.cpy().apply { a = alpha }
terrainOverlay.isVisible = true
fun overlayTerrain(color: Color, alpha: Float) = overlayTerrainInner(color.cpy().apply { a = alpha })
private fun overlayTerrainInner(color: Color) {
if (terrainOverlay == null){
terrainOverlay = ImageGetter.getImage(strings().hexagon).setHexagonSize()
addActor(terrainOverlay)
}
terrainOverlay?.color = color
determineVisibility()
}
fun hideTerrainOverlay() {
terrainOverlay.isVisible = false
terrainOverlay?.remove()
terrainOverlay = null
determineVisibility()
}
@ -401,7 +398,7 @@ class TileLayerMisc(tileGroup: TileGroup, size: Float) : TileLayer(tileGroup, si
|| hexOutlineIcon != null
|| arrows.isNotEmpty()
|| startingLocationIcons.isNotEmpty()
|| terrainOverlay.isVisible
|| terrainOverlay != null
}
fun reset(localUniqueCache: LocalUniqueCache) {