openscad/BOSL2
1
0
Fork 0
mirror of https://github.com/revarbat/BOSL2.git synced 2025-08-17 21:51:45 +02:00
Code Issues Projects Releases Wiki Activity

resolved closed true/false behavior

Browse Source
This commit is contained in:
Alex Matulich
2025-03-22 23:52:45 -07:00
parent 0f3516d6d1
commit 14e89a3a09
1 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
isosurface.scad
View File

@@ -1080,15 +1080,16 @@ function _contour_pixels(pixsize, bbox, fieldarray, fieldfunc, pixcenters, isova
nx = len(field)-2, nx = len(field)-2,
ny = len(field[0])-2, ny = len(field[0])-2,
v0 = bbox[0] v0 = bbox[0]
) [ ) let(isocorrect = sign(isovalue)*max(abs(isovalue)*1.000001, isovalue+0.0000001)) [
for(i=[0:nx]) let(x=v0.x+pixsize.x*i) for(i=[0:nx]) let(x=v0.x+pixsize.x*i)
for(j=[0:ny]) let(y=v0.y+pixsize.y*j) for(j=[0:ny]) let(y=v0.y+pixsize.y*j)
let(i1=i+1, j1=j+1, let(i1=i+1, j1=j+1,
pf = let( pf = let(
f0=min(1e9,max(-1e9,field[i][j])), // clamp corner values to ±1e9, make sure no corner=isovalue
f1=min(1e9,max(-1e9,field[i][j1])), f0=let(c=min(1e9,max(-1e9,field[i][j]))) abs(c-isovalue)<EPSILON ? isocorrect : c,
f2=min(1e9,max(-1e9,field[i1][j])), f1=let(c=min(1e9,max(-1e9,field[i][j1]))) abs(c-isovalue)<EPSILON ? isocorrect : c,
f3=min(1e9,max(-1e9,field[i1][j1])) f2=let(c=min(1e9,max(-1e9,field[i1][j]))) abs(c-isovalue)<EPSILON ? isocorrect : c,
f3=let(c=min(1e9,max(-1e9,field[i1][j1]))) abs(c-isovalue)<EPSILON ? isocorrect : c
) [ // pixel corner field values ) [ // pixel corner field values
f0, f1, f2, f3, f0, f1, f2, f3,
// get center value of pixel // get center value of pixel
@@ -1153,7 +1154,8 @@ function _contour_vertices(pxlist, pxsize, isoval, segtable=_MTriSegmentTable) =
function _assemble_partial_paths(paths,closed=false,eps=EPSILON) = function _assemble_partial_paths(paths,closed=false,eps=EPSILON) =
let( let(
pathlist = _assemble_partial_paths_recur(paths), pathlist = _assemble_partial_paths_recur(paths) /*,
// this eliminates crossing paths - commented out now that it's no longer possible for the input segments to cross
splitpaths = splitpaths =
[for(path=pathlist) each [for(path=pathlist) each
let( let(
@@ -1167,9 +1169,10 @@ function _assemble_partial_paths(paths,closed=false,eps=EPSILON) =
) )
len(fragments)==1 ? fragments len(fragments)==1 ? fragments
: _assemble_path_fragments(fragments) : _assemble_path_fragments(fragments)
] ]*/
) )
[for(path=splitpaths) list_unwrap(path)]; //[for(path=splitpaths) list_unwrap(path)];
closed ? [for(path=pathlist) list_unwrap(path)] : pathlist;
function _assemble_partial_paths_recur(edges, paths=[],i=0) = function _assemble_partial_paths_recur(edges, paths=[],i=0) =
@@ -1184,8 +1187,8 @@ function _assemble_partial_paths_recur(edges, paths=[],i=0) =
update_path = left==[] && right==[] ? edges[i] update_path = left==[] && right==[] ? edges[i]
: left==[] ? concat(list_head(edges[i]),paths[right[0]]) : left==[] ? concat(list_head(edges[i]),paths[right[0]])
: right==[] ? concat(paths[left[0]],slice(edges[i],1,-1)) : right==[] ? concat(paths[left[0]],slice(edges[i],1,-1))
: left[0] != right[0] ? concat(paths[left[0]], paths[right[0]]) : left[0] != right[0] ? concat(paths[left[0]],slice(edges[i],1,-2), paths[right[0]])
: concat(paths[left[0]], slice(edges[i],1,-1)) // last arg should be -2 to avoid duplicating endpoints on closed path : concat(paths[left[0]], slice(edges[i],1,-1)) // last arg -2 removes duplicate endpoints but this is handled in passthrough function
) )
_assemble_partial_paths_recur(edges, concat(keep_path, [update_path]), i+1); _assemble_partial_paths_recur(edges, concat(keep_path, [update_path]), i+1);
@@ -3609,7 +3612,7 @@ function _region_smooth(reg, passes, bbox, count=0) =
count >= passes ? reg : count >= passes ? reg :
let(sm = [ let(sm = [
for(r=reg) let( for(r=reg) let(
n=len(r), n = r[0]==last(r) ? len(r)-1 : len(r),
pb = [for(i=[0:n-1]) _is_pt_on_bbox(r[i],bbox)] pb = [for(i=[0:n-1]) _is_pt_on_bbox(r[i],bbox)]
) [ ) [
for(i=[0:n-1]) let(j=(i+1)%n) each [ for(i=[0:n-1]) let(j=(i+1)%n) each [