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

Fix Map Editor Lag (#1670)

Browse Source 
In painting mode, only the last drawn tiles are updated.
This commit is contained in:
Federico Luongo 2020-01-12 22:29:26 +01:00 committed by Yair Morgenstern
parent aad18f29c8
commit 5e003cfd64
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
core/src/com/unciv/ui/mapeditor/MapEditorScreen.kt
View File

@ -7,6 +7,7 @@ import com.badlogic.gdx.scenes.scene2d.InputListener
import com.badlogic.gdx.scenes.scene2d.actions.Actions import com.badlogic.gdx.scenes.scene2d.actions.Actions
import com.badlogic.gdx.scenes.scene2d.ui.TextButton import com.badlogic.gdx.scenes.scene2d.ui.TextButton
import com.unciv.logic.MapSaver import com.unciv.logic.MapSaver
import com.unciv.logic.map.TileInfo
import com.unciv.logic.map.TileMap import com.unciv.logic.map.TileMap
import com.unciv.models.ruleset.RulesetCache import com.unciv.models.ruleset.RulesetCache
import com.unciv.models.translations.tr import com.unciv.models.translations.tr
@ -90,6 +91,7 @@ class MapEditorScreen(): CameraStageBaseScreen() {
var isDragging = false var isDragging = false
var isPainting = false var isPainting = false
var touchDownTime = System.currentTimeMillis() var touchDownTime = System.currentTimeMillis()
var lastDrawnTiles = HashSet<TileInfo>()
override fun touchDown(event: InputEvent?, x: Float, y: Float, pointer: Int, button: Int): Boolean { override fun touchDown(event: InputEvent?, x: Float, y: Float, pointer: Int, button: Int): Boolean {
touchDownTime = System.currentTimeMillis() touchDownTime = System.currentTimeMillis()
@ -107,8 +109,10 @@ class MapEditorScreen(): CameraStageBaseScreen() {
} }
if (isPainting) { if (isPainting) {
mapHolder.updateTileGroups()
mapHolder.setTransients() for (tileInfo in lastDrawnTiles)
mapHolder.tileGroups[tileInfo]!!.hideCircle()
lastDrawnTiles.clear()
val stageCoords = mapHolder.actor.stageToLocalCoordinates(Vector2(event!!.stageX, event.stageY)) val stageCoords = mapHolder.actor.stageToLocalCoordinates(Vector2(event!!.stageX, event.stageY))
val centerTileInfo = mapHolder.getClosestTileTo(stageCoords) val centerTileInfo = mapHolder.getClosestTileTo(stageCoords)
@ -122,13 +126,15 @@ class MapEditorScreen(): CameraStageBaseScreen() {
tileInfo.setTransients() tileInfo.setTransients()
mapHolder.tileGroups[tileInfo]!!.update() mapHolder.tileGroups[tileInfo]!!.update()
mapHolder.tileGroups[tileInfo]!!.showCircle(Color.WHITE) mapHolder.tileGroups[tileInfo]!!.showCircle(Color.WHITE)
lastDrawnTiles.add(tileInfo)
} }
} }
} }
} }
override fun touchUp(event: InputEvent?, x: Float, y: Float, pointer: Int, button: Int) { override fun touchUp(event: InputEvent?, x: Float, y: Float, pointer: Int, button: Int) {
// Reset tile overlays // Reset the whole map
if (isPainting) { if (isPainting) {
mapHolder.updateTileGroups() mapHolder.updateTileGroups()
mapHolder.setTransients() mapHolder.setTransients()