haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updated revision of polygon triangulation from 0a67dd3fdd 

This maintains the primary goal of ensuring that bad splits do not allow
the triangulation process to continue.  Instead, we boot this back up to
the top-level where we will simplify the polygon before triangulating
again.

Fixes https://gitlab.com/kicad/code/kicad/-/issues/16624

(cherry picked from commit f1dacf7d92)
This commit is contained in:
Seth Hillbrand 2024-01-18 11:05:45 -08:00
parent 22cebd8e71
commit 5878ac5aaf
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libs/kimath/include/geometry/polygon_triangulation.h
View File

@ -489,7 +489,7 @@ private:
}
// If we don't have any NULL triangles left, cut the polygon in two and try again
if ( !splitPolygon( aPoint ) )
if( !splitPolygon( aPoint ) )
return false;
break;
@ -662,9 +662,10 @@ private:
* Check if a segment joining two vertices lies fully inside the polygon.
* To do this, we first ensure that the line isn't along the polygon edge.
* Next, we know that if the line doesn't intersect the polygon, then it is
* either fully inside or fully outside the polygon. Finally, by checking whether
* the segment is enclosed by the local triangles, we distinguish between
* these two cases and no further checks are needed.
* either fully inside or fully outside the polygon. Next, we ensure that
* the proposed split is inside the local area of the polygon at both ends
* and the midpoint. Finally, we check to split creates two new polygons,
* each with positive area.
*/
bool goodSplit( const Vertex* a, const Vertex* b ) const
{
@ -710,9 +711,6 @@ private:
*/
bool intersects( const Vertex* p1, const Vertex* q1, const Vertex* p2, const Vertex* q2 ) const
{
if( ( *p1 == *q1 && *p2 == *q2 ) || ( *p1 == *q2 && *p2 == *q1 ) )
return true;
int sign1 = sign( area( p1, q1, p2 ) );
int sign2 = sign( area( p1, q1, q2 ) );
int sign3 = sign( area( p2, q2, p1 ) );