gpesquero/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

Robust triangles orientation checking in tesselator.

Browse source
This commit is contained in:
vng 2011-09-05 20:31:28 +03:00 • committed by Alex Zolotarev
parent a0cf3c1413
commit d67b4a84d9
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
indexer/tesselator.cpp
View file

@ -1,6 +1,8 @@
#include "tesselator.hpp"
#include "geometry_coding.hpp"
#include "../geometry/robust_orientation.hpp"
#include "../coding/writer.hpp"
#include "../base/assert.hpp"
@ -256,9 +258,9 @@ namespace tesselator
// When adding triangles, check that they all have identical orientation!
m2::PointD arrP[] = { m_points[arr[0]], m_points[arr[1]], m_points[arr[2]] };
double const cp = m2::CrossProduct(arrP[1] - arrP[0], arrP[2] - arrP[1]);
double const cp = m2::robust::OrientedS(arrP[0], arrP[1], arrP[2]);
if (fabs(cp) > 1.0E-4)
if (cp != 0.0)
{
bool const isCCW = (cp > 0.0);
@ -266,9 +268,9 @@ namespace tesselator
m_isCCW = (isCCW ? 1 : -1);
else
CHECK_EQUAL ( m_isCCW == 1, isCCW, () );
}
m_triangles.back().Add(arr);
m_triangles.back().Add(arr);
}
}
void TrianglesInfo::GetPointsInfo(m2::PointU const & baseP,