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

Fix actual-clearance handling in arc collision routines. 

Fixes https://gitlab.com/kicad/code/kicad/issues/8407
This commit is contained in:
Jeff Young 2021-06-03 16:50:25 +01:00
parent 49d65a0765
commit 53a75a4961
1 changed files with 72 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

108
libs/kimath/src/geometry/shape_collisions.cpp
View File

@ -407,15 +407,12 @@ static inline bool Collide( const SHAPE_RECT& aA, const SHAPE_SEGMENT& aB, int a
aA.Type(), aA.Type(),
aB.Type() ) ); aB.Type() ) );
if( aA.Collide( aB.GetSeg(), aClearance + aB.GetWidth() / 2, aActual, aLocation ) ) bool rv = aA.Collide( aB.GetSeg(), aClearance + aB.GetWidth() / 2, aActual, aLocation );
{
if( aActual )
*aActual = std::max( 0, *aActual - aB.GetWidth() / 2 );
return true; if( aActual )
} *aActual = std::max( 0, *aActual - aB.GetWidth() / 2 );
return false; return rv;
} }
@ -426,15 +423,12 @@ static inline bool Collide( const SHAPE_SEGMENT& aA, const SHAPE_SEGMENT& aB, in
aA.Type(), aA.Type(),
aB.Type() ) ); aB.Type() ) );
if( aA.Collide( aB.GetSeg(), aClearance + aB.GetWidth() / 2, aActual, aLocation ) ) bool rv = aA.Collide( aB.GetSeg(), aClearance + aB.GetWidth() / 2, aActual, aLocation );
{
if( aActual )
*aActual = std::max( 0, *aActual - aB.GetWidth() / 2 );
return true; if( aActual )
} *aActual = std::max( 0, *aActual - aB.GetWidth() / 2 );
return false; return rv;
} }
@ -445,15 +439,12 @@ static inline bool Collide( const SHAPE_LINE_CHAIN_BASE& aA, const SHAPE_SEGMENT
aA.Type(), aA.Type(),
aB.Type() ) ); aB.Type() ) );
if( aA.Collide( aB.GetSeg(), aClearance + aB.GetWidth() / 2, aActual, aLocation ) ) bool rv = aA.Collide( aB.GetSeg(), aClearance + aB.GetWidth() / 2, aActual, aLocation );
{
if( aActual )
*aActual = std::max( 0, *aActual - aB.GetWidth() / 2 );
return true; if( aActual )
} *aActual = std::max( 0, *aActual - aB.GetWidth() / 2 );
return false; return rv;
} }
@ -467,22 +458,34 @@ static inline bool Collide( const SHAPE_RECT& aA, const SHAPE_RECT& aB, int aCle
static inline bool Collide( const SHAPE_ARC& aA, const SHAPE_RECT& aB, int aClearance, static inline bool Collide( const SHAPE_ARC& aA, const SHAPE_RECT& aB, int aClearance,
int* aActual, VECTOR2I* aLocation, VECTOR2I* aMTV ) int* aActual, VECTOR2I* aLocation, VECTOR2I* aMTV )
{ {
int clearance = aClearance + ( aA.GetWidth() / 2 ); wxASSERT_MSG( !aMTV, wxString::Format( "MTV not implemented for %s : %s collisions",
aA.Type(),
aB.Type() ) );
const SHAPE_LINE_CHAIN lc = aA.ConvertToPolyline(); const SHAPE_LINE_CHAIN lc = aA.ConvertToPolyline();
return Collide( lc, aB.Outline(), clearance, aActual, aLocation, aMTV ); bool rv = Collide( lc, aB.Outline(), aClearance + aA.GetWidth() / 2, aActual, aLocation, aMTV );
if( rv && aActual )
*aActual = std::max( 0, *aActual - aA.GetWidth() / 2 );
return rv;
} }
static inline bool Collide( const SHAPE_ARC& aA, const SHAPE_CIRCLE& aB, int aClearance, static inline bool Collide( const SHAPE_ARC& aA, const SHAPE_CIRCLE& aB, int aClearance,
int* aActual, VECTOR2I* aLocation, VECTOR2I* aMTV ) int* aActual, VECTOR2I* aLocation, VECTOR2I* aMTV )
{ {
const SHAPE_LINE_CHAIN lc = aA.ConvertToPolyline(); wxASSERT_MSG( !aMTV, wxString::Format( "MTV not implemented for %s : %s collisions",
int clearance = aClearance + ( aA.GetWidth() / 2 ); aA.Type(),
bool rv = Collide( aB, lc, clearance, aActual, aLocation, aMTV ); aB.Type() ) );
if( rv && aMTV ) const SHAPE_LINE_CHAIN lc = aA.ConvertToPolyline();
*aMTV = - *aMTV ;
bool rv = Collide( aB, lc, aClearance + aA.GetWidth() / 2, aActual, aLocation, aMTV );
if( rv && aActual )
*aActual = std::max( 0, *aActual - aA.GetWidth() / 2 );
return rv; return rv;
} }
@ -491,41 +494,74 @@ static inline bool Collide( const SHAPE_ARC& aA, const SHAPE_CIRCLE& aB, int aCl
static inline bool Collide( const SHAPE_ARC& aA, const SHAPE_LINE_CHAIN& aB, int aClearance, static inline bool Collide( const SHAPE_ARC& aA, const SHAPE_LINE_CHAIN& aB, int aClearance,
int* aActual, VECTOR2I* aLocation, VECTOR2I* aMTV ) int* aActual, VECTOR2I* aLocation, VECTOR2I* aMTV )
{ {
int clearance = aClearance + ( aA.GetWidth() / 2 ); wxASSERT_MSG( !aMTV, wxString::Format( "MTV not implemented for %s : %s collisions",
aA.Type(),
aB.Type() ) );
const SHAPE_LINE_CHAIN lc = aA.ConvertToPolyline(); const SHAPE_LINE_CHAIN lc = aA.ConvertToPolyline();
return Collide( lc, aB, clearance, aActual, aLocation, aMTV ); bool rv = Collide( lc, aB, aClearance + aA.GetWidth() / 2, aActual, aLocation, aMTV );
if( rv && aActual )
*aActual = std::max( 0, *aActual - aA.GetWidth() / 2 );
return rv;
} }
static inline bool Collide( const SHAPE_ARC& aA, const SHAPE_SEGMENT& aB, int aClearance, static inline bool Collide( const SHAPE_ARC& aA, const SHAPE_SEGMENT& aB, int aClearance,
int* aActual, VECTOR2I* aLocation, VECTOR2I* aMTV ) int* aActual, VECTOR2I* aLocation, VECTOR2I* aMTV )
{ {
int clearance = aClearance + ( aA.GetWidth() / 2 ); wxASSERT_MSG( !aMTV, wxString::Format( "MTV not implemented for %s : %s collisions",
aA.Type(),
aB.Type() ) );
const SHAPE_LINE_CHAIN lc = aA.ConvertToPolyline(); const SHAPE_LINE_CHAIN lc = aA.ConvertToPolyline();
return Collide( lc, aB, clearance, aActual, aLocation, aMTV ); bool rv = Collide( lc, aB, aClearance + aA.GetWidth() / 2, aActual, aLocation, aMTV );
if( rv && aActual )
*aActual = std::max( 0, *aActual - aA.GetWidth() / 2 );
return rv;
} }
static inline bool Collide( const SHAPE_ARC& aA, const SHAPE_LINE_CHAIN_BASE& aB, int aClearance, static inline bool Collide( const SHAPE_ARC& aA, const SHAPE_LINE_CHAIN_BASE& aB, int aClearance,
int* aActual, VECTOR2I* aLocation, VECTOR2I* aMTV ) int* aActual, VECTOR2I* aLocation, VECTOR2I* aMTV )
{ {
int clearance = aClearance + ( aA.GetWidth() / 2 ); wxASSERT_MSG( !aMTV, wxString::Format( "MTV not implemented for %s : %s collisions",
aA.Type(),
aB.Type() ) );
const SHAPE_LINE_CHAIN lc = aA.ConvertToPolyline(); const SHAPE_LINE_CHAIN lc = aA.ConvertToPolyline();
return Collide( lc, aB, clearance, aActual, aLocation, aMTV ); bool rv = Collide( lc, aB, aClearance + aA.GetWidth() / 2, aActual, aLocation, aMTV );
if( rv && aActual )
*aActual = std::max( 0, *aActual - aA.GetWidth() / 2 );
return rv;
} }
static inline bool Collide( const SHAPE_ARC& aA, const SHAPE_ARC& aB, int aClearance, static inline bool Collide( const SHAPE_ARC& aA, const SHAPE_ARC& aB, int aClearance,
int* aActual, VECTOR2I* aLocation, VECTOR2I* aMTV ) int* aActual, VECTOR2I* aLocation, VECTOR2I* aMTV )
{ {
wxASSERT_MSG( !aMTV, wxString::Format( "MTV not implemented for %s : %s collisions",
aA.Type(),
aB.Type() ) );
const SHAPE_LINE_CHAIN lcA = aA.ConvertToPolyline(); const SHAPE_LINE_CHAIN lcA = aA.ConvertToPolyline();
const SHAPE_LINE_CHAIN lcB = aB.ConvertToPolyline(); const SHAPE_LINE_CHAIN lcB = aB.ConvertToPolyline();
int clearance = aClearance + ( aA.GetWidth() / 2 ) + ( aB.GetWidth() / 2 ); int widths = ( aA.GetWidth() / 2 ) + ( aB.GetWidth() / 2 );
return Collide( lcA, lcB, clearance, aActual, aLocation, aMTV ); bool rv = Collide( lcA, lcB, aClearance + widths, aActual, aLocation, aMTV );
if( rv && aActual )
*aActual = std::max( 0, *aActual - widths );
return rv;
} }