mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-13 01:08:25 +07:00
Code Issues Packages Projects Releases Wiki Activity

Don't call canReach on the main thread when selecting a tile to move to (#2575)

Browse Source
This commit is contained in:
Väinö Mäkelä
2020-05-04 17:01:53 +03:00
committed by GitHub
parent 12c5b08b64
commit 0ffb038129
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/src/com/unciv/ui/worldscreen/WorldMapHolder.kt
View File

@ -71,7 +71,7 @@ class WorldMapHolder(internal val worldScreen: WorldScreen, internal val tileMap
if (previousSelectedUnit != null && previousSelectedUnit.getTile() != tileInfo if (previousSelectedUnit != null && previousSelectedUnit.getTile() != tileInfo
&& worldScreen.isPlayersTurn && worldScreen.isPlayersTurn
&& previousSelectedUnit.movement.canMoveTo(tileInfo) && previousSelectedUnit.movement.canReach(tileInfo)) { && previousSelectedUnit.movement.canMoveTo(tileInfo)) {
// this can take a long time, because of the unit-to-tile calculation needed, so we put it in a different thread // this can take a long time, because of the unit-to-tile calculation needed, so we put it in a different thread
addTileOverlaysWithUnitMovement(previousSelectedUnit, tileInfo) addTileOverlaysWithUnitMovement(previousSelectedUnit, tileInfo)
} }
@ -93,6 +93,9 @@ class WorldMapHolder(internal val worldScreen: WorldScreen, internal val tileMap
} }
private fun addTileOverlaysWithUnitMovement(selectedUnit: MapUnit, tileInfo: TileInfo) { private fun addTileOverlaysWithUnitMovement(selectedUnit: MapUnit, tileInfo: TileInfo) {
// some code is copied from canReach not to call getShortestPath on the main thread before calling it on this thread
if (selectedUnit.type.isAirUnit() && selectedUnit.currentTile.aerialDistanceTo(tileInfo) > selectedUnit.getRange()*2)
return
thread(name="TurnsToGetThere") { thread(name="TurnsToGetThere") {
/** LibGdx sometimes has these weird errors when you try to edit the UI layout from 2 separate threads. /** LibGdx sometimes has these weird errors when you try to edit the UI layout from 2 separate threads.
* And so, all UI editing will be done on the main thread. * And so, all UI editing will be done on the main thread.
@ -101,6 +104,8 @@ class WorldMapHolder(internal val worldScreen: WorldScreen, internal val tileMap
*/ */
val turnsToGetThere = if(selectedUnit.type.isAirUnit()) 1 val turnsToGetThere = if(selectedUnit.type.isAirUnit()) 1
else selectedUnit.movement.getShortestPath(tileInfo).size // this is what takes the most time, tbh else selectedUnit.movement.getShortestPath(tileInfo).size // this is what takes the most time, tbh
if (turnsToGetThere == 0) // there is no path to tileInfo
return@thread
Gdx.app.postRunnable { Gdx.app.postRunnable {
if(UncivGame.Current.settings.singleTapMove && turnsToGetThere==1) { if(UncivGame.Current.settings.singleTapMove && turnsToGetThere==1) {