kaze/orx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improve randomization of orx-gui

Browse Source
This commit is contained in:
Edwin Jakobs
2020-02-13 17:19:59 +01:00
parent 1d2d06daf0
commit b9fe0b695f
1 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
orx-gui/src/main/kotlin/Gui.kt
View File

@@ -468,7 +468,7 @@ class GUI : Extension {
} }
} }
fun randomize() { fun randomize(strength:Double = 0.05) {
for ((labeledObject, binding) in trackedObjects) { for ((labeledObject, binding) in trackedObjects) {
// -- only randomize visible parameters // -- only randomize visible parameters
for (parameter in binding.parameterControls.keys) { for (parameter in binding.parameterControls.keys) {
@@ -477,19 +477,31 @@ class GUI : Extension {
ParameterType.Double -> { ParameterType.Double -> {
val min = parameter.doubleRange!!.start val min = parameter.doubleRange!!.start
val max = parameter.doubleRange!!.endInclusive val max = parameter.doubleRange!!.endInclusive
(parameter.property as KMutableProperty1<Any, Double>).set(labeledObject.obj, Math.random() * (max - min) + min) val currentValue = (parameter.property as KMutableProperty1<Any, Double>).get(labeledObject.obj)
val randomValue = Math.random() * (max - min) + min
val newValue = (1.0 - strength) * currentValue + randomValue * strength
(parameter.property as KMutableProperty1<Any, Double>).set(labeledObject.obj, newValue)
} }
ParameterType.Int -> { ParameterType.Int -> {
val min = parameter.intRange!!.first val min = parameter.intRange!!.first
val max = parameter.intRange!!.last val max = parameter.intRange!!.last
(parameter.property as KMutableProperty1<Any, Int>).set(labeledObject.obj, (Math.random() * (max - min) + min).toInt()) val currentValue = (parameter.property as KMutableProperty1<Any, Int>).get(labeledObject.obj)
val randomValue = Math.random() * (max - min) + min
val newValue = ((1.0 - strength) * currentValue + randomValue * strength).toInt()
(parameter.property as KMutableProperty1<Any, Int>).set(labeledObject.obj, newValue)
} }
ParameterType.Boolean -> { ParameterType.Boolean -> {
(parameter.property as KMutableProperty1<Any, Boolean>).set(labeledObject.obj, (Math.random() < 0.5)) //I am not sure about randomizing boolean values here
//(parameter.property as KMutableProperty1<Any, Boolean>).set(labeledObject.obj, (Math.random() < 0.5))
} }
ParameterType.Color -> { ParameterType.Color -> {
val c = ColorRGBa(Math.random(), Math.random(), Math.random()) val currentValue = (parameter.property as KMutableProperty1<Any, ColorRGBa>).get(labeledObject.obj)
(parameter.property as KMutableProperty1<Any, ColorRGBa>).set(labeledObject.obj, c) val randomValue = ColorRGBa(Math.random(), Math.random(), Math.random(), currentValue.a)
val newValue = ColorRGBa((1.0 - strength) * currentValue.r + randomValue.r * strength,
(1.0 - strength) * currentValue.g + randomValue.g * strength,
(1.0 - strength) * currentValue.b + randomValue.b * strength)
(parameter.property as KMutableProperty1<Any, ColorRGBa>).set(labeledObject.obj, newValue)
} }
else -> { else -> {
// intentionally do nothing // intentionally do nothing