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

slightly improved run time of vnf_tri_array()

Browse Source
This commit is contained in:
Alex Matulich
2025-08-09 14:23:08 -07:00
parent 0fdf90938e
commit 8287f63c62
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
vnf.scad
View File

@@ -598,31 +598,31 @@ function vnf_tri_array(
// append first vertex of each polygon to its end if wrapping columns // append first vertex of each polygon to its end if wrapping columns
st = col_wrap ? [ st = col_wrap ? [
for(i=[0:plen-1]) for(i=[0:plen-1])
points[i][0] != points[i][len(points[i])-1] points[i][0] != points[i][len(points[i])-1]
? concat(points[i], [points[i][0]]) ? concat(points[i], [points[i][0]])
: points[i] : points[i]
] : points, ] : points,
addcol = col_wrap ? len(st[0])-len(points[0]) : 0, addcol = col_wrap ? len(st[0])-len(points[0]) : 0,
rowstarts = [ for(i=[0:plen-1]) len(st[i]) ], rowstarts = [ for(i=[0:plen-1]) len(st[i]) ],
capfirst = first_defined([cap1,caps,false]), capfirst = first_defined([cap1,caps,false]),
caplast = first_defined([cap2,caps,false]), caplast = first_defined([cap2,caps,false]),
pcumlen = [0, each cumsum(rowstarts)], pcumlen = [0, each cumsum(rowstarts)],
faces = flatten([ faces = [
// close first end // close first end
if (capfirst) if (capfirst)
if (reverse) [[ for(i=[0:rowstarts[0]-1-addcol]) i ]] if (reverse) [ for(i=[0:rowstarts[0]-1-addcol]) i ]
else [[ for(i=[rowstarts[0]-1-addcol:-1:0]) i ]], else [ for(i=[rowstarts[0]-1-addcol:-1:0]) i ],
// triangulate between the two polygons // triangulate between the two polygons
for(i = [0:plen-2+(row_wrap?1:0)]) for(i = [0:plen-2+(row_wrap?1:0)])
let( let(
j = (i+1)%plen, j = (i+1)%plen,
max_extra_edges = limit_bunching ? max(1, abs(len(st[i])-len(st[j]))) : INF max_extra_edges = limit_bunching ? max(1, abs(len(st[i])-len(st[j]))) : INF
) _lofttri(st[i], st[j], pcumlen[i], pcumlen[j], rowstarts[i], rowstarts[j], reverse, trimax=max_extra_edges), ) each _lofttri(st[i], st[j], pcumlen[i], pcumlen[j], rowstarts[i], rowstarts[j], reverse, trimax=max_extra_edges),
// close up the last end // close up the last end
if (caplast) if (caplast)
if (reverse) [[ for(i=[pcumlen[plen]-1-addcol:-1:pcumlen[plen-1]]) i ]] if (reverse) [ for(i=[pcumlen[plen]-1-addcol:-1:pcumlen[plen-1]]) i ]
else [[ for(i=[pcumlen[plen-1]:pcumlen[plen]-1-addcol]) i ]] else [ for(i=[pcumlen[plen-1]:pcumlen[plen]-1-addcol]) i ]
]), ],
vnf = [flatten(st), faces] vnf = [flatten(st), faces]
) col_wrap ? vnf_merge_points(vnf) : vnf; ) col_wrap ? vnf_merge_points(vnf) : vnf;