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

geometry: SHAPE_LINE_CHAIN::Intersect should report each unique intersection only once

This commit is contained in:
Tomasz Wlostowski 2020-02-19 18:11:33 +01:00
parent 7b8fe9c1af
commit f8f21ea81c
1 changed files with 32 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
libs/kimath/src/geometry/shape_line_chain.cpp
View File

@ -33,8 +33,17 @@
#include <math/box2.h> // for BOX2I #include <math/box2.h> // for BOX2I
#include <math/util.h> // for rescale #include <math/util.h> // for rescale
#include <math/vector2d.h> // for VECTOR2, VECTOR2I #include <math/vector2d.h> // for VECTOR2, VECTOR2I
class SHAPE; class SHAPE;
SHAPE_LINE_CHAIN::SHAPE_LINE_CHAIN( const std::vector<int>& aV)
: SHAPE( SH_LINE_CHAIN ), m_closed( false ), m_width( 0 )
{
for(int i = 0; i < aV.size(); i+= 2 )
{
Append( aV[i], aV[i+1] );
}
}
ClipperLib::Path SHAPE_LINE_CHAIN::convertToClipper( bool aRequiredOrientation ) const ClipperLib::Path SHAPE_LINE_CHAIN::convertToClipper( bool aRequiredOrientation ) const
{ {
@ -478,6 +487,24 @@ int SHAPE_LINE_CHAIN::Intersect( const SEG& aSeg, INTERSECTIONS& aIp ) const
return aIp.size(); return aIp.size();
} }
static inline void addIntersection( SHAPE_LINE_CHAIN::INTERSECTIONS& aIps, int aPc, const SHAPE_LINE_CHAIN::INTERSECTION& aP )
{
if( aIps.size() == 0 )
{
aIps.push_back( aP );
return;
}
const auto& last = aIps.back();
if( ( (last.our.Index() + 1) % aPc) == aP.our.Index() && last.p == aP.p )
return;
if( last.our.Index() == aP.our.Index() && last.p == aP.p )
return;
aIps.push_back( aP );
}
int SHAPE_LINE_CHAIN::Intersect( const SHAPE_LINE_CHAIN& aChain, INTERSECTIONS& aIp ) const int SHAPE_LINE_CHAIN::Intersect( const SHAPE_LINE_CHAIN& aChain, INTERSECTIONS& aIp ) const
{ {
@ -501,10 +528,10 @@ int SHAPE_LINE_CHAIN::Intersect( const SHAPE_LINE_CHAIN& aChain, INTERSECTIONS&
is.our = a; is.our = a;
is.their = b; is.their = b;
if( a.Contains( b.A ) ) { is.p = b.A; aIp.push_back( is ); } if( a.Contains( b.A ) ) { is.p = b.A; addIntersection(aIp, PointCount(), is); }
if( a.Contains( b.B ) ) { is.p = b.B; aIp.push_back( is ); } if( a.Contains( b.B ) ) { is.p = b.B; addIntersection(aIp, PointCount(), is); }
if( b.Contains( a.A ) ) { is.p = a.A; aIp.push_back( is ); } if( b.Contains( a.A ) ) { is.p = a.A; addIntersection(aIp, PointCount(), is); }
if( b.Contains( a.B ) ) { is.p = a.B; aIp.push_back( is ); } if( b.Contains( a.B ) ) { is.p = a.B; addIntersection(aIp, PointCount(), is); }
} }
else else
{ {
@ -515,7 +542,7 @@ int SHAPE_LINE_CHAIN::Intersect( const SHAPE_LINE_CHAIN& aChain, INTERSECTIONS&
is.p = *p; is.p = *p;
is.our = a; is.our = a;
is.their = b; is.their = b;
aIp.push_back( is ); addIntersection(aIp, PointCount(), is);
} }
} }
} }