From fbf47fa04205e11cdd7c34ff6e084ccc2fb14758 Mon Sep 17 00:00:00 2001 From: Justin Lin Date: Fri, 6 Mar 2020 09:54:30 +0800 Subject: [PATCH] using seed is simple --- src/experimental/_impl/_pnoise1.scad | 25 +++++++++++++++++-------- src/experimental/pnoise1.scad | 9 +++++---- 2 files changed, 22 insertions(+), 12 deletions(-) diff --git a/src/experimental/_impl/_pnoise1.scad b/src/experimental/_impl/_pnoise1.scad index 10bb0be7..90b82d44 100644 --- a/src/experimental/_impl/_pnoise1.scad +++ b/src/experimental/_impl/_pnoise1.scad @@ -1,12 +1,21 @@ +_pnoise_table = [151,160,137,91,90,15,131,13,201,95,96,53,194,233,7,225,140,36,103,30,69,142,8,99,37,240,21,10,23,190,6,148,247,120,234,75,0,26,197,62,94,252,219,203,117,35,11,32,57,177,33,88,237,149,56,87,174,20,125,136,171,168,68,175,74,165,71,134,139,48,27,166,77,146,158,231,83,111,229,122,60,211,133,230,220,105,92,41,55,46,245,40,244,102,143,54,65,25,63,161,1,216,80,73,209,76,132,187,208,89,18,169,200,196,135,130,116,188,159,86,164,100,109,198,173,186,3,64,52,217,226,250,124,123,5,202,38,147,118,126,255,82,85,212,207,206,59,227,47,16,58,17,182,189,28,42,223,183,170,213,119,248,152,2,44,154,163,70,221,153,101,155,167,43,172,9,129,22,39,253,19,98,108,110,79,113,224,232,178,185,112,104,218,246,97,228,251,34,242,193,238,210,144,12,191,179,162,241,81,51,145,235,249,14,239,107,49,192,214,31,181,199,106,157,184,84,204,176,115,121,50,45,127,4,150,254,138,236,205,93,222,114,67,29,24,72,243,141,128,195,78,66,215,61,156,180]; + function _pnoise_fade(t) = pow(t, 3) * (t * (t * 6 - 15) + 10); -function _pnoise1(x, n, gradients) = +function lerp(a, b, t) = a + t * (b - a); + +function grad1(hashvalue, x) = (hashvalue % 2 == 0) ? x : -x; + +function _pnoise1(x, n, seed = 0) = let( - lo = floor(x), - hi = (lo + 1) % n, - t = x - lo, - loPos = gradients[lo] * t, - hiPos = -gradients[hi] * (1 - t), - u = _pnoise_fade(t) + xi = floor(x), + xf = x - floor(x), + u = _pnoise_fade(xf), + a = _pnoise_table[(seed + xi) % 256], + b = _pnoise_table[(seed + xi + 1) % 256] ) - loPos * (1 - u) + hiPos * u; \ No newline at end of file + lerp( + grad1(a, xf), + grad1(b, xf - 1), + u + ); \ No newline at end of file diff --git a/src/experimental/pnoise1.scad b/src/experimental/pnoise1.scad index 8032c5bb..7c98d6a4 100644 --- a/src/experimental/pnoise1.scad +++ b/src/experimental/pnoise1.scad @@ -1,13 +1,14 @@ -use ; +use ; +use ; -function pnoise1(xs, gradients) = +function pnoise1(xs, seed) = let( from = floor(min(xs)), to = ceil(max(xs)), n = to - from + 1, - grads = is_undef(gradients) ? rands(-1, 1, n) : gradients + sd = is_undef(seed) ? floor(rand(0, 256)) : seed ) [ for(x = xs) - _pnoise1(x, n, grads) + _pnoise1(x, n, sd) ]; \ No newline at end of file