openscad/dotSCAD
1
0
Fork 0
mirror of https://github.com/JustinSDK/dotSCAD.git synced 2025-09-26 06:19:12 +02:00
Code Issues Releases Wiki Activity

fix sample nbrs error

Browse Source
This commit is contained in:
Justin Lin
2022-04-19 11:05:51 +08:00
parent 68e7b5d517
commit ac0e57f91b
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/experimental/_impl/_tiles_wfc_impl.scad
View File

@@ -124,10 +124,10 @@ function _coord_entropy_weights(coord_entropy_weights_lt, leng, m, i = 1) =
- tilemap_wf(tm) - tilemap_wf(tm)
*/ */
function tilemap(width, height, sample, nbr_dirs) = [ function tilemap(width, height, sample) = [
width, width,
height, height,
compatibilities_of_tiles(sample, nbr_dirs), compatibilities_of_tiles(sample),
wave_function(width, height, weights_of_tiles(sample)) wave_function(width, height, weights_of_tiles(sample))
]; ];
@@ -198,11 +198,11 @@ function neighbor_dirs(x, y, width, height) = [
if(y < height - 1) [ 0, 1] // bottom if(y < height - 1) [ 0, 1] // bottom
]; ];
function neighbor_compatibilities(sample, x, y, nbr_dirs) = function neighbor_compatibilities(sample, x, y, width, height) =
let(me = sample[y][x]) let(me = sample[y][x])
[for(dir = nbr_dirs[y][x]) [me, sample[y + dir.y][x + dir.x], dir]]; [for(dir = neighbor_dirs(x, y, width, height)) [me, sample[y + dir.y][x + dir.x], dir]];
function compatibilities_of_tiles(sample, nbr_dirs) = function compatibilities_of_tiles(sample) =
let( let(
width = len(sample[0]), width = len(sample[0]),
height = len(sample), height = len(sample),
@@ -210,7 +210,7 @@ function compatibilities_of_tiles(sample, nbr_dirs) =
) )
hashset_elems(hashset([ hashset_elems(hashset([
for(y = [0:height - 1], x = rx) for(y = [0:height - 1], x = rx)
each neighbor_compatibilities(sample, x, y, nbr_dirs) each neighbor_compatibilities(sample, x, y, width, height)
], number_of_buckets = width * height)); ], number_of_buckets = width * height));
function collapsed_tiles(wf) = function collapsed_tiles(wf) =

2
src/experimental/tile_wfc.scad
View File

@@ -10,7 +10,7 @@ function tile_wfc(size, sample) =
for(y = [0:h - 1]) for(y = [0:h - 1])
[for(x = [0:w - 1]) neighbor_dirs(x, y, w, h)] [for(x = [0:w - 1]) neighbor_dirs(x, y, w, h)]
], ],
tm = tilemap(w, h, sample, nbr_dirs), tm = tilemap(w, h, sample),
// random start // random start
x = floor(rand(w * 0.25, w * 0.75)), x = floor(rand(w * 0.25, w * 0.75)),
y = floor(rand(h * 0.25, h * 0.75)), y = floor(rand(h * 0.25, h * 0.75)),