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

Handle closed shape-line-chain with circle collisions.

This commit is contained in:
Jeff Young 2020-10-04 19:14:16 +01:00
parent 8c09f28b28
commit 8dd7777108
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -34,7 +34,6 @@
#include <geometry/shape_circle.h> #include <geometry/shape_circle.h>
#include <geometry/shape_rect.h> #include <geometry/shape_rect.h>
#include <geometry/shape_segment.h> #include <geometry/shape_segment.h>
#include <geometry/shape_simple.h>
#include <geometry/shape_compound.h> #include <geometry/shape_compound.h>
#include <math/vector2d.h> #include <math/vector2d.h>
@ -192,6 +191,13 @@ static inline bool Collide( const SHAPE_CIRCLE& aA, const SHAPE_LINE_CHAIN_BASE&
} }
} }
if( aB.IsClosed() && aB.PointInside( aA.GetCenter() ) )
{
closest_dist = 0;
nearest = aA.GetCenter();
}
if( closest_dist == 0 || closest_dist < aClearance ) if( closest_dist == 0 || closest_dist < aClearance )
{ {
if( aLocation ) if( aLocation )
@ -291,17 +297,6 @@ static inline bool Collide( const SHAPE_RECT& aA, const SHAPE_LINE_CHAIN_BASE& a
{ {
// TODO: why doesn't this handle MTV? // TODO: why doesn't this handle MTV?
if( aB.IsClosed() && aB.PointInside( aA.Centre() ) )
{
if( aLocation )
*aLocation = aA.Centre();
if( aActual )
*aActual = 0;
return true;
}
int closest_dist = INT_MAX; int closest_dist = INT_MAX;
VECTOR2I nearest; VECTOR2I nearest;
@ -325,6 +320,12 @@ static inline bool Collide( const SHAPE_RECT& aA, const SHAPE_LINE_CHAIN_BASE& a
} }
} }
if( aB.IsClosed() && aB.PointInside( aA.Centre() ) )
{
nearest = aA.Centre();
closest_dist = 0;
}
if( closest_dist == 0 || closest_dist < aClearance ) if( closest_dist == 0 || closest_dist < aClearance )
{ {
if( aLocation ) if( aLocation )