From 13e2e5885305dad5870a12bf47bb39022ba6d8d5 Mon Sep 17 00:00:00 2001 From: Justin Lin Date: Sun, 29 Mar 2020 11:14:26 +0800 Subject: [PATCH] rename --- examples/maze/noisy_circle_maze.scad | 10 +++---- examples/perlin_noise_cylinder.scad | 4 +-- .../_impl/_pnoise_contour_impl.scad | 29 ------------------- src/experimental/demo/contours_demo.scad | 4 +-- ...pnoise1_demo.scad => nz_perlin1_demo.scad} | 8 ++--- ...pnoise2_demo.scad => nz_perlin2_demo.scad} | 6 ++-- ...pnoise3_demo.scad => nz_perlin3_demo.scad} | 10 +++---- .../demo/pnoise_counter_demo.scad | 15 ---------- .../{pnoise1.scad => nz_perlin1.scad} | 2 +- .../{pnoise1s.scad => nz_perlin1s.scad} | 2 +- .../{pnoise2.scad => nz_perlin2.scad} | 2 +- .../{pnoise2s.scad => nz_perlin2s.scad} | 2 +- .../{pnoise3.scad => nz_perlin3.scad} | 2 +- .../{pnoise3s.scad => nz_perlin3s.scad} | 2 +- src/experimental/pnoise_contour.scad | 14 --------- 15 files changed, 27 insertions(+), 85 deletions(-) delete mode 100644 src/experimental/_impl/_pnoise_contour_impl.scad rename src/experimental/demo/{pnoise1_demo.scad => nz_perlin1_demo.scad} (59%) rename src/experimental/demo/{pnoise2_demo.scad => nz_perlin2_demo.scad} (86%) rename src/experimental/demo/{pnoise3_demo.scad => nz_perlin3_demo.scad} (87%) delete mode 100644 src/experimental/demo/pnoise_counter_demo.scad rename src/experimental/{pnoise1.scad => nz_perlin1.scad} (53%) rename src/experimental/{pnoise1s.scad => nz_perlin1s.scad} (83%) rename src/experimental/{pnoise2.scad => nz_perlin2.scad} (52%) rename src/experimental/{pnoise2s.scad => nz_perlin2s.scad} (82%) rename src/experimental/{pnoise3.scad => nz_perlin3.scad} (50%) rename src/experimental/{pnoise3s.scad => nz_perlin3s.scad} (83%) delete mode 100644 src/experimental/pnoise_contour.scad diff --git a/examples/maze/noisy_circle_maze.scad b/examples/maze/noisy_circle_maze.scad index ba22d587..32a4584f 100644 --- a/examples/maze/noisy_circle_maze.scad +++ b/examples/maze/noisy_circle_maze.scad @@ -3,7 +3,7 @@ use ; use ; use ; use ; -use ; +use ; module noisy_circle_maze(start, r_blocks, block_width, wall_thickness, origin_offset, noisy_factor) { double_r_blocks = r_blocks * 2; @@ -25,10 +25,10 @@ module noisy_circle_maze(start, r_blocks, block_width, wall_thickness, origin_of for(i = [0:len(wall) - 2]) { p0 = ptf_circle(rect_size, wall[i]); p1 = ptf_circle(rect_size, wall[i + 1]); - pn00 = pnoise2(p0[0], p0[1], seed) * noisy_f; - pn01 = pnoise2(p0[0] + seed, p0[1] + seed, seed) * noisy_f; - pn10 = pnoise2(p1[0], p1[1], seed) * noisy_f; - pn11 = pnoise2(p1[0] + seed, p1[1] + seed, seed) * noisy_f; + pn00 = nz_perlin2(p0[0], p0[1], seed) * noisy_f; + pn01 = nz_perlin2(p0[0] + seed, p0[1] + seed, seed) * noisy_f; + pn10 = nz_perlin2(p1[0], p1[1], seed) * noisy_f; + pn11 = nz_perlin2(p1[0] + seed, p1[1] + seed, seed) * noisy_f; hull_polyline2d([p0 + [pn00, pn01], p1 + [pn10, pn11]], width = wall_thickness); } } diff --git a/examples/perlin_noise_cylinder.scad b/examples/perlin_noise_cylinder.scad index 963c981a..ce479b72 100644 --- a/examples/perlin_noise_cylinder.scad +++ b/examples/perlin_noise_cylinder.scad @@ -1,5 +1,5 @@ use ; -use ; +use ; use ; use ; use ; @@ -30,7 +30,7 @@ module perlin_noise_cylinder(radius, height, thickness_scale, step) { let( row = surface_inside[ri], row_for_noise = concat(slice(row, 0, leng_row - 1), [[0, row[leng_row - 1][1], 0]]), - ns = pnoise2s(row_for_noise, seed) + ns = nz_perlin2s(row_for_noise, seed) ) [ for(ci = [0:len(ns) - 1]) diff --git a/src/experimental/_impl/_pnoise_contour_impl.scad b/src/experimental/_impl/_pnoise_contour_impl.scad deleted file mode 100644 index 066b7f76..00000000 --- a/src/experimental/_impl/_pnoise_contour_impl.scad +++ /dev/null @@ -1,29 +0,0 @@ -use ; - -INFINITY = 1e200 * 1e200; - -function _pnoise_contour_step_sub(x, y, current_noise, seed, step_leng, step_angle, heading, min_delta, maybe_heading, close_noise, maybe_x, maybe_y, theta) = - theta >= heading + 90 ? [maybe_x, maybe_y, maybe_heading] : - let( - nx = x + step_leng * cos(theta), - ny = y + step_leng * sin(theta), - new_noise = pnoise2(nx, ny, seed), - delta = abs(new_noise - current_noise) - ) - delta < min_delta ? - _pnoise_contour_step_sub(x, y, current_noise, seed, step_leng, step_angle, heading, delta, theta, new_noise, nx, ny, theta + step_angle) : - _pnoise_contour_step_sub(x, y, current_noise, seed, step_leng, step_angle, heading, min_delta, maybe_heading, close_noise, maybe_x, maybe_y, theta + step_angle); - -function _pnoise_contour_step(x, y, heading, noise, seed, step_leng, step_angle) = - _pnoise_contour_step_sub( - x, y, - is_undef(noise) ? pnoise2(x, y, seed) : noise, - seed, step_leng, step_angle, heading, INFINITY, heading, -1, -1, -1, heading - 90 - ); - -function _pnoise_contour(x, y, heading, noise, seed, steps, step_leng, step_angle, i = 0) = - i == steps ? [[x, y]] : - let( - xyh = _pnoise_contour_step(x, y, heading, noise, seed, step_leng, step_angle) - ) - concat([[x, y]], _pnoise_contour(xyh[0], xyh[1], xyh[2], noise, seed, steps, step_leng, step_angle, i + 1)); diff --git a/src/experimental/demo/contours_demo.scad b/src/experimental/demo/contours_demo.scad index 57b8ee6f..d83896e5 100644 --- a/src/experimental/demo/contours_demo.scad +++ b/src/experimental/demo/contours_demo.scad @@ -1,12 +1,12 @@ use ; use ; -use ; +use ; use ; seed = rand(0, 256); points = [ for(y = [0:.2:10]) [ - for(x = [0:.2:10]) [x, y, pnoise2(x, y, seed)] + for(x = [0:.2:10]) [x, y, nz_perlin2(x, y, seed)] ] ]; diff --git a/src/experimental/demo/pnoise1_demo.scad b/src/experimental/demo/nz_perlin1_demo.scad similarity index 59% rename from src/experimental/demo/pnoise1_demo.scad rename to src/experimental/demo/nz_perlin1_demo.scad index 93cfb69e..417db5ec 100644 --- a/src/experimental/demo/pnoise1_demo.scad +++ b/src/experimental/demo/nz_perlin1_demo.scad @@ -1,16 +1,16 @@ use ; use ; use ; -use ; -use ; +use ; +use ; seed = rand(); hull_polyline2d( - [for(x = [0:.1:10]) [x, pnoise1(x, seed)]], width = .1 + [for(x = [0:.1:10]) [x, nz_perlin1(x, seed)]], width = .1 ); xs = [for(x = [0:.2:8.3]) x]; -ys = pnoise1s(xs); +ys = nz_perlin1s(xs); translate([0, 2]) hull_polyline2d( diff --git a/src/experimental/demo/pnoise2_demo.scad b/src/experimental/demo/nz_perlin2_demo.scad similarity index 86% rename from src/experimental/demo/pnoise2_demo.scad rename to src/experimental/demo/nz_perlin2_demo.scad index bb146813..5c87a38e 100644 --- a/src/experimental/demo/pnoise2_demo.scad +++ b/src/experimental/demo/nz_perlin2_demo.scad @@ -1,6 +1,6 @@ use ; use ; -use ; +use ; module demo1() { points = [ @@ -8,7 +8,7 @@ module demo1() { for(x = [0:.2:10]) [x, y] ]; - noise = pnoise2s(points); + noise = nz_perlin2s(points); for(i = [0:len(points) - 1]) { c = (noise[i] + 1.1) / 2; @@ -32,7 +32,7 @@ module demo2() { function_grapher( [ for(ri = [0:len(points) - 1]) - let(ns = pnoise2s(points[ri], seed)) + let(ns = nz_perlin2s(points[ri], seed)) [ for(ci = [0:len(ns) - 1]) [points[ri][ci][0], points[ri][ci][1], ns[ci]] diff --git a/src/experimental/demo/pnoise3_demo.scad b/src/experimental/demo/nz_perlin3_demo.scad similarity index 87% rename from src/experimental/demo/pnoise3_demo.scad rename to src/experimental/demo/nz_perlin3_demo.scad index 0d188a5f..237a301d 100644 --- a/src/experimental/demo/pnoise3_demo.scad +++ b/src/experimental/demo/nz_perlin3_demo.scad @@ -1,6 +1,6 @@ use ; -use ; -use ; +use ; +use ; module demo1() { for(z = [0:.2:5]) { @@ -9,7 +9,7 @@ module demo1() { for(x = [0:.2:5]) [x, y, z] ]; - noise = pnoise3s(points, 3); + noise = nz_perlin3s(points, 3); for(i = [0:len(points) - 1]) { alpha = abs(noise[i] + .5); color([.75, .75, .75, alpha < 0 ? 0 : alpha > 1 ? 1 : alpha]) @@ -32,7 +32,7 @@ module demo2() { points_with_h = [ for(ri = [0:len(points) - 1]) - let(ns = pnoise2s(points[ri], seed)) + let(ns = nz_perlin2s(points[ri], seed)) [ for(ci = [0:len(ns) - 1]) [points[ri][ci][0], points[ri][ci][1], ns[ci] + 1] @@ -46,7 +46,7 @@ module demo2() { pts = [ for(z = [0:.2:p[2] * h_scale]) [p[0], p[1], z] ]; - noise = pnoise3s(pts, seed); + noise = nz_perlin3s(pts, seed); for(j = [0:len(pts) - 1]) { if(noise[j] > 0) { color( diff --git a/src/experimental/demo/pnoise_counter_demo.scad b/src/experimental/demo/pnoise_counter_demo.scad deleted file mode 100644 index b5ada8bb..00000000 --- a/src/experimental/demo/pnoise_counter_demo.scad +++ /dev/null @@ -1,15 +0,0 @@ -use ; -use ; - -for(y = [0:2:4]) { - for(x = [0:2:4]) { - hull_polyline2d(pnoise_contour(x, y, noise = 0.025, steps = 200), width = .1, $fn = 4); - } -} - -translate([10, 0]) -for(y = [0:2:4]) { - for(x = [0:2:4]) { - hull_polyline2d(pnoise_contour(x, y, steps = 100), width = .05, $fn = 4); - } -} \ No newline at end of file diff --git a/src/experimental/pnoise1.scad b/src/experimental/nz_perlin1.scad similarity index 53% rename from src/experimental/pnoise1.scad rename to src/experimental/nz_perlin1.scad index 3d87dca6..d3a1567c 100644 --- a/src/experimental/pnoise1.scad +++ b/src/experimental/nz_perlin1.scad @@ -1,4 +1,4 @@ use ; use ; -function pnoise1(x, seed) = _pnoise1_impl(x, seed % 256); \ No newline at end of file +function nz_perlin1(x, seed) = _pnoise1_impl(x, seed % 256); \ No newline at end of file diff --git a/src/experimental/pnoise1s.scad b/src/experimental/nz_perlin1s.scad similarity index 83% rename from src/experimental/pnoise1s.scad rename to src/experimental/nz_perlin1s.scad index 61529e27..06b26177 100644 --- a/src/experimental/pnoise1s.scad +++ b/src/experimental/nz_perlin1s.scad @@ -1,6 +1,6 @@ use ; use ; -function pnoise1s(xs, seed) = +function nz_perlin1s(xs, seed) = let(sd = is_undef(seed) ? floor(rand(0, 256)) : seed % 256) [for(x = xs) _pnoise1_impl(x, sd)]; \ No newline at end of file diff --git a/src/experimental/pnoise2.scad b/src/experimental/nz_perlin2.scad similarity index 52% rename from src/experimental/pnoise2.scad rename to src/experimental/nz_perlin2.scad index fc44d205..6fcb6551 100644 --- a/src/experimental/pnoise2.scad +++ b/src/experimental/nz_perlin2.scad @@ -1,4 +1,4 @@ use ; use ; -function pnoise2(x, y, seed) = _pnoise2(x, y, seed % 256); \ No newline at end of file +function nz_perlin2(x, y, seed) = _pnoise2(x, y, seed % 256); \ No newline at end of file diff --git a/src/experimental/pnoise2s.scad b/src/experimental/nz_perlin2s.scad similarity index 82% rename from src/experimental/pnoise2s.scad rename to src/experimental/nz_perlin2s.scad index 307a9d7b..1d0e5e4b 100644 --- a/src/experimental/pnoise2s.scad +++ b/src/experimental/nz_perlin2s.scad @@ -1,6 +1,6 @@ use ; use ; -function pnoise2s(points, seed) = +function nz_perlin2s(points, seed) = let(sd = is_undef(seed) ? floor(rand(0, 256)) : seed % 256) [for(p = points) _pnoise2(p[0], p[1], sd)]; \ No newline at end of file diff --git a/src/experimental/pnoise3.scad b/src/experimental/nz_perlin3.scad similarity index 50% rename from src/experimental/pnoise3.scad rename to src/experimental/nz_perlin3.scad index fc6b9288..0f5c9a5f 100644 --- a/src/experimental/pnoise3.scad +++ b/src/experimental/nz_perlin3.scad @@ -1,4 +1,4 @@ use ; use ; -function pnoise3(x, y, z, seed) = _pnoise3(x, y, z, seed % 256); \ No newline at end of file +function nz_perlin3(x, y, z, seed) = _pnoise3(x, y, z, seed % 256); \ No newline at end of file diff --git a/src/experimental/pnoise3s.scad b/src/experimental/nz_perlin3s.scad similarity index 83% rename from src/experimental/pnoise3s.scad rename to src/experimental/nz_perlin3s.scad index 47b5ccac..784f3c4f 100644 --- a/src/experimental/pnoise3s.scad +++ b/src/experimental/nz_perlin3s.scad @@ -1,6 +1,6 @@ use ; use ; -function pnoise3s(points, seed) = +function nz_perlin3s(points, seed) = let(sd = is_undef(seed) ? floor(rand(0, 256)) : seed % 256) [for(p = points) _pnoise3(p[0], p[1], p[2], sd)]; \ No newline at end of file diff --git a/src/experimental/pnoise_contour.scad b/src/experimental/pnoise_contour.scad deleted file mode 100644 index 697d8ed1..00000000 --- a/src/experimental/pnoise_contour.scad +++ /dev/null @@ -1,14 +0,0 @@ -use ; -use ; - -function pnoise_contour(x, y, noise, seed = 1, steps = 50, step_leng = 0.2, step_angle = 12) = - _pnoise_contour( - x, - y, - seed % 360, - noise, - seed, - steps, - step_leng, - step_angle - ); \ No newline at end of file