From 07ee15da1c3d9597ae327a87548449b3be9ddbe3 Mon Sep 17 00:00:00 2001 From: Justin Lin Date: Mon, 21 Mar 2022 17:43:16 +0800 Subject: [PATCH] refactor --- src/experimental/_impl/_tiles_wfc_impl.scad | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/experimental/_impl/_tiles_wfc_impl.scad b/src/experimental/_impl/_tiles_wfc_impl.scad index 0263bf03..e2020b63 100644 --- a/src/experimental/_impl/_tiles_wfc_impl.scad +++ b/src/experimental/_impl/_tiles_wfc_impl.scad @@ -113,7 +113,7 @@ function wf_coord_weights_min_entropy(wf, notCollaspedCoords) = sorted = sort([ for(coord = notCollaspedCoords) let(x = coord.x, y = coord.y) - [x, y, wf_entropy_weights(wf, coord.x, coord.y)] + [x, y, wf_entropy_weights(wf, x, y)] ], by = function(a, b) a[2][0] - b[2][0]) ) [sorted[0].x, sorted[0].y, sorted[0][2][1]]; @@ -139,9 +139,6 @@ function tilemap_height(tm) = tm[1]; function tilemap_compatibilities(tm) = tm[2]; function tilemap_wf(tm) = tm[3]; -function check_compatibilities(compatibilities, tile1, tile2, direction) = - hashset_has(compatibilities, [tile1, tile2, direction]); - function propagate(w, h, compatibilities, wf, x, y) = _propagate( w, @@ -237,7 +234,7 @@ function collapsed_tiles(wf) = ]; function compatible_nbr_tile(compatibilities, current_tiles, nbr_tile, dir) = - some(current_tiles, function(tile) check_compatibilities(compatibilities, tile, nbr_tile, dir)); + some(current_tiles, function(tile) hashset_has(compatibilities, [tile, nbr_tile, dir])); function create_stack(elem) = [elem, []]; function stack_push(stack, elem) = [elem, stack];