From 079f4e4cb477c41c792c8bb48e0b910bd4965803 Mon Sep 17 00:00:00 2001 From: Justin Lin Date: Tue, 8 Dec 2020 17:59:28 +0800 Subject: [PATCH] rename --- examples/maze/cylinder_maze.scad | 4 ++-- examples/maze/heart2heart_maze.scad | 4 ++-- examples/maze/heart_maze.scad | 4 ++-- examples/maze/maze_masking.scad | 4 ++-- examples/maze/mobius_maze.scad | 4 ++-- examples/maze/noisy_circle_maze.scad | 4 ++-- examples/maze/pyramid_hex_maze.scad | 4 ++-- examples/maze/regular_polygon_maze.scad | 4 ++-- examples/maze/sphere_maze.scad | 4 ++-- examples/maze/square_maze.scad | 4 ++-- src/maze/mz_hamiltonian.scad | 4 ++-- src/maze/{mz_blocks.scad => mz_square_blocks.scad} | 2 +- 12 files changed, 23 insertions(+), 23 deletions(-) rename src/maze/{mz_blocks.scad => mz_square_blocks.scad} (70%) diff --git a/examples/maze/cylinder_maze.scad b/examples/maze/cylinder_maze.scad index 31910088..b534d5f6 100644 --- a/examples/maze/cylinder_maze.scad +++ b/examples/maze/cylinder_maze.scad @@ -1,5 +1,5 @@ use ; -use ; +use ; use ; radius = 30; @@ -35,7 +35,7 @@ module cylinder_maze() { maze_rows = round(height / block_width); maze_columns = round(2 * 3.14159 * radius / block_width); - maze_blocks = mz_blocks( + maze_blocks = mz_square_blocks( [1, maze_rows], maze_rows, maze_columns, x_circular = true diff --git a/examples/maze/heart2heart_maze.scad b/examples/maze/heart2heart_maze.scad index a6f495cc..3123e610 100644 --- a/examples/maze/heart2heart_maze.scad +++ b/examples/maze/heart2heart_maze.scad @@ -1,6 +1,6 @@ use ; use ; -use ; +use ; names = ["Justin", "Monica"]; font_name = "Arial Black"; @@ -31,7 +31,7 @@ module heart_base(name, font_name, font_size, radius, ring_thickness, tip_r_of_h } module heart2heart_maze(names, font_name, font_size, radius_of_heart, tip_r_of_heart, wall_thickness, cblocks, levels, spacing) { - maze = mz_blocks( + maze = mz_square_blocks( [1, 1], cblocks, levels, y_circular = true ); diff --git a/examples/maze/heart_maze.scad b/examples/maze/heart_maze.scad index c9c1f6be..29162de2 100644 --- a/examples/maze/heart_maze.scad +++ b/examples/maze/heart_maze.scad @@ -2,7 +2,7 @@ use ; use ; use ; use ; -use ; +use ; use ; radius_of_heart = 12; @@ -106,7 +106,7 @@ module heart_maze(maze, radius, cblocks, levels, thickness = 1) { } } -maze = mz_blocks( +maze = mz_square_blocks( [1, 1], cblocks, levels, y_circular = true ); diff --git a/examples/maze/maze_masking.scad b/examples/maze/maze_masking.scad index 1c4f216b..a4ab6e18 100644 --- a/examples/maze/maze_masking.scad +++ b/examples/maze/maze_masking.scad @@ -1,4 +1,4 @@ -use ; +use ; use ; use ; use ; @@ -29,7 +29,7 @@ module maze_masking(start, mask, block_width, wall_thickness, wall_height, base_ rows = len(mask); columns = len(mask[0]); - blocks = mz_blocks( + blocks = mz_square_blocks( start, rows, columns, mz_initialize(mask = mask) diff --git a/examples/maze/mobius_maze.scad b/examples/maze/mobius_maze.scad index f90930ae..28481123 100644 --- a/examples/maze/mobius_maze.scad +++ b/examples/maze/mobius_maze.scad @@ -1,5 +1,5 @@ use ; -use ; +use ; use ; use ; @@ -14,7 +14,7 @@ leng = rows * block_width; radius = 0.5 * leng / PI; a_step = 360 / leng; -blocks = mz_blocks( +blocks = mz_square_blocks( [1, 1], rows, columns, y_circular = true diff --git a/examples/maze/noisy_circle_maze.scad b/examples/maze/noisy_circle_maze.scad index b9615689..3e595134 100644 --- a/examples/maze/noisy_circle_maze.scad +++ b/examples/maze/noisy_circle_maze.scad @@ -1,13 +1,13 @@ use ; 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; - blocks = mz_blocks( + blocks = mz_square_blocks( start, double_r_blocks, double_r_blocks ); diff --git a/examples/maze/pyramid_hex_maze.scad b/examples/maze/pyramid_hex_maze.scad index 8d1f2907..b7bb3d75 100644 --- a/examples/maze/pyramid_hex_maze.scad +++ b/examples/maze/pyramid_hex_maze.scad @@ -1,5 +1,5 @@ use ; -use ; +use ; use ; columns = 10; @@ -30,7 +30,7 @@ module pyramid_hex_maze(columns, cell_radius, wall_thickness) { pyramid_height = square_w / sqrt(2); - blocks = mz_blocks( + blocks = mz_square_blocks( [1, 1], rows, columns ); diff --git a/examples/maze/regular_polygon_maze.scad b/examples/maze/regular_polygon_maze.scad index 5847a961..b5cd94b1 100644 --- a/examples/maze/regular_polygon_maze.scad +++ b/examples/maze/regular_polygon_maze.scad @@ -1,6 +1,6 @@ use ; use ; -use ; +use ; use ; // only for creating a small maze @@ -49,7 +49,7 @@ module regular_polygon_maze(radius, cblocks, levels, thickness = 1, sides) { arc_angle = 360 / cblocks; r = radius / (levels + 1); - maze = mz_blocks( + maze = mz_square_blocks( [1, 1], cblocks, levels, y_circular = true ); diff --git a/examples/maze/sphere_maze.scad b/examples/maze/sphere_maze.scad index 3e70817c..b5351481 100644 --- a/examples/maze/sphere_maze.scad +++ b/examples/maze/sphere_maze.scad @@ -1,5 +1,5 @@ use ; -use ; +use ; use ; use ; @@ -51,7 +51,7 @@ module sphere_maze() { size = [rows * block_width, columns * block_width + pole_offset * 2]; - blocks = mz_blocks( + blocks = mz_square_blocks( [1, 1], rows, columns, y_circular = true diff --git a/examples/maze/square_maze.scad b/examples/maze/square_maze.scad index 79759fb8..abf9c87d 100644 --- a/examples/maze/square_maze.scad +++ b/examples/maze/square_maze.scad @@ -1,8 +1,8 @@ -use ; +use ; use ; module square_maze(start, rows, block_width, wall_thickness) { - blocks = mz_blocks( + blocks = mz_square_blocks( start, rows, rows ); diff --git a/src/maze/mz_hamiltonian.scad b/src/maze/mz_hamiltonian.scad index 73fd86ae..5f153cce 100644 --- a/src/maze/mz_hamiltonian.scad +++ b/src/maze/mz_hamiltonian.scad @@ -1,12 +1,12 @@ use <_impl/_mz_hamiltonian_impl.scad>; -use ; +use ; use ; use <../util/sort.scad>; use <../util/dedup.scad>; function mz_hamiltonian(rows, columns, start, seed) = let( - blocks = mz_blocks( + blocks = mz_square_blocks( [1, 1], rows, columns, seed = seed diff --git a/src/maze/mz_blocks.scad b/src/maze/mz_square_blocks.scad similarity index 70% rename from src/maze/mz_blocks.scad rename to src/maze/mz_square_blocks.scad index d68120a2..9c840901 100644 --- a/src/maze/mz_blocks.scad +++ b/src/maze/mz_square_blocks.scad @@ -1,7 +1,7 @@ use <_impl/_mz_blocks_impl.scad>; use ; -function mz_blocks(start, rows, columns, maze, x_circular = false, y_circular = false, seed) = +function mz_square_blocks(start, rows, columns, maze, x_circular = false, y_circular = false, seed) = go_maze( start[0], start[1], // starting point is_undef(maze) ? mz_initialize(rows, columns) : maze,