AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-24 03:53:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Cache edge images for faster update()s on all tilegroups (e.g. unit click)

Browse Source
This commit is contained in:
yairm210 2024-12-22 21:40:06 +02:00
parent 4638301f0b
commit 2b0cc5cf90
2 changed files with 32 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/com/unciv/ui/components/tilegroups/TileSetStrings.kt
View File

@ -54,7 +54,7 @@ class TileSetStrings(
// These need to be by lazy since the orFallback expects a tileset, which it may not get. // These need to be by lazy since the orFallback expects a tileset, which it may not get.
val hexagon: String by lazy { orFallback { tileSetLocation + "Hexagon"} } val hexagon: String by lazy { orFallback { tileSetLocation + "Hexagon"} }
val hexagonList by lazy { listOf(hexagon) } val hexagonList = listOf(hexagon)
val crosshatchHexagon by lazy { orFallback { tileSetLocation + "CrosshatchHexagon" } } val crosshatchHexagon by lazy { orFallback { tileSetLocation + "CrosshatchHexagon" } }
val unexploredTile by lazy { orFallback { tileSetLocation + "UnexploredTile" } } val unexploredTile by lazy { orFallback { tileSetLocation + "UnexploredTile" } }
val crosshair by lazy { orFallback { getString(tileSetLocation, "Crosshair") } } val crosshair by lazy { orFallback { getString(tileSetLocation, "Crosshair") } }

42
core/src/com/unciv/ui/components/tilegroups/layers/TileLayerTerrain.kt
View File

@ -94,19 +94,33 @@ class TileLayerTerrain(tileGroup: TileGroup, size: Float) : TileLayer(tileGroup,
} }
} }
private class NeighborEdgeData(val neighbor: Tile, val direction: NeighborDirection?) {
var ourTerrains: Set<String> = emptySet()
var neighborTerrains: Set<String> = emptySet()
var edgeFiles: Sequence<String> = emptySequence()
}
private val neighborEdgeDataList: Sequence<NeighborEdgeData> = if (!tile.isTilemapInitialized()) emptySequence()
else tile.neighbors.map {
val direction = NeighborDirection.fromVector(it.position.cpy().sub(tile.position))
NeighborEdgeData(it, direction)
}.toList().asSequence()
private fun getEdgeTileLocations(): Sequence<String> { private fun getEdgeTileLocations(): Sequence<String> {
if (!tile.isTilemapInitialized()) // fake tile if (!tile.isTilemapInitialized()) // fake tile
return emptySequence() return emptySequence()
return tile.neighbors return neighborEdgeDataList
.flatMap { getMatchingEdges(tile, it) } .flatMap { getMatchingEdges(it) }
} }
private fun getMatchingEdges(originTile: Tile, neighborTile: Tile): Sequence<String>{ private fun getMatchingEdges(neighborEdgeData: NeighborEdgeData): Sequence<String>{
val vectorToNeighbor = neighborTile.position.cpy().sub(originTile.position) if (neighborEdgeData.ourTerrains == tile.cachedTerrainData.terrainNameSet
val direction = NeighborDirection.fromVector(vectorToNeighbor) && neighborEdgeData.neighborTerrains == neighborEdgeData.neighbor.cachedTerrainData.terrainNameSet)
?: return emptySequence() return neighborEdgeData.edgeFiles
val possibleEdgeImages = strings.edgeImagesByPosition[direction] ?: return emptySequence() if (neighborEdgeData.direction == null) return emptySequence()
val possibleEdgeImages = strings.edgeImagesByPosition[neighborEdgeData.direction] ?: return emptySequence()
// Required for performance - full matchesFilter is too expensive for something that needs to run every update() // Required for performance - full matchesFilter is too expensive for something that needs to run every update()
fun matchesFilterMinimal(originTile: Tile, filter: String): Boolean { fun matchesFilterMinimal(originTile: Tile, filter: String): Boolean {
@ -115,11 +129,17 @@ class TileLayerTerrain(tileGroup: TileGroup, size: Float) : TileLayer(tileGroup,
return false return false
} }
return possibleEdgeImages.asSequence().filter { val cachedSequence = possibleEdgeImages.filter {
if (!matchesFilterMinimal(originTile, it.originTileFilter)) return@filter false if (!matchesFilterMinimal(tile, it.originTileFilter)) return@filter false
if (!matchesFilterMinimal(neighborTile, it.destinationTileFilter)) return@filter false if (!matchesFilterMinimal(neighborEdgeData.neighbor, it.destinationTileFilter)) return@filter false
return@filter true return@filter true
}.map { it.fileName } }.map { it.fileName }.asSequence()
neighborEdgeData.ourTerrains = tile.cachedTerrainData.terrainNameSet
neighborEdgeData.neighborTerrains = neighborEdgeData.neighbor.cachedTerrainData.terrainNameSet
neighborEdgeData.edgeFiles = cachedSequence
return cachedSequence
} }
private fun updateTileImage(viewingCiv: Civilization?) { private fun updateTileImage(viewingCiv: Civilization?) {