Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

AP_Math: Polygon_intersects handles unclosed polygons

This commit is contained in:
Randy Mackay 2019-07-06 16:44:03 +09:00 committed by Tom Pittenger
parent 7441dcddfa
commit 614b0f6dc8
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libraries/AP_Math/polygon.cpp
View File

@ -132,10 +132,21 @@ template bool Polygon_complete<float>(const Vector2f *V, unsigned n);
*/
bool Polygon_intersects(const Vector2f *V, unsigned N, const Vector2f &p1, const Vector2f &p2, Vector2f &intersection)
{
const bool complete = Polygon_complete(V, N);
if (complete) {
// if the last point is the same as the first point
// treat as if the last point wasn't passed in
N--;
}
float intersect_dist_sq = FLT_MAX;
for (uint8_t i=0; i<N-1; i++) {
for (uint8_t i=0; i<N; i++) {
uint8_t j = i+1;
if (j >= N) {
j = 0;
}
const Vector2f &v1 = V[i];
const Vector2f &v2 = V[i+1];
const Vector2f &v2 = V[j];
// optimisations for common cases
if (v1.x > p1.x && v2.x > p1.x && v1.x > p2.x && v2.x > p2.x) {
continue;