From a38e48dd25bcf60ce69442895b208f233b46466f Mon Sep 17 00:00:00 2001 From: Justin Lin Date: Wed, 30 Sep 2020 10:27:50 +0800 Subject: [PATCH] rename --- examples/maze/cylinder_maze.scad | 4 ++-- examples/maze/mobius_maze.scad | 4 ++-- examples/maze/noisy_circle_maze.scad | 4 ++-- examples/maze/sphere_maze.scad | 4 ++-- examples/maze/square_maze.scad | 4 ++-- examples/maze/torus_maze.scad | 4 ++-- examples/maze/twisted_maze.scad | 4 ++-- .../{_mz_walls_impl.scad => _mz_square_walls_impl.scad} | 2 +- src/experimental/{mz_walls.scad => mz_square_walls.scad} | 6 +++--- 9 files changed, 18 insertions(+), 18 deletions(-) rename src/experimental/_impl/{_mz_walls_impl.scad => _mz_square_walls_impl.scad} (89%) rename src/experimental/{mz_walls.scad => mz_square_walls.scad} (65%) diff --git a/examples/maze/cylinder_maze.scad b/examples/maze/cylinder_maze.scad index ba30a0c4..8f158452 100644 --- a/examples/maze/cylinder_maze.scad +++ b/examples/maze/cylinder_maze.scad @@ -1,6 +1,6 @@ use ; use ; -use ; +use ; radius = 30; height = 60; @@ -41,7 +41,7 @@ module cylinder_maze() { x_circular = true ); - walls = mz_walls(maze_blocks, maze_rows, maze_columns, block_width, left_border = false); + walls = mz_square_walls(maze_blocks, maze_rows, maze_columns, block_width, left_border = false); leng_circumference = block_width * maze_columns + wall_thickness; diff --git a/examples/maze/mobius_maze.scad b/examples/maze/mobius_maze.scad index d1951cdc..ea3f35da 100644 --- a/examples/maze/mobius_maze.scad +++ b/examples/maze/mobius_maze.scad @@ -1,6 +1,6 @@ use ; use ; -use ; +use ; use ; rows = 48; @@ -20,7 +20,7 @@ blocks = mz_blocks( y_circular = true ); -walls = mz_walls(blocks, rows, columns, block_width, bottom_border = false); +walls = mz_square_walls(blocks, rows, columns, block_width, bottom_border = false); size = [columns * block_width, rows * block_width]; for(wall_pts = walls) { diff --git a/examples/maze/noisy_circle_maze.scad b/examples/maze/noisy_circle_maze.scad index d8a656e4..c80e5502 100644 --- a/examples/maze/noisy_circle_maze.scad +++ b/examples/maze/noisy_circle_maze.scad @@ -1,7 +1,7 @@ use ; use ; use ; -use ; +use ; use ; use ; @@ -13,7 +13,7 @@ module noisy_circle_maze(start, r_blocks, block_width, wall_thickness, origin_of ); width = double_r_blocks * block_width; - walls = mz_walls(blocks, double_r_blocks, double_r_blocks, block_width); + walls = mz_square_walls(blocks, double_r_blocks, double_r_blocks, block_width); half_width = width / 2; rect_size = is_undef(origin_offset) ? [width, width] : [width, width] - origin_offset * 2; diff --git a/examples/maze/sphere_maze.scad b/examples/maze/sphere_maze.scad index 9d9a4862..70b750cf 100644 --- a/examples/maze/sphere_maze.scad +++ b/examples/maze/sphere_maze.scad @@ -1,6 +1,6 @@ use ; use ; -use ; +use ; use ; r = 10; @@ -60,7 +60,7 @@ module sphere_maze() { p_offset = [block_width * rows, pole_offset, 0]; mr = m_rotation(90); - walls = mz_walls(blocks, rows, columns, block_width, bottom_border = false); + walls = mz_square_walls(blocks, rows, columns, block_width, bottom_border = false); for(wall_pts = walls) { rxpts = [ for(p = wall_pts) diff --git a/examples/maze/square_maze.scad b/examples/maze/square_maze.scad index 96acba23..9f8a3c28 100644 --- a/examples/maze/square_maze.scad +++ b/examples/maze/square_maze.scad @@ -1,5 +1,5 @@ use ; -use ; +use ; module square_maze(start, rows, block_width, wall_thickness) { blocks = mz_blocks( @@ -7,7 +7,7 @@ module square_maze(start, rows, block_width, wall_thickness) { rows, rows ); - walls = mz_walls(blocks, rows, rows, block_width); + walls = mz_square_walls(blocks, rows, rows, block_width); for(wall = walls) { for(i = [0:len(wall) - 2]) { diff --git a/examples/maze/torus_maze.scad b/examples/maze/torus_maze.scad index 948f4452..0a4de508 100644 --- a/examples/maze/torus_maze.scad +++ b/examples/maze/torus_maze.scad @@ -1,7 +1,7 @@ use ; use ; use ; -use ; +use ; rows = 36; columns = 12; @@ -20,7 +20,7 @@ blocks = mz_blocks( x_circular = true, y_circular = true ); -walls = mz_walls(blocks, rows, columns, block_width, left_border = false, bottom_border = false); +walls = mz_square_walls(blocks, rows, columns, block_width, left_border = false, bottom_border = false); size = [columns * block_width, rows * block_width]; for(wall_pts = walls) { diff --git a/examples/maze/twisted_maze.scad b/examples/maze/twisted_maze.scad index b5a61197..fe0e398e 100644 --- a/examples/maze/twisted_maze.scad +++ b/examples/maze/twisted_maze.scad @@ -1,6 +1,6 @@ use ; use ; -use ; +use ; use ; use ; @@ -17,7 +17,7 @@ blocks = mz_blocks( rows, columns ); -walls = mz_walls(blocks, rows, columns, block_width); +walls = mz_square_walls(blocks, rows, columns, block_width); size = [columns * block_width, rows * block_width]; for(wall_pts = walls) { diff --git a/src/experimental/_impl/_mz_walls_impl.scad b/src/experimental/_impl/_mz_square_walls_impl.scad similarity index 89% rename from src/experimental/_impl/_mz_walls_impl.scad rename to src/experimental/_impl/_mz_square_walls_impl.scad index 102d46e2..6b8da732 100644 --- a/src/experimental/_impl/_mz_walls_impl.scad +++ b/src/experimental/_impl/_mz_square_walls_impl.scad @@ -1,6 +1,6 @@ use <_mz_comm.scad>; -function block_walls(block, block_width) = +function _square_walls(block, block_width) = let( loc = [get_x(block) - 1, get_y(block) - 1] * block_width, upper = upper_wall(block) || upper_right_wall(block) ? [[0, block_width] + loc, [block_width, block_width] + loc] : [], diff --git a/src/experimental/mz_walls.scad b/src/experimental/mz_square_walls.scad similarity index 65% rename from src/experimental/mz_walls.scad rename to src/experimental/mz_square_walls.scad index 3bbca650..7bca5851 100644 --- a/src/experimental/mz_walls.scad +++ b/src/experimental/mz_square_walls.scad @@ -1,6 +1,6 @@ -use <_impl/_mz_walls_impl.scad>; +use <_impl/_mz_square_walls_impl.scad>; -function mz_walls(blocks, rows, columns, block_width, left_border = true, bottom_border = true) = +function mz_square_walls(blocks, rows, columns, block_width, left_border = true, bottom_border = true) = let( left_walls = left_border ? [for(y = [0:rows - 1]) [[0, block_width * (y + 1)], [0, block_width * y]]] : [], buttom_walls = bottom_border ? [for(x = [0:columns - 1]) [[block_width * x, 0], [block_width * (x + 1), 0]]] : [] @@ -8,7 +8,7 @@ function mz_walls(blocks, rows, columns, block_width, left_border = true, bottom concat( [ for(block = blocks) - let(pts = block_walls(block, block_width)) + let(pts = _square_walls(block, block_width)) if(pts != []) pts ] , left_walls, buttom_walls