update some include paths

Apps/Tuto/Traversals/show_traversors.cpp

@@ -34,7 +34,7 @@
 #include "Algo/Render/GL2/topo3Render.h"
 #include "Algo/Render/SVG/mapSVGRender.h"
 
-#include "Topology/generic/traversorFactory.h"
+#include "Topology/generic/traversor/traversorFactory.h"
 
 #include "Algo/Render/GL2/drawerCells.h"
 

include/Topology/generic/cells.h

@@ -25,13 +25,11 @@
 #ifndef CELLS_H_
 #define CELLS_H_
 
-#include "dart.h"
-
+#include "Topology/generic/dart.h"
 
 namespace CGoGN
 {
 
-
 /**
  * class for cellular typing
  *
@@ -44,16 +42,22 @@ class Cell
 {
 public:
 	Dart dart;
-	/// emoty construtor
+
+	/// empty construtor
 	Cell(): dart() {}
+
 	/// construtor from Dart
 	inline Cell(Dart d): dart(d) {}
+
 	/// copy constructor
 	inline Cell(const Cell<ORBIT>& c): dart(c.dart) {}
+
 	/// Dart cast operator
-	inline operator Dart() const {return dart;}
+	inline operator Dart() const { return dart; }
+
 	friend std::ostream& operator<<( std::ostream &out, const Cell<ORBIT>& fa ) { return out << fa.dart; }
-	inline bool valid() const { return !dart.isNil();}
+
+	inline bool valid() const { return !dart.isNil(); }
 };
 
 typedef Cell<VERTEX> Vertex;
@@ -61,7 +65,6 @@ typedef Cell<EDGE>   Edge;
 typedef Cell<FACE>   Face;
 typedef Cell<VOLUME> Vol;  // not Volume because of the namespace Volume
 
-
 }
 
 #endif /* CELLS_H_ */

include/Topology/generic/cells_macros.h

@@ -22,15 +22,13 @@
 *                                                                              *
 *******************************************************************************/
 
-#ifndef __CELLS_MACRO_H_
-#define __CELLS_MACRO_H_
-
-#include "cells.h"
-#include "traversor2.h"
-#include "traversor3.h"
-#include "traversorCell.h"
-
+#ifndef __CELLS_MACRO_H__
+#define __CELLS_MACRO_H__
 
+#include "Topology/generic/cells.h"
+#include "Topology/generic/traversor/traversor2.h"
+#include "Topology/generic/traversor/traversor3.h"
+#include "Topology/generic/traversor/traversorCell.h"
 
 namespace CGoGN
 {

include/Topology/generic/genericmap.h

@@ -48,7 +48,6 @@ namespace CGoGN
 class AttributeHandlerGen ;
 class DartMarkerGen ;
 class CellMarkerGen ;
-//template<typename MAP, unsigned int CELL> class CellMarkerBase ;
 
 class GenericMap
 {
@@ -165,8 +164,6 @@ protected:
 	void deleteDartLine(unsigned int index) ;
 
 public:
-//	virtual unsigned int getNbDarts() const = 0 ;
-
 	/****************************************
 	 *          ORBITS TRAVERSALS           *
 	 ****************************************/
@@ -182,7 +179,7 @@ public:
 	virtual bool foreach_dart_of_vertex(Dart d, FunctorType& f, unsigned int thread = 0) const = 0 ;
 	virtual bool foreach_dart_of_edge(Dart d, FunctorType& f, unsigned int thread = 0) const = 0 ;
 	virtual bool foreach_dart_of_face(Dart /*d*/, FunctorType& /*f*/, unsigned int /*thread = 0*/) const { std::cerr << "Not implemented" << std::endl; return false; }
-	virtual bool foreach_dart_of_volume(Dart /*d*/, FunctorType& /*f*/, unsigned /*int thread = 0*/) const { std::cerr << "Not implemented" << std::endl; return false; }
+	virtual bool foreach_dart_of_volume(Dart /*d*/, FunctorType& /*f*/, unsigned int /*thread = 0*/) const { std::cerr << "Not implemented" << std::endl; return false; }
 	virtual bool foreach_dart_of_cc(Dart /*d*/, FunctorType& /*f*/, unsigned int /*thread = 0*/) const { std::cerr << "Not implemented" << std::endl; return false; }
 
 	virtual bool foreach_dart_of_vertex1(Dart /*d*/, FunctorType& /*f*/, unsigned int /*thread = 0*/) const { std::cerr << "Not implemented" << std::endl; return false; }