Commit 1129550d authored by untereiner's avatar untereiner
Browse files

supp unsewArroundVertex

parent cca8d75d
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
#include <iostream> #include <iostream>
//#define WITH_GMAP 1 #define WITH_GMAP 1
#include "Topology/generic/parameters.h" #include "Topology/generic/parameters.h"
#ifdef WITH_GMAP #ifdef WITH_GMAP
......
...@@ -30,11 +30,11 @@ ...@@ -30,11 +30,11 @@
#define WITH_GMAP 0 #define WITH_GMAP 0
#include "Topology/generic/parameters.h" #include "Topology/generic/parameters.h"
//#ifdef WITH_GMAP #ifdef WITH_GMAP
// #include "Topology/gmap/embeddedGMap3.h" #include "Topology/gmap/embeddedGMap3.h"
//#else #else
#include "Topology/map/embeddedMap3.h" #include "Topology/map/embeddedMap3.h"
//#endif #endif
#include "Geometry/vector_gen.h" #include "Geometry/vector_gen.h"
#include "Algo/Geometry/boundingbox.h" #include "Algo/Geometry/boundingbox.h"
...@@ -65,11 +65,11 @@ using namespace CGoGN ; ...@@ -65,11 +65,11 @@ using namespace CGoGN ;
struct PFP: public PFP_STANDARD struct PFP: public PFP_STANDARD
{ {
// definition de la carte // definition de la carte
//#ifdef WITH_GMAP #ifdef WITH_GMAP
// typedef EmbeddedGMap3 MAP; typedef EmbeddedGMap3 MAP;
//#else #else
typedef EmbeddedMap3 MAP; typedef EmbeddedMap3 MAP;
//#endif #endif
}; };
......
...@@ -241,12 +241,6 @@ public: ...@@ -241,12 +241,6 @@ public:
*/ */
void insertTrianglePair(Dart d, Dart v1, Dart v2) ; void insertTrianglePair(Dart d, Dart v1, Dart v2) ;
/**
* Unsew the faces of the umbrella of the vertex of d
* @param d a dart from the vertex
*/
void unsewAroundVertex(Dart d) ;
//! Merge two volumes along two faces. //! Merge two volumes along two faces.
/*! Works only if the two faces have the same number of edges. /*! Works only if the two faces have the same number of edges.
* The faces adjacent to the two given faces are pairwise sewed * The faces adjacent to the two given faces are pairwise sewed
......
...@@ -263,12 +263,6 @@ public: ...@@ -263,12 +263,6 @@ public:
*/ */
void insertTrianglePair(Dart d, Dart v1, Dart v2) ; void insertTrianglePair(Dart d, Dart v1, Dart v2) ;
/**
* Unsew the faces of the umbrella of the vertex of d
* @param d a dart from the vertex
*/
void unsewAroundVertex(Dart d) ;
//! Merge two volumes along two faces. //! Merge two volumes along two faces.
/*! Works only if the two faces have the same number of edges. /*! Works only if the two faces have the same number of edges.
* The faces adjacent to the two given faces are pairwise sewed * The faces adjacent to the two given faces are pairwise sewed
......
...@@ -532,25 +532,6 @@ void GMap2::insertTrianglePair(Dart d, Dart v1, Dart v2) ...@@ -532,25 +532,6 @@ void GMap2::insertTrianglePair(Dart d, Dart v1, Dart v2)
beta2sew(beta0(phi1(e)), vv2) ; beta2sew(beta0(phi1(e)), vv2) ;
} }
void GMap2::unsewAroundVertex(Dart d)
{
Dart it = d ;
do
{
Dart temp = phi1(it) ;
Dart e_1 = phi_1(it) ;
do
{
unsewFaces(temp) ;
temp = phi1(temp) ;
} while(temp != e_1);
it = alpha1(it);
}
while(it != d);
}
bool GMap2::mergeVolumes(Dart d, Dart e) bool GMap2::mergeVolumes(Dart d, Dart e)
{ {
assert(!isBoundaryMarked(d) && !isBoundaryMarked(e)) ; assert(!isBoundaryMarked(d) && !isBoundaryMarked(e)) ;
......
...@@ -466,25 +466,6 @@ void Map2::insertTrianglePair(Dart d, Dart v1, Dart v2) ...@@ -466,25 +466,6 @@ void Map2::insertTrianglePair(Dart d, Dart v1, Dart v2)
phi2sew(phi1(e), vv2) ; phi2sew(phi1(e), vv2) ;
} }
void Map2::unsewAroundVertex(Dart d)
{
Dart it = d ;
do
{
Dart temp = phi1(it) ;
Dart e_1 = phi_1(it) ;
do
{
unsewFaces(temp) ;
temp = phi1(temp) ;
} while(temp != e_1);
it = alpha1(it);
}
while(it != d);
}
bool Map2::mergeVolumes(Dart d, Dart e) bool Map2::mergeVolumes(Dart d, Dart e)
{ {
assert(!isBoundaryMarked(d) && !isBoundaryMarked(e)) ; assert(!isBoundaryMarked(d) && !isBoundaryMarked(e)) ;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment