openscad/dotSCAD
1
0
Fork 0
mirror of https://github.com/JustinSDK/dotSCAD.git synced 2025-01-17 14:18:13 +01:00
Code Issues Releases Wiki Activity

refactor for adding a directions function

Browse Source
This commit is contained in:
Justin Lin 2022-08-27 16:19:09 +08:00
parent 2d5a38194a
commit 18d3757079
3 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/maze/_impl/_mz_square_cells_impl.scad
View File

@ -43,8 +43,8 @@ _rand_dir_table = [
[3, 2, 0, 1], [3, 2, 0, 1],
[3, 2, 1, 0] [3, 2, 1, 0]
]; ];
function rand_dirs(c, seed) = function rand_dirs(x, y, cells, seed) =
let(r = is_undef(seed) ? rands(0, 23, 1) : rands(0, 23, 1, c + seed)) let(r = is_undef(seed) ? rands(0, 23, 1) : rands(0, 23, 1, x + y * len(cells[0]) + seed))
_rand_dir_table[round(r[0])]; _rand_dir_table[round(r[0])];
// get x value by dir // get x value by dir
@ -91,17 +91,17 @@ function carve(dir, x, y, cells, rows, columns) =
/*dir 3*/ carve_bottom(x, y, cells, rows); /*dir 3*/ carve_bottom(x, y, cells, rows);
// go maze from (x, y) // go maze from (x, y)
function go_maze(x, y, cells, rows, columns, x_wrapping, y_wrapping, seed) = function go_maze(x, y, cells, rows, columns, x_wrapping, y_wrapping, directions, seed) =
let( let(
r_dirs = rand_dirs(x + y * columns, seed), r_dirs = directions(x, y, cells, seed),
nxcells0 = set_visited(x, y, cells), nxcells0 = set_visited(x, y, cells),
nxcells1 = next_cells(x, y, r_dirs[0], nxcells0, rows, columns, x_wrapping, y_wrapping, seed), nxcells1 = next_cells(x, y, r_dirs[0], nxcells0, rows, columns, x_wrapping, y_wrapping, directions, seed),
nxcells2 = next_cells(x, y, r_dirs[1], nxcells1, rows, columns, x_wrapping, y_wrapping, seed), nxcells2 = next_cells(x, y, r_dirs[1], nxcells1, rows, columns, x_wrapping, y_wrapping, directions, seed),
nxcells3 = next_cells(x, y, r_dirs[2], nxcells2, rows, columns, x_wrapping, y_wrapping, seed) nxcells3 = next_cells(x, y, r_dirs[2], nxcells2, rows, columns, x_wrapping, y_wrapping, directions, seed)
) )
next_cells(x, y, r_dirs[3], nxcells3, rows, columns, x_wrapping, y_wrapping, seed); next_cells(x, y, r_dirs[3], nxcells3, rows, columns, x_wrapping, y_wrapping, directions, seed);
function next_cells(x, y, dir, cells, rows, columns, x_wrapping, y_wrapping, seed) = function next_cells(x, y, dir, cells, rows, columns, x_wrapping, y_wrapping, directions, seed) =
let( let(
nx = next_x(x, dir, columns, x_wrapping), nx = next_x(x, dir, columns, x_wrapping),
ny = next_y(y, dir, rows, y_wrapping) ny = next_y(y, dir, rows, y_wrapping)
@ -113,5 +113,6 @@ function next_cells(x, y, dir, cells, rows, columns, x_wrapping, y_wrapping, see
carve(dir, x, y, cells, rows, columns), carve(dir, x, y, cells, rows, columns),
rows, columns, rows, columns,
x_wrapping, y_wrapping, x_wrapping, y_wrapping,
directions,
seed seed
); );

1
src/maze/mz_square.scad
View File

@ -24,5 +24,6 @@ function mz_square(rows, columns, start = [0, 0], init_cells, x_wrapping = false
len(mz[0]), len(mz[0]),
x_wrapping, x_wrapping,
y_wrapping, y_wrapping,
function(x, y, cells, seed) rand_dirs(x, y, cells, seed),
seed seed
); );

1
src/maze/mz_square_cells.scad
View File

@ -24,6 +24,7 @@ function mz_square_cells(rows, columns, start = [0, 0], init_cells, x_wrapping =
r, c, r, c,
x_wrapping, x_wrapping,
y_wrapping, y_wrapping,
function(x, y, cells, seed) rand_dirs(x, y, cells, seed),
seed seed
) )
) )