diff --git a/src/noise/_impl/_pnoise1_impl.scad b/src/noise/_impl/_pnoise1_impl.scad index 8aa1f46c..021f0f4f 100644 --- a/src/noise/_impl/_pnoise1_impl.scad +++ b/src/noise/_impl/_pnoise1_impl.scad @@ -10,7 +10,7 @@ function _pnoise1_impl(x, seed) = xf = x - xi ) lerp( - _pnoise1_grad1(_pnoise_lookup_pnoise_table(seed + xi), xf), - _pnoise1_grad1(_pnoise_lookup_pnoise_table(seed + xi + 1), xf - 1), + _pnoise1_grad1(rands(0, 256, 1, seed + xi)[0], xf), + _pnoise1_grad1(rands(0, 256, 1, seed + xi + 1)[0], xf - 1), _pnoise_fade(xf) ); \ No newline at end of file diff --git a/src/noise/_impl/_pnoise2_impl.scad b/src/noise/_impl/_pnoise2_impl.scad index 57ccb09d..1670896d 100644 --- a/src/noise/_impl/_pnoise2_impl.scad +++ b/src/noise/_impl/_pnoise2_impl.scad @@ -12,10 +12,12 @@ function _pnoise2(x, y, seed) = yf = y - yi, u = _pnoise_fade(xf), v = _pnoise_fade(yf), - aa = _pnoise_lookup_pnoise_table(_pnoise_lookup_pnoise_table(seed + xi) + yi), - ba = _pnoise_lookup_pnoise_table(_pnoise_lookup_pnoise_table(seed + xi + 1) + yi), - ab = _pnoise_lookup_pnoise_table(_pnoise_lookup_pnoise_table(seed + xi) + yi + 1), - bb = _pnoise_lookup_pnoise_table(_pnoise_lookup_pnoise_table(seed + xi + 1) + yi + 1), + rnd1 = rands(0, 256, 1, seed + xi)[0] + yi, + rnd2 = rands(0, 256, 1, seed + xi + 1)[0] + yi, + aa = rands(0, 256, 1, rnd1)[0], + ba = rands(0, 256, 1, rnd2)[0], + ab = rands(0, 256, 1, rnd1 + 1)[0], + bb = rands(0, 256, 1, rnd2 + 1)[0], y1 = lerp( _pnoise2_grad2(aa, xf, yf), _pnoise2_grad2(ba, xf - 1, yf), diff --git a/src/noise/_impl/_pnoise3_impl.scad b/src/noise/_impl/_pnoise3_impl.scad index fec47ed4..5ea7212c 100644 --- a/src/noise/_impl/_pnoise3_impl.scad +++ b/src/noise/_impl/_pnoise3_impl.scad @@ -16,46 +16,23 @@ function _pnoise3(x, y, z, seed) = v = _pnoise_fade(yf), w = _pnoise_fade(zf), - aaa = _pnoise_lookup_pnoise_table( - _pnoise_lookup_pnoise_table( - _pnoise_lookup_pnoise_table(seed + xi) + yi - ) + zi - ), - aba = _pnoise_lookup_pnoise_table( - _pnoise_lookup_pnoise_table( - _pnoise_lookup_pnoise_table(seed + xi) + yi + 1 - ) + zi - ), - aab = _pnoise_lookup_pnoise_table( - _pnoise_lookup_pnoise_table( - _pnoise_lookup_pnoise_table(seed + xi) + yi - ) + zi + 1 - ), - abb = _pnoise_lookup_pnoise_table( - _pnoise_lookup_pnoise_table( - _pnoise_lookup_pnoise_table(seed + xi) + yi + 1 - ) + zi + 1 - ), - baa = _pnoise_lookup_pnoise_table( - _pnoise_lookup_pnoise_table( - _pnoise_lookup_pnoise_table(seed + xi + 1) + yi - ) + zi - ), - bba = _pnoise_lookup_pnoise_table( - _pnoise_lookup_pnoise_table( - _pnoise_lookup_pnoise_table(seed + xi + 1) + yi + 1 - ) + zi - ), - bab = _pnoise_lookup_pnoise_table( - _pnoise_lookup_pnoise_table( - _pnoise_lookup_pnoise_table(seed + xi + 1) + yi - ) + zi + 1 - ), - bbb = _pnoise_lookup_pnoise_table( - _pnoise_lookup_pnoise_table( - _pnoise_lookup_pnoise_table(seed + xi + 1) + yi + 1 - ) + zi + 1 - ), + rnd1 = rands(0, 256, 1, seed + xi)[0] + yi, + rnd2 = rands(0, 256, 1, seed + xi + 1)[0] + yi, + + rnd3 = rands(0, 256, 1, rnd1)[0] + zi, + rnd4 = rands(0, 256, 1, rnd1 + 1)[0] + zi, + rnd5 = rands(0, 256, 1, rnd2)[0] + zi, + rnd6 = rands(0, 256, 1, rnd2 + 1)[0] + zi, + + aaa = rands(0, 256, 1, rnd3)[0], + aba = rands(0, 256, 1, rnd4)[0], + aab = rands(0, 256, 1, rnd3 + 1)[0], + abb = rands(0, 256, 1, rnd4 + 1)[0], + baa = rands(0, 256, 1, rnd5)[0], + bab = rands(0, 256, 1, rnd5 + 1)[0], + bba = rands(0, 256, 1, rnd6)[0], + bbb = rands(0, 256, 1, rnd6 + 1)[0], + x1 = lerp( _pnoise3_grad3(aaa, xf, yf, zf), _pnoise3_grad3(baa, xf - 1, yf, zf), diff --git a/src/noise/_impl/_pnoise_comm.scad b/src/noise/_impl/_pnoise_comm.scad index 9d966728..f202ed28 100644 --- a/src/noise/_impl/_pnoise_comm.scad +++ b/src/noise/_impl/_pnoise_comm.scad @@ -1,5 +1 @@ -_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) = t ^ 3 * (t * (t * 6 - 15) + 10); - -function _pnoise_lookup_pnoise_table(i) = _pnoise_table[abs(i % 256)]; \ No newline at end of file +function _pnoise_fade(t) = t ^ 3 * (t * (t * 6 - 15) + 10); \ No newline at end of file