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

Add 2d version of gradientPerturb

Browse Source
This commit is contained in:
Edwin Jakobs
2020-04-07 00:07:46 +02:00
parent 36f5d5b96d
commit abde3fbe41
3 changed files with 116 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
orx-noise/src/main/kotlin/GradientPerturb.kt
View File

@@ -1,5 +1,6 @@
package org.openrndr.extra.noise
import org.openrndr.math.Vector2
import org.openrndr.math.Vector3
import org.openrndr.math.mix
@@ -8,15 +9,15 @@ fun gradientPerturbFractal(seed: Int, amplitude: Double = 1.0, frequency: Double
octaves: Int = 4, position: Vector3, interpolator: (Double) -> Double = ::quintic): Vector3 {
var seed_ = seed
var amp_ = amplitude
var amplitude_ = amplitude
var frequency_ = frequency
var p = gradientPerturb(seed_, amp_, frequency_, position, interpolator)
var p = gradientPerturb(seed_, amplitude_, frequency_, position, interpolator)
for (i in 0 until octaves) {
frequency_ *= lacunarity
amp_ *= gain
amplitude_ *= gain
seed_++
p = gradientPerturb(seed_, amp_, frequency_, p, interpolator)
p = gradientPerturb(seed_, amplitude_, frequency_, p, interpolator)
}
return p
}
@@ -75,3 +76,51 @@ fun gradientPerturb(seed: Int, amplitude: Double, frequency: Double, position: V
mix(lz0y, mix(lz0x, lz1x, ys), zs)
) * amplitude
}
fun gradientPerturbFractal(seed: Int, amplitude: Double = 1.0, frequency: Double = 2.0,
lacunarity: Double = 2.0, gain: Double = 0.5,
octaves: Int = 4, position: Vector2, interpolator: (Double) -> Double = ::quintic): Vector2 {
var seed_ = seed
var amplitude_ = amplitude
var frequency_ = frequency
var p = gradientPerturb(seed_, amplitude_, frequency_, position, interpolator)
for (i in 0 until octaves) {
frequency_ *= lacunarity
amplitude_ *= gain
seed_++
p = gradientPerturb(seed_, amplitude_, frequency_, p, interpolator)
}
return p
}
fun gradientPerturb(seed: Int, amplitude: Double, frequency: Double, position: Vector2, interpolator: (Double) -> Double = ::quintic): Vector2 {
val xf = position.x * frequency
val yf = position.y * frequency
val x0 = xf.fastFloor()
val y0 = yf.fastFloor()
val x1 = x0 + 1
val y1 = y0 + 1
val xs = interpolator(xf - x0)
val ys = interpolator(yf - y0)
var vec0 = Cell2D[hash2D(seed, x0, y0) and 0xff]
var vec1 = Cell2D[hash2D(seed, x1, y0) and 0xff]
val lx0x = mix(vec0.x, vec1.x, xs)
val ly0x = mix(vec0.y, vec1.y, xs)
vec0 = Cell2D[hash2D(seed, x0, y1) and 0xff]
vec1 = Cell2D[hash2D(seed, x1, y1) and 0xff]
val lx1x = mix(vec0.x, vec1.x, xs)
val ly1x = mix(vec0.y, vec1.y, xs)
return position + Vector2(
mix(lx0x, lx1x, ys),
mix(ly0x, ly1x, ys)
) * amplitude
}