From 99d29bb4aaa7680a6286c519c739da63ee5e5545 Mon Sep 17 00:00:00 2001 From: Justin Lin Date: Mon, 30 Mar 2020 10:10:15 +0800 Subject: [PATCH] can be negative point --- src/experimental/_impl/_nz_worley2_impl.scad | 2 +- src/experimental/_impl/_nz_worley3_impl.scad | 2 +- src/experimental/nz_worley2.scad | 2 +- src/experimental/nz_worley2s.scad | 2 +- src/experimental/nz_worley3.scad | 2 +- src/experimental/nz_worley3s.scad | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/experimental/_impl/_nz_worley2_impl.scad b/src/experimental/_impl/_nz_worley2_impl.scad index 7c9b767c..6af84c78 100644 --- a/src/experimental/_impl/_nz_worley2_impl.scad +++ b/src/experimental/_impl/_nz_worley2_impl.scad @@ -7,7 +7,7 @@ function _neighbors(fcord, seed, cell_w) = [ let( nx = fcord[0] + x, ny = fcord[1] + y, - sd_base = nx + ny * cell_w, + sd_base = abs(nx + ny * cell_w), sd1 = _lookup_noise_table(seed + sd_base), sd2 = _lookup_noise_table(sd1 * 255 + sd_base), nbr = [(nx + sd1) * cell_w, (ny + sd2) * cell_w] diff --git a/src/experimental/_impl/_nz_worley3_impl.scad b/src/experimental/_impl/_nz_worley3_impl.scad index 850d5ba0..9d434a81 100644 --- a/src/experimental/_impl/_nz_worley3_impl.scad +++ b/src/experimental/_impl/_nz_worley3_impl.scad @@ -9,7 +9,7 @@ function _neighbors(fcord, seed, cell_w) = [ nx = fcord[0] + x, ny = fcord[1] + y, nz = fcord[2] + z, - sd_base = nx + ny * cell_w + nz * cell_w * cell_w, + sd_base = abs(nx + ny * cell_w + nz * cell_w * cell_w), sd1 = _lookup_noise_table(seed + sd_base), sd2 = _lookup_noise_table(sd1 * 255 + sd_base), sd3 = _lookup_noise_table(sd2 * 255 + sd_base), diff --git a/src/experimental/nz_worley2.scad b/src/experimental/nz_worley2.scad index b40aa170..efbb5888 100644 --- a/src/experimental/nz_worley2.scad +++ b/src/experimental/nz_worley2.scad @@ -2,5 +2,5 @@ use ; use ; function nz_worley2(x, y, seed, cell_w = 10, dist = "euclidean") = - let(sd = 6 + (is_undef(seed) ? floor(rand(0, 256)) : seed % 256)) + let(sd = is_undef(seed) ? floor(rand(0, 256)) : seed % 256) _nz_worley2([x, y], sd, cell_w, dist); \ No newline at end of file diff --git a/src/experimental/nz_worley2s.scad b/src/experimental/nz_worley2s.scad index a23bd739..ae92cd28 100644 --- a/src/experimental/nz_worley2s.scad +++ b/src/experimental/nz_worley2s.scad @@ -2,5 +2,5 @@ use ; use ; function nz_worley2s(points, seed, cell_w = 10, dist = "euclidean") = - let(sd = 6 + (is_undef(seed) ? floor(rand(0, 256)) : seed % 256)) + let(sd = is_undef(seed) ? floor(rand(0, 256)) : seed % 256) [for(p = points) _nz_worley2(p, sd, cell_w, dist)]; \ No newline at end of file diff --git a/src/experimental/nz_worley3.scad b/src/experimental/nz_worley3.scad index 2ae8b27e..da9a2b26 100644 --- a/src/experimental/nz_worley3.scad +++ b/src/experimental/nz_worley3.scad @@ -2,5 +2,5 @@ use ; use ; function nz_worley3(x, y, z, seed, cell_w = 10, dist = "euclidean") = - let(sd = 6 + (is_undef(seed) ? floor(rand(0, 256)) : seed % 256)) + let(sd = is_undef(seed) ? floor(rand(0, 256)) : seed % 256) _nz_worley3([x, y, z], sd, cell_w, dist); \ No newline at end of file diff --git a/src/experimental/nz_worley3s.scad b/src/experimental/nz_worley3s.scad index 8c3e2b1e..5c517465 100644 --- a/src/experimental/nz_worley3s.scad +++ b/src/experimental/nz_worley3s.scad @@ -2,5 +2,5 @@ use ; use ; function nz_worley3s(points, seed, cell_w = 10, dist = "euclidean") = - let(sd = 6 + (is_undef(seed) ? floor(rand(0, 256)) : seed % 256)) + let(sd = is_undef(seed) ? floor(rand(0, 256)) : seed % 256) [for(p = points) _nz_worley3(p, sd, cell_w, dist)]; \ No newline at end of file