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

[orx-noise, orx-gui] Deprecate Random

Browse Source
This commit is contained in:
Edwin Jakobs
2025-01-20 11:37:52 +01:00
parent b631e4493c
commit b62746c94e
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8,7 +8,6 @@ import org.openrndr.*
import org.openrndr.color.ColorRGBa import org.openrndr.color.ColorRGBa
import org.openrndr.dialogs.* import org.openrndr.dialogs.*
import org.openrndr.draw.Drawer import org.openrndr.draw.Drawer
import org.openrndr.extra.noise.Random
import org.openrndr.extra.noise.random import org.openrndr.extra.noise.random
import org.openrndr.extra.noise.uniform import org.openrndr.extra.noise.uniform
import org.openrndr.extra.parameters.* import org.openrndr.extra.parameters.*
@@ -1101,7 +1100,7 @@ open class GUI(
val currentValue = val currentValue =
(parameter.property as KMutableProperty1<Any, ColorRGBa>).get(labeledObject.obj) (parameter.property as KMutableProperty1<Any, ColorRGBa>).get(labeledObject.obj)
val randomValue = val randomValue =
ColorRGBa.fromVector(Random.vector3(0.0, 1.0), currentValue.alpha, currentValue.linearity) ColorRGBa.fromVector(Vector3.uniform(0.0, 1.0), currentValue.alpha, currentValue.linearity)
val newValue = currentValue.mix(randomValue, strength) val newValue = currentValue.mix(randomValue, strength)
(parameter.property as KMutableProperty1<Any, ColorRGBa>).set(labeledObject.obj, newValue) (parameter.property as KMutableProperty1<Any, ColorRGBa>).set(labeledObject.obj, newValue)
} }
@@ -1111,7 +1110,7 @@ open class GUI(
val max = parameter.doubleRange!!.endInclusive val max = parameter.doubleRange!!.endInclusive
val currentValue = val currentValue =
(parameter.property as KMutableProperty1<Any, Vector2>).get(labeledObject.obj) (parameter.property as KMutableProperty1<Any, Vector2>).get(labeledObject.obj)
val randomValue = Random.vector2(min, max) val randomValue = Vector2.uniform(min, max)
val newValue = currentValue.mix(randomValue, strength) val newValue = currentValue.mix(randomValue, strength)
(parameter.property as KMutableProperty1<Any, Vector2>).set(labeledObject.obj, newValue) (parameter.property as KMutableProperty1<Any, Vector2>).set(labeledObject.obj, newValue)
} }
@@ -1131,7 +1130,7 @@ open class GUI(
val max = parameter.doubleRange!!.endInclusive val max = parameter.doubleRange!!.endInclusive
val currentValue = val currentValue =
(parameter.property as KMutableProperty1<Any, Vector3>).get(labeledObject.obj) (parameter.property as KMutableProperty1<Any, Vector3>).get(labeledObject.obj)
val randomValue = Random.vector3(min, max) val randomValue = Vector3.uniform(min, max)
val newValue = currentValue.mix(randomValue, strength) val newValue = currentValue.mix(randomValue, strength)
(parameter.property as KMutableProperty1<Any, Vector3>).set(labeledObject.obj, newValue) (parameter.property as KMutableProperty1<Any, Vector3>).set(labeledObject.obj, newValue)
} }
@@ -1141,7 +1140,7 @@ open class GUI(
val max = parameter.doubleRange!!.endInclusive val max = parameter.doubleRange!!.endInclusive
val currentValue = val currentValue =
(parameter.property as KMutableProperty1<Any, Vector4>).get(labeledObject.obj) (parameter.property as KMutableProperty1<Any, Vector4>).get(labeledObject.obj)
val randomValue = Random.vector4(min, max) val randomValue = Vector4.uniform(min, max)
val newValue = currentValue.mix(randomValue, strength) val newValue = currentValue.mix(randomValue, strength)
(parameter.property as KMutableProperty1<Any, Vector4>).set(labeledObject.obj, newValue) (parameter.property as KMutableProperty1<Any, Vector4>).set(labeledObject.obj, newValue)
} }

1
orx-noise/src/commonMain/kotlin/Random.kt
View File

@@ -13,6 +13,7 @@ private data class RandomState(var seed: String, var rng: DefaultRandom)
/** /**
* Deterministic Random using a seed to guarantee the same random values between iterations * Deterministic Random using a seed to guarantee the same random values between iterations
*/ */
@Deprecated("Duplicate functionality")
object Random { object Random {
var rnd: DefaultRandom var rnd: DefaultRandom