mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-17 03:09:27 +07:00
Code Issues Packages Projects Releases Wiki Activity

perf(memory): When creating world screen, resize only once initially instead of allocating and copying many times

Browse Source
This commit is contained in:
yairm210
2024-11-05 08:37:16 +02:00
parent 71c383bc6a
commit 9ccce38fcc
1 changed files with 20 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
core/src/com/unciv/ui/components/tilegroups/TileGroupMap.kt
View File

@ -7,14 +7,7 @@ import com.badlogic.gdx.scenes.scene2d.Actor
import com.badlogic.gdx.scenes.scene2d.Group import com.badlogic.gdx.scenes.scene2d.Group
import com.unciv.logic.map.HexMath import com.unciv.logic.map.HexMath
import com.unciv.logic.map.TileMap import com.unciv.logic.map.TileMap
import com.unciv.ui.components.tilegroups.layers.TileLayerBorders import com.unciv.ui.components.tilegroups.layers.*
import com.unciv.ui.components.tilegroups.layers.TileLayerCityButton
import com.unciv.ui.components.tilegroups.layers.TileLayerFeatures
import com.unciv.ui.components.tilegroups.layers.TileLayerMisc
import com.unciv.ui.components.tilegroups.layers.TileLayerOverlay
import com.unciv.ui.components.tilegroups.layers.TileLayerTerrain
import com.unciv.ui.components.tilegroups.layers.TileLayerUnitSprite
import com.unciv.ui.components.tilegroups.layers.TileLayerUnitFlag
import com.unciv.ui.components.widgets.ZoomableScrollPane import com.unciv.ui.components.widgets.ZoomableScrollPane
import kotlin.math.max import kotlin.math.max
import kotlin.math.min import kotlin.math.min
@ -32,6 +25,7 @@ class TileGroupMap<T: TileGroup>(
val worldWrap: Boolean = false, val worldWrap: Boolean = false,
tileGroupsToUnwrap: Set<T>? = null tileGroupsToUnwrap: Set<T>? = null
): Group() { ): Group() {
companion object { companion object {
/** Vertical size of a hex in world coordinates, or the distance between the centers of any two opposing edges /** Vertical size of a hex in world coordinates, or the distance between the centers of any two opposing edges
* (the hex is oriented so it has corners to the left and right of the center and its upper and lower bounds are horizontal edges) */ * (the hex is oriented so it has corners to the left and right of the center and its upper and lower bounds are horizontal edges) */
@ -129,15 +123,24 @@ class TileGroupMap<T: TileGroup>(
cityButtonLayers.add(group.layerCityButton.apply { setPosition(group.x, group.y) }) cityButtonLayers.add(group.layerCityButton.apply { setPosition(group.x, group.y) })
} }
for (group in baseLayers) addActor(group) val layerLists = listOf(
for (group in featureLayers) addActor(group) baseLayers,
for (group in borderLayers) addActor(group) featureLayers,
for (group in miscLayers) addActor(group) borderLayers,
for (group in pixelUnitLayers) addActor(group) miscLayers,
for (group in circleFogCrosshairLayers) addActor(group) pixelUnitLayers,
for (group in tileGroups) addActor(group) // The above layers are for the visual layers, this is for the clickability of the tile circleFogCrosshairLayers,
for (group in unitLayers) addActor(group) // Aaand units above everything else. tileGroups, // The above layers are for the visual layers, this is for the clickability of the tile
for (group in cityButtonLayers) addActor(group) // city buttons + clickability unitLayers, // Aaand units above everything else.
cityButtonLayers
)
// Resize the children list ONCE instead of multiple times with item copying between them
children.ensureCapacity(layerLists.sumOf { it.count() })
for (layer in layerLists)
for (group in layer)
addActor(group)
// there are tiles "below the zero", // there are tiles "below the zero",
// so we zero out the starting position of the whole board so they will be displayed as well // so we zero out the starting position of the whole board so they will be displayed as well