From 1938cbcce3290c28a3925bf3c0a341a114c55a36 Mon Sep 17 00:00:00 2001 From: Edwin Jakobs Date: Thu, 12 Mar 2020 15:08:28 +0100 Subject: [PATCH] Rename gradient functions --- orx-noise/src/main/kotlin/Gradient.kt | 8 ++++---- orx-noise/src/test/kotlin/TestGradient.kt | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/orx-noise/src/main/kotlin/Gradient.kt b/orx-noise/src/main/kotlin/Gradient.kt index b5a7c579..f44a195f 100644 --- a/orx-noise/src/main/kotlin/Gradient.kt +++ b/orx-noise/src/main/kotlin/Gradient.kt @@ -4,7 +4,7 @@ import org.openrndr.math.Vector2 import org.openrndr.math.Vector3 import org.openrndr.math.Vector4 -inline fun gradient( +inline fun gradient1D( crossinline noise: (seed: Int, x: Double) -> Double, seed: Int, x: Double, @@ -15,7 +15,7 @@ inline fun gradient( return (xp - xn) / (2.0 * epsilon) } -inline fun gradient( +inline fun gradient2D( crossinline noise: (seed: Int, x: Double, y: Double) -> Double, seed: Int, x: Double, @@ -29,7 +29,7 @@ inline fun gradient( return Vector2((xp - xn) / (2.0 * epsilon), (yp - yn) / (2.0 * epsilon)) } -inline fun gradient( +inline fun gradient3D( crossinline noise: (seed: Int, x: Double, y: Double, z: Double) -> Double, seed: Int, x: Double, @@ -46,7 +46,7 @@ inline fun gradient( return Vector3((xp - xn) / (2.0 * epsilon), (yp - yn) / (2.0 * epsilon), (zp - zn) / (2.0 * epsilon)) } -inline fun gradient( +inline fun gradient4D( crossinline noise: (seed: Int, x: Double, y: Double, z: Double, w: Double) -> Double, seed: Int, x: Double, diff --git a/orx-noise/src/test/kotlin/TestGradient.kt b/orx-noise/src/test/kotlin/TestGradient.kt index 0afe7607..eb177410 100644 --- a/orx-noise/src/test/kotlin/TestGradient.kt +++ b/orx-noise/src/test/kotlin/TestGradient.kt @@ -6,28 +6,28 @@ import kotlin.test.assertEquals object TestGradient : Spek({ describe("Noise") { it("has a gradient") { - gradient(::perlinLinear, 100, 0.1) + gradient1D(::perlinLinear, 100, 0.1) } } describe("FBM noise func") { it("has a gradient") { val func = fbmFunc1D(::perlinLinear) - gradient(func, 100, 0.1) + gradient1D(func, 100, 0.1) } } describe("Billow noise func") { it("has a gradient") { val func = billowFunc1D(::perlinLinear) - gradient(func, 100, 0.1) + gradient1D(func, 100, 0.1) } } describe("Rigid noise func") { it("has a gradient") { val func = rigidFunc1D(::perlinLinear) - gradient(func, 100, 0.1) + gradient1D(func, 100, 0.1) } } }) \ No newline at end of file