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

Replace lerp from orx-noise with standard mix

Browse Source
This commit is contained in:
Edwin Jakobs
2020-05-01 18:44:25 +02:00
parent 96b519d140
commit af6ce5fcae
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
orx-noise/src/main/kotlin/Interpolation.kt
View File

@@ -15,8 +15,4 @@ fun cubic(a: Double, b: Double, c: Double, d: Double, t: Double): Double {
fun linear(x: Double): Double {
return x
}
fun lerp(left: Double, right: Double, x: Double): Double {
return left * (1.0 - x) + right * x
}

7
orx-noise/src/main/kotlin/PerlinNoise2D.kt
View File

@@ -1,6 +1,7 @@
package org.openrndr.extra.noise
import org.openrndr.math.Vector2
import org.openrndr.math.mix
fun perlin(seed: Int, x: Double, y: Double) = perlin(seed, x, y, ::linear)
fun perlinLinear(seed: Int, x: Double, y: Double) = perlin(seed, x, y, ::linear)
@@ -26,8 +27,8 @@ inline fun perlin(seed: Int, x: Double, y: Double, crossinline interpolator: (Do
val xd1 = xd0 - 1
val yd1 = yd0 - 1
val xf0 = lerp(gradCoord2D(seed, x0, y0, xd0, yd0), gradCoord2D(seed, x1, y0, xd1, yd0), xs)
val xf1 = lerp(gradCoord2D(seed, x0, y1, xd0, yd1), gradCoord2D(seed, x1, y1, xd1, yd1), xs)
val xf0 = mix(gradCoord2D(seed, x0, y0, xd0, yd0), gradCoord2D(seed, x1, y0, xd1, yd0), xs)
val xf1 = mix(gradCoord2D(seed, x0, y1, xd0, yd1), gradCoord2D(seed, x1, y1, xd1, yd1), xs)
return lerp(xf0, xf1, ys)
return mix(xf0, xf1, ys)
}