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

Add option to pass in Random object to uniform random generators

Browse Source
This commit is contained in:
Edwin Jakobs
2019-02-04 22:55:17 +01:00
parent 1b9167137a
commit a7c376af1d
1 changed files with 59 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

87
orx-noise/src/main/kotlin/UniformRandom.kt
View File

@@ -3,22 +3,24 @@ package org.openrndr.extra.noise
import org.openrndr.math.Vector2 import org.openrndr.math.Vector2
import org.openrndr.math.Vector3 import org.openrndr.math.Vector3
import org.openrndr.math.Vector4 import org.openrndr.math.Vector4
import kotlin.random.Random
fun Double.Companion.uniform(min: Double = -1.0, max: Double = 1.0, random: Random = Random.Default): Double {
fun Double.Companion.uniform(min: Double = -1.0, max: Double = 1.0): Double { return (random.nextDouble() * (max - min)) + min
return (Math.random() * (max - min)) + min
} }
fun Vector2.Companion.uniform(min: Vector2 = -ONE, max: Vector2 = ONE): Vector2 { fun Vector2.Companion.uniform(min: Vector2 = -ONE, max: Vector2 = ONE, random: Random = Random.Default): Vector2 {
return Vector2(Double.uniform(min.x, max.x), Double.uniform(min.y, max.y)) return Vector2(Double.uniform(min.x, max.x, random), Double.uniform(min.y, max.y, random))
} }
fun Vector2.Companion.uniform(min: Double = -1.0, max: Double = 1.0) = fun Vector2.Companion.uniform(min: Double = -1.0, max: Double = 1.0, random: Random = Random.Default) =
Vector2.uniform(Vector2(min, min), Vector2(max, max)) Vector2.uniform(Vector2(min, min), Vector2(max, max), random)
fun Vector2.Companion.uniformRing(innerRadius: Double = 0.0, outerRadius: Double = 1.0): Vector2 { fun Vector2.Companion.uniformRing(innerRadius: Double = 0.0,
outerRadius: Double = 1.0,
random: Random = Random.Default): Vector2 {
while (true) { while (true) {
uniform(-outerRadius, outerRadius).let { uniform(-outerRadius, outerRadius, random).let {
val squaredLength = it.squaredLength val squaredLength = it.squaredLength
if (squaredLength >= innerRadius * innerRadius && squaredLength < outerRadius * outerRadius) { if (squaredLength >= innerRadius * innerRadius && squaredLength < outerRadius * outerRadius) {
return it return it
@@ -27,20 +29,31 @@ fun Vector2.Companion.uniformRing(innerRadius: Double = 0.0, outerRadius: Double
} }
} }
fun Vector3.Companion.uniform(min: Double = -1.0, max: Double = 1.0): Vector3 = fun Vector2.Companion.uniforms(count: Int,
Vector3.uniform(Vector3(min, min, min), Vector3(max, max, max)) min: Vector2 = -ONE,
max: Vector2 = ONE,
random: Random = Random.Default): List<Vector2> =
List(count) {
Vector2.uniform(min, max, random)
}
fun Vector3.Companion.uniform(min: Vector3 = -ONE, max: Vector3 = ONE): Vector3 { fun Vector3.Companion.uniform(min: Double = -1.0, max: Double = 1.0, random: Random = Random.Default): Vector3 =
return Vector3(Double.uniform(min.x, max.x), Double.uniform(min.y, max.y), Double.uniform(min.z, max.z)) Vector3.uniform(Vector3(min, min, min), Vector3(max, max, max), random)
fun Vector3.Companion.uniform(min: Vector3 = -ONE,
max: Vector3 = ONE,
random: Random = Random.Default): Vector3 {
return Vector3(Double.uniform(min.x, max.x, random),
Double.uniform(min.y, max.y, random),
Double.uniform(min.z, max.z, random))
} }
// squared length 'polyfill' for OPENRNDR 0.3.30 fun Vector3.Companion.uniformRing(innerRadius: Double = 0.0,
private val Vector3.squaredLength__: Double get() = x * x + y * y + z * z outerRadius: Double = 1.0,
random: Random = Random.Default): Vector3 {
fun Vector3.Companion.uniformRing(innerRadius: Double = 0.0, outerRadius: Double = 1.0): Vector3 {
while (true) { while (true) {
uniform(-outerRadius, outerRadius).let { uniform(-outerRadius, outerRadius, random).let {
val squaredLength = it.squaredLength__ val squaredLength = it.squaredLength
if (squaredLength >= innerRadius * innerRadius && squaredLength < outerRadius * outerRadius) { if (squaredLength >= innerRadius * innerRadius && squaredLength < outerRadius * outerRadius) {
return it return it
} }
@@ -48,20 +61,38 @@ fun Vector3.Companion.uniformRing(innerRadius: Double = 0.0, outerRadius: Double
} }
} }
// squared length 'polyfill' for OPENRNDR 0.3.30 fun Vector3.Companion.uniforms(count: Int,
private val Vector4.squaredLength__: Double get() = x * x + y * y + z * z + w * w min: Vector3 = -ONE,
max: Vector3 = ONE,
random: Random = Random.Default): List<Vector3> =
List(count) {
Vector3.uniform(min, max, random)
}
fun Vector4.Companion.uniform(min: Double = -1.0, max: Double = 1.0): Vector4 = fun Vector3.Companion.uniformsRing(count: Int,
Vector4.uniform(Vector4(min, min, min, min), Vector4(max, max,max, max)) innerRadius: Double = 0.0, outerRadius: Double = 1.0,
random: Random = Random.Default): List<Vector3> =
List(count) {
Vector3.uniformRing(innerRadius, outerRadius, random)
}
fun Vector4.Companion.uniform(min: Vector4 = -ONE, max: Vector4 = ONE): Vector4 {
return Vector4(Double.uniform(min.x, max.x), Double.uniform(min.y, max.y), Double.uniform(min.z, max.z), Double.uniform(min.w, max.w)) fun Vector4.Companion.uniform(min: Double = -1.0, max: Double = 1.0, random: Random = Random.Default): Vector4 =
Vector4.uniform(Vector4(min, min, min, min), Vector4(max, max, max, max), random)
fun Vector4.Companion.uniform(min: Vector4 = -ONE, max: Vector4 = ONE, random: Random = Random.Default): Vector4 {
return Vector4(Double.uniform(min.x, max.x, random),
Double.uniform(min.y, max.y, random),
Double.uniform(min.z, max.z, random),
Double.uniform(min.w, max.w, random))
} }
fun Vector4.Companion.uniformRing(innerRadius: Double = 0.0, outerRadius: Double = 1.0): Vector4 { fun Vector4.Companion.uniformRing(innerRadius: Double = 0.0,
outerRadius: Double = 1.0,
random: Random = Random.Default): Vector4 {
while (true) { while (true) {
uniform(-outerRadius, outerRadius).let { uniform(-outerRadius, outerRadius, random).let {
val squaredLength = it.squaredLength__ val squaredLength = it.squaredLength
if (squaredLength >= innerRadius * innerRadius && squaredLength < outerRadius * outerRadius) { if (squaredLength >= innerRadius * innerRadius && squaredLength < outerRadius * outerRadius) {
return it return it
} }