grey/BOSL2
1
0
Fork 0
mirror of https://github.com/BelfrySCAD/BOSL2.git synced 2025-01-01 09:49:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

add fix for duplicate points in polygon_triangulation

Browse source
This commit is contained in:
Adrian Mariano 2021-09-13 22:23:20 -04:00
parent 5a4d9554df
commit 2ea90b7467
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
geometry.scad
View file

@ -1455,8 +1455,9 @@ function point_in_polygon(point, poly, nonzero=false, eps=EPSILON) =
// are considered as vertices of the polygon. // are considered as vertices of the polygon.
// . // .
// The function may issue an error if it finds that the polygon is not simple // The function may issue an error if it finds that the polygon is not simple
// (self-intersecting) or its vertices are collinear. An error may also be issued // (self-intersecting) or its vertices are collinear. It can work for 3d non-planar polygons
// for 3d non planar polygons. // if they are close enough to planar but may otherwise issue an error for this case.
// .
// For 2d polygons, the output triangles will have the same winding (CW or CCW) of // For 2d polygons, the output triangles will have the same winding (CW or CCW) of
// the input polygon. For 3d polygons, the triangle windings will induce a normal // the input polygon. For 3d polygons, the triangle windings will induce a normal
// vector with the same direction of the polygon normal. // vector with the same direction of the polygon normal.
@ -1485,7 +1486,7 @@ function polygon_triangulation(poly, ind, eps=EPSILON) =
assert(is_undef(ind) assert(is_undef(ind)
|| (is_vector(ind) && min(ind)>=0 && max(ind)<len(poly) ), || (is_vector(ind) && min(ind)>=0 && max(ind)<len(poly) ),
"Improper or out of bounds list of indices") "Improper or out of bounds list of indices")
let( ind = is_undef(ind) ? count(len(poly)) : ind ) let( ind = deduplicate_indexed(poly,is_undef(ind) ? count(len(poly)) : ind) )
len(poly[ind[0]]) == 3 len(poly[ind[0]]) == 3
? // represents the polygon projection on its plane as a 2d polygon ? // represents the polygon projection on its plane as a 2d polygon
let( let(
@ -1502,7 +1503,7 @@ function polygon_triangulation(poly, ind, eps=EPSILON) =
prpts = pts*transpose([v1,v2]) prpts = pts*transpose([v1,v2])
) )
[for(tri=_triangulate(prpts, count(len(ind)), eps)) select(ind,tri) ] [for(tri=_triangulate(prpts, count(len(ind)), eps)) select(ind,tri) ]
: let( cw = polygon_is_clockwise(select(poly, ind)) ) : let( cw = is_polygon_clockwise(select(poly, ind)) )
cw cw
? [for(tri=_triangulate( poly, reverse(ind), eps )) reverse(tri) ] ? [for(tri=_triangulate( poly, reverse(ind), eps )) reverse(tri) ]
: _triangulate( poly, ind, eps ); : _triangulate( poly, ind, eps );