modif rendu

Apps/Tuto/tuto1.cpp

@@ -168,7 +168,8 @@ int main(int argc, char **argv)
 	sqt.m_positionVBO->updateData(position);
 
 	// update des primitives du renderer
-	SelectorTrue allDarts;
+//	SelectorTrue allDarts;
+	SelectorNoBoundary<PFP::MAP> allDarts;
 	sqt.m_render->initPrimitives<PFP>(myMap, allDarts, Algo::Render::GL2::TRIANGLES);
 	sqt.m_render->initPrimitives<PFP>(myMap, allDarts, Algo::Render::GL2::LINES);
 

include/Topology/generic/functor.h

@@ -76,6 +76,18 @@ public:
 	bool operator()(Dart) const { return false; }
 };
 
+
+template <typename MAP>
+class SelectorNoBoundary : public FunctorSelect
+{
+public:
+protected:
+	MAP& m_map;
+public:
+	SelectorNoBoundary(MAP& m): m_map(m) {}
+	bool operator()(Dart d) const { return !m_map.isBoundaryMarked(d); }
+};
+
 // Counting Functors : increment its value every time it is applied
 /********************************************************/
 

include/Topology/generic/genericmap.h

@@ -437,6 +437,7 @@ protected:
 	 * clear all boundary markers
 	 */
 	void boundaryUnmarkAll();
+
 } ;
 
 

src/Topology/map/map2.cpp

@@ -35,8 +35,8 @@ void Map2::mergeBoundaryFaces(Dart dd, Dart ee)
 {
 	if (ee != phi_1(dd))
 		phi1sew(ee, phi_1(dd)) ;
-	if (ee != phi_1(dd))
-		phi1sew(ee, phi_1(dd)) ;
+	if (dd != phi_1(ee))
+		phi1sew(dd, phi_1(ee)) ;
 	Map1::deleteOrientedFace(dd) ;
 }