curioustorvald/Terrarum
1
0
Fork 0
mirror of https://github.com/curioustorvald/Terrarum.git synced 2026-06-10 02:24:05 +09:00
Code Issues Packages Projects Releases Wiki Activity

spinners will now round to nearest valid number

Browse Source
This commit is contained in:
minjaesong
2023-07-13 21:08:41 +09:00
parent da6da79186
commit e7ed3d8eae
1 changed files with 25 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/net/torvald/terrarum/ui/UIItemSpinner.kt
View File

@@ -6,6 +6,7 @@ import net.torvald.terrarum.App
import net.torvald.terrarum.CommonResourcePool import net.torvald.terrarum.CommonResourcePool
import net.torvald.terrarum.Terrarum import net.torvald.terrarum.Terrarum
import net.torvald.terrarum.ceilToInt import net.torvald.terrarum.ceilToInt
import kotlin.math.absoluteValue
/** /**
* Internal properties, namely initialValue, min, max, step; have the type of [Double] regardless of their input type. * Internal properties, namely initialValue, min, max, step; have the type of [Double] regardless of their input type.
@@ -16,7 +17,7 @@ import net.torvald.terrarum.ceilToInt
class UIItemSpinner( class UIItemSpinner(
parentUI: UICanvas, parentUI: UICanvas,
initialX: Int, initialY: Int, initialX: Int, initialY: Int,
initialValue: Number, private var initialValue: Number,
val min: Number, val min: Number,
val max: Number, val max: Number,
val step: Number, val step: Number,
@@ -25,6 +26,29 @@ class UIItemSpinner(
private val numberToTextFunction: (Number) -> String = { "$it" } private val numberToTextFunction: (Number) -> String = { "$it" }
) : UIItem(parentUI, initialX, initialY) { ) : UIItem(parentUI, initialX, initialY) {
// to alleviate floating point errors adding up as the spinner is being used
private val values = DoubleArray(1 + ((max.toDouble() - min.toDouble()).div(step.toDouble())).ceilToInt()) {
// printdbg(this, "$min..$max step $step; index [$it] = ${min.toDouble() + (step.toDouble() * it)}")
min.toDouble() + (step.toDouble() * it)
}
init {
// println("valueType=${valueType.canonicalName} for UI ${parentUI.javaClass.canonicalName}")
// if the initial value cannot be derived from the settings, round to nearest
if (values.indexOfFirst { it == initialValue.toDouble() } < 0) {
// throw IllegalArgumentException("Initial value $initialValue cannot be derived from given ($min..$max step $step) settings")
val mind = min.toDouble()
val maxd = max.toDouble()
val stepd = step.toDouble()
val id = initialValue.toDouble()
initialValue = (0..(maxd - mind).div(stepd).ceilToInt()).map {
it to ((mind + stepd * it) - id).absoluteValue
}.minBy { it.second }.first * stepd + mind
}
}
private val valueType = initialValue.javaClass // should be java.lang.Double or java.lang.Integer private val valueType = initialValue.javaClass // should be java.lang.Double or java.lang.Integer
private val labels = CommonResourcePool.getAsTextureRegionPack("inventory_category") private val labels = CommonResourcePool.getAsTextureRegionPack("inventory_category")
@@ -42,20 +66,8 @@ class UIItemSpinner(
private var mouseOnButton = 0 // 0: nothing, 1: left, 2: right private var mouseOnButton = 0 // 0: nothing, 1: left, 2: right
var selectionChangeListener: (Number) -> Unit = {} var selectionChangeListener: (Number) -> Unit = {}
// to alleviate floating point errors adding up as the spinner is being used
private val values = DoubleArray(1 + ((max.toDouble() - min.toDouble()).div(step.toDouble())).ceilToInt()) {
// printdbg(this, "$min..$max step $step; index [$it] = ${min.toDouble() + (step.toDouble() * it)}")
min.toDouble() + (step.toDouble() * it)
}
private var currentIndex = values.indexOfFirst { it == initialValue.toDouble() } private var currentIndex = values.indexOfFirst { it == initialValue.toDouble() }
init {
// println("valueType=${valueType.canonicalName} for UI ${parentUI.javaClass.canonicalName}")
if (currentIndex < 0)
throw IllegalArgumentException("Initial value $initialValue cannot be derived from given ($min..$max step $step) settings")
}
private fun changeValueBy(diff: Int) { private fun changeValueBy(diff: Int) {
currentIndex = (currentIndex + diff).coerceIn(values.indices) currentIndex = (currentIndex + diff).coerceIn(values.indices)