Mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-02-20 19:56:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

perf: Remove memory allocations when get/setting individual stats

Browse Source
This commit is contained in:
yairm210 2025-01-01 14:17:57 +02:00
parent 5f235d818f
commit 1683c484e6
2 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
core/src/com/unciv/models/stats/Stats.kt
View File

@ -1,7 +1,6 @@
package com.unciv.models.stats
import com.unciv.models.translations.tr
import kotlin.reflect.KMutableProperty0
/**
* A container for the seven basic ["currencies"][Stat] in Unciv,
@ -21,26 +20,30 @@ open class Stats(
var faith: Float = 0f
): Iterable<Stats.StatValuePair> {
// This is what facilitates indexed access by [Stat] or add(Stat,Float)
// without additional memory allocation or expensive conditionals
private fun statToProperty(stat: Stat): KMutableProperty0<Float> {
return when(stat) {
Stat.Production -> ::production
Stat.Food -> ::food
Stat.Gold -> ::gold
Stat.Science -> ::science
Stat.Culture -> ::culture
Stat.Happiness -> ::happiness
Stat.Faith -> ::faith
}
}
/** Indexed read of a value for a given [Stat], e.g. `this.gold == this[Stat.Gold]` */
operator fun get(stat: Stat): Float {
return statToProperty(stat).get()
return when(stat) {
Stat.Production -> production
Stat.Food -> food
Stat.Gold -> gold
Stat.Science -> science
Stat.Culture -> culture
Stat.Happiness -> happiness
Stat.Faith -> faith
}
}
/** Indexed write of a value for a given [Stat], e.g. `this.gold += 1f` is equivalent to `this[Stat.Gold] += 1f` */
operator fun set(stat: Stat, value: Float) = statToProperty(stat).set(value)
operator fun set(stat: Stat, value: Float) {
when(stat) {
Stat.Production -> production = value
Stat.Food -> food = value
Stat.Gold -> gold = value
Stat.Science -> science = value
Stat.Culture -> culture = value
Stat.Happiness -> happiness = value
Stat.Faith -> faith = value
}
}
/** Compares two instances. Not callable via `==`. */
// This is an overload, not an override conforming to the kotlin conventions of `equals(Any?)`,
@ -227,7 +230,7 @@ open class Stats(
companion object {
private val allStatNames = Stat.values().joinToString("|") { it.name }
private val allStatNames = Stat.entries.joinToString("|") { it.name }
private val statRegexPattern = "([+-])(\\d+) ($allStatNames)"
private val statRegex = Regex(statRegexPattern)
private val entireStringRegexPattern = Regex("$statRegexPattern(, $statRegexPattern)*")

3
core/src/com/unciv/ui/components/extensions/Scene2dExtensions.kt
View File

@ -305,7 +305,8 @@ fun String.toLabel(fontColor: Color = Color.WHITE,
labelStyle.fontColor = fontColor
if (fontSize != Constants.defaultFontSize) labelStyle.font = Fonts.font
}
return Label(this.tr(hideIcons), labelStyle).apply {
val translatedText = this.tr(hideIcons)
return Label(translatedText, labelStyle).apply {
setFontScale(fontSize / Fonts.ORIGINAL_FONT_SIZE)
setAlignment(alignment)
}