From 7dd839a8eb25bc9a7d91c1aad6821ebf57399163 Mon Sep 17 00:00:00 2001 From: nicopietroni Date: Wed, 5 Nov 2014 19:24:09 +0000 Subject: [PATCH] added namespacing --- wrap/miq/quadrangulator.h | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/wrap/miq/quadrangulator.h b/wrap/miq/quadrangulator.h index 35e37ecd..189814b3 100644 --- a/wrap/miq/quadrangulator.h +++ b/wrap/miq/quadrangulator.h @@ -14,6 +14,8 @@ #define precisionQ 0.0000000001 +namespace vcg { +namespace tri { template class Quadrangulator { @@ -138,7 +140,7 @@ private: { ScalarType minTolerance=precisionQ; //first add all eddge - for (int i=0;i2) { - assert(poly.size()==UVpoly.size()); + assert(poly.size()==UVpoly.size()); + std::reverse(poly.begin(),poly.end()); +// std::reverse(UVpoly.begin(),UVpoly.end()); + polygons.push_back(poly); UV.push_back(UVpoly); + } //only one polygon per initial face break; } } + } //FUNCTIONS NEEDED BY "UV WEDGE TO VERTEX" FILTER @@ -644,6 +651,9 @@ public: PolyMesh &Pmesh, std::vector< std::vector< short int> > &UV) { + UV.clear(); + Pmesh.Clear(); + TestIsProper(Tmesh); RoundInitial(Tmesh); @@ -722,7 +732,9 @@ public: } } + } }; - +} +} #endif