From a15965cd804bbd098772054516e6d36b496634a3 Mon Sep 17 00:00:00 2001
From: Thomas Fischer <thomas.fischer@ufz.de>
Date: Fri, 22 Feb 2013 15:22:53 +0100
Subject: [PATCH] Switched namespace for EarClippingTriangulation.
---
GeoLib/EarClippingTriangulation.cpp | 12 ++++++------
GeoLib/EarClippingTriangulation.h | 4 ++--
GeoLib/Surface.cpp | 13 +++++++------
3 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/GeoLib/EarClippingTriangulation.cpp b/GeoLib/EarClippingTriangulation.cpp
index 1b7fb302d0b..899ac17ffa0 100644
--- a/GeoLib/EarClippingTriangulation.cpp
+++ b/GeoLib/EarClippingTriangulation.cpp
@@ -12,16 +12,16 @@
*
*/
+// GeoLib
+#include "EarClippingTriangulation.h"
+
// STL
#include <vector>
// BaseLib
#include "uniqueInsert.h"
-// MathLib
-#include "EarClippingTriangulation.h"
-
-namespace MathLib
+namespace GeoLib
{
EarClippingTriangulation::EarClippingTriangulation(const GeoLib::Polygon* polygon,
std::list<GeoLib::Triangle> &triangles, bool rot)
@@ -79,7 +79,7 @@ void EarClippingTriangulation::copyPolygonPoints (const GeoLib::Polygon* polygon
void EarClippingTriangulation::rotate ()
{
// calculate supporting plane
- Vector plane_normal;
+ MathLib::Vector plane_normal;
double d;
// compute the plane normal
getNewellPlane(_pnts, plane_normal, d);
@@ -304,4 +304,4 @@ void EarClippingTriangulation::clipEars()
_triangles.push_back(GeoLib::Triangle(_pnts, *prev, *it, *next));
}
-} // end namespace MathLib
+} // end namespace GeoLib
diff --git a/GeoLib/EarClippingTriangulation.h b/GeoLib/EarClippingTriangulation.h
index 21a913b6b9a..a8dbcdb6635 100644
--- a/GeoLib/EarClippingTriangulation.h
+++ b/GeoLib/EarClippingTriangulation.h
@@ -25,7 +25,7 @@
// MathLib
#include "AnalyticalGeometry.h"
-namespace MathLib
+namespace GeoLib
{
class EarClippingTriangulation
{
@@ -63,6 +63,6 @@ private:
GeoLib::Orientation _original_orient;
};
-} // end namespace MathLib
+} // end namespace GeoLib
#endif /* EARCLIPPINGTRIANGULATION_H_ */
diff --git a/GeoLib/Surface.cpp b/GeoLib/Surface.cpp
index 186da2ae062..112475464f6 100644
--- a/GeoLib/Surface.cpp
+++ b/GeoLib/Surface.cpp
@@ -18,23 +18,23 @@
#include "logog/include/logog.hpp"
// GeoLib
-#include "Surface.h"
#include "AABB.h"
#include "Polygon.h"
+#include "Surface.h"
// MathLib
#include "AnalyticalGeometry.h"
#include "EarClippingTriangulation.h"
-namespace GeoLib {
-
+namespace GeoLib
+{
Surface::Surface (const std::vector<Point*> &pnt_vec) :
GeoObject(), _sfc_pnts(pnt_vec), _bv(nullptr)
{}
Surface::~Surface ()
{
- for (std::size_t k(0); k<_sfc_triangles.size(); k++)
+ for (std::size_t k(0); k < _sfc_triangles.size(); k++)
delete _sfc_triangles[k];
}
@@ -43,7 +43,8 @@ void Surface::addTriangle (std::size_t pnt_a, std::size_t pnt_b, std::size_t pnt
assert (pnt_a < _sfc_pnts.size() && pnt_b < _sfc_pnts.size() && pnt_c < _sfc_pnts.size());
// Check if two points of the triangle have identical IDs
- if (pnt_a == pnt_b || pnt_a == pnt_c || pnt_b == pnt_c) return;
+ if (pnt_a == pnt_b || pnt_a == pnt_c || pnt_b == pnt_c)
+ return;
_sfc_triangles.push_back (new Triangle(_sfc_pnts, pnt_a, pnt_b, pnt_c));
if (!_bv) {
@@ -80,7 +81,7 @@ Surface* Surface::createSurface(const Polyline &ply)
std::list<GeoLib::Triangle> triangles;
INFO("triangulation of surface: ... ");
- MathLib::EarClippingTriangulation(*simple_polygon_it, triangles);
+ GeoLib::EarClippingTriangulation(*simple_polygon_it, triangles);
INFO("\tdone - %d triangles", triangles.size());
// add Triangles to Surface
--
GitLab