AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-22 10:54:19 -04:00
Code Issues Packages Projects Releases Wiki Activity

perf(cpu): Optimized tile-to-tile cost cache

Browse Source
This commit is contained in:
yairm210 2025-09-02 18:12:07 +03:00
parent 011630469a
commit 8f995fb290
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
core/src/com/unciv/logic/map/mapunit/movement/UnitMovement.kt
View File

@ -26,6 +26,12 @@ class UnitMovement(val unit: MapUnit) {
@Readonly fun isUnknownTileWeShouldAssumeToBePassable(tile: Tile) = !unit.civ.hasExplored(tile) @Readonly fun isUnknownTileWeShouldAssumeToBePassable(tile: Tile) = !unit.civ.hasExplored(tile)
// TODO: Convertable to array since min is 1 and no collisions, theoretically fills 1..(num_tiles * 6 + 1)
private fun tilesToUniqueHash(tile: Tile, neighbor: Tile): Int {
// each tile has 6 neighbors
return tile.zeroBasedIndex * 6 +
tile.tileMap.getNeighborTileClockPosition(tile, neighbor) / 2 // min: 2, max: 12, step 2
}
/** /**
* Gets the tiles the unit could move to at [position] with [unitMovement]. * Gets the tiles the unit could move to at [position] with [unitMovement].
@ -39,7 +45,7 @@ class UnitMovement(val unit: MapUnit) {
considerZoneOfControl: Boolean = true, considerZoneOfControl: Boolean = true,
tilesToIgnoreBitset: BitSet? = null, tilesToIgnoreBitset: BitSet? = null,
canPassThroughCache: ArrayList<Boolean?> = ArrayList(), canPassThroughCache: ArrayList<Boolean?> = ArrayList(),
movementCostCache: HashMap<Pair<Tile, Tile>, Float> = HashMap(), movementCostCache: HashMap<Int, Float> = HashMap(),
includeOtherEscortUnit: Boolean = true includeOtherEscortUnit: Boolean = true
): PathsToTilesWithinTurn { ): PathsToTilesWithinTurn {
@LocalState val distanceToTiles = PathsToTilesWithinTurn() @LocalState val distanceToTiles = PathsToTilesWithinTurn()
@ -74,7 +80,7 @@ class UnitMovement(val unit: MapUnit) {
// You need to assume his tile is reachable, otherwise all movement algorithms on reaching enemy // You need to assume his tile is reachable, otherwise all movement algorithms on reaching enemy
// cities and units goes kaput. // cities and units goes kaput.
else -> { else -> {
val key = Pair(tileToCheck, neighbor) val key = tilesToUniqueHash(tileToCheck, neighbor)
val movementCost = movementCostCache.getOrPut(key) { val movementCost = movementCostCache.getOrPut(key) {
MovementCost.getMovementCostBetweenAdjacentTilesEscort(unit, tileToCheck, neighbor, considerZoneOfControl, includeOtherEscortUnit) MovementCost.getMovementCostBetweenAdjacentTilesEscort(unit, tileToCheck, neighbor, considerZoneOfControl, includeOtherEscortUnit)
} }
@ -148,7 +154,7 @@ class UnitMovement(val unit: MapUnit) {
val civilization = unit.civ val civilization = unit.civ
val passThroughCacheNew = ArrayList<Boolean?>() val passThroughCacheNew = ArrayList<Boolean?>()
val movementCostCache = HashMap<Pair<Tile, Tile>, Float>() val movementCostCache = HashMap<Int, Float>()
val canMoveToCache = HashMap<Tile, Boolean>() val canMoveToCache = HashMap<Tile, Boolean>()
while (true) { while (true) {
@ -740,7 +746,7 @@ class UnitMovement(val unit: MapUnit) {
fun getDistanceToTiles( fun getDistanceToTiles(
considerZoneOfControl: Boolean = true, considerZoneOfControl: Boolean = true,
passThroughCacheNew: ArrayList<Boolean?> = ArrayList(), passThroughCacheNew: ArrayList<Boolean?> = ArrayList(),
movementCostCache: HashMap<Pair<Tile, Tile>, Float> = HashMap(), movementCostCache: HashMap<Int, Float> = HashMap(),
includeOtherEscortUnit: Boolean = true includeOtherEscortUnit: Boolean = true
): PathsToTilesWithinTurn { ): PathsToTilesWithinTurn {
val distanceToTiles = getMovementToTilesAtPosition( val distanceToTiles = getMovementToTilesAtPosition(