diff --git a/MathLib/EarClippingTriangulation.cpp b/GeoLib/EarClippingTriangulation.cpp similarity index 95% rename from MathLib/EarClippingTriangulation.cpp rename to GeoLib/EarClippingTriangulation.cpp index 115406c984ca78c676a318b156dd2ec0eb94192b..1b7fb302d0b23b1decb0999de3b8666f605849d5 100644 --- a/MathLib/EarClippingTriangulation.cpp +++ b/GeoLib/EarClippingTriangulation.cpp @@ -21,8 +21,8 @@ // MathLib #include "EarClippingTriangulation.h" -namespace MathLib { - +namespace MathLib +{ EarClippingTriangulation::EarClippingTriangulation(const GeoLib::Polygon* polygon, std::list<GeoLib::Triangle> &triangles, bool rot) { @@ -48,11 +48,11 @@ EarClippingTriangulation::EarClippingTriangulation(const GeoLib::Polygon* polygo it++; } } else { - std::size_t n_pnts (_pnts.size()-1); + std::size_t n_pnts (_pnts.size() - 1); while (it != _triangles.end()) { - const std::size_t i0 (polygon->getPointID (n_pnts-(*it)[0])); - const std::size_t i1 (polygon->getPointID (n_pnts-(*it)[1])); - const std::size_t i2 (polygon->getPointID (n_pnts-(*it)[2])); + const std::size_t i0 (polygon->getPointID (n_pnts - (*it)[0])); + const std::size_t i1 (polygon->getPointID (n_pnts - (*it)[1])); + const std::size_t i2 (polygon->getPointID (n_pnts - (*it)[2])); triangles.push_back (GeoLib::Triangle (ref_pnts_vec, i0, i1, i2)); it++; } @@ -70,7 +70,7 @@ EarClippingTriangulation::~EarClippingTriangulation() void EarClippingTriangulation::copyPolygonPoints (const GeoLib::Polygon* polygon) { // copy points - last point is identical to the first - std::size_t n_pnts (polygon->getNumberOfPoints()-1); + std::size_t n_pnts (polygon->getNumberOfPoints() - 1); for (std::size_t k(0); k < n_pnts; k++) { _pnts.push_back (new GeoLib::Point (*(polygon->getPoint(k)))); } @@ -98,7 +98,7 @@ void EarClippingTriangulation::ensureCWOrientation () { std::size_t n_pnts (_pnts.size()); // get the left most upper point - std::size_t min_x_max_y_idx (0); // for orientation check + std::size_t min_x_max_y_idx (0); // for orientation check for (std::size_t k(0); k<n_pnts; k++) { if ((*(_pnts[k]))[0] <= (*(_pnts[min_x_max_y_idx]))[0]) { if ((*(_pnts[k]))[0] < (*(_pnts[min_x_max_y_idx]))[0]) { diff --git a/MathLib/EarClippingTriangulation.h b/GeoLib/EarClippingTriangulation.h similarity index 86% rename from MathLib/EarClippingTriangulation.h rename to GeoLib/EarClippingTriangulation.h index 6f11da70dade3eeecded1dc5a945aaed703d4069..21a913b6b9a3e140a7be76406eaa3ac649fa03dd 100644 --- a/MathLib/EarClippingTriangulation.h +++ b/GeoLib/EarClippingTriangulation.h @@ -25,11 +25,14 @@ // MathLib #include "AnalyticalGeometry.h" -namespace MathLib { - -class EarClippingTriangulation { +namespace MathLib +{ +class EarClippingTriangulation +{ public: - EarClippingTriangulation(const GeoLib::Polygon* ply, std::list<GeoLib::Triangle> &triangles, bool rot = true); + EarClippingTriangulation(const GeoLib::Polygon* ply, + std::list<GeoLib::Triangle> &triangles, + bool rot = true); virtual ~EarClippingTriangulation(); private: /** @@ -60,7 +63,6 @@ private: GeoLib::Orientation _original_orient; }; - } // end namespace MathLib #endif /* EARCLIPPINGTRIANGULATION_H_ */