update traversorCell next operator

Apps/Examples/viewer.h

@@ -93,8 +93,8 @@ public:
 	bool m_drawNormals ;
 	bool m_drawTopo ;
 
-	AttributeHandler<VEC3, VERTEX> position ;
-	AttributeHandler<VEC3, VERTEX> normal ;
+	VertexAttribute<VEC3> position ;
+	VertexAttribute<VEC3> normal ;
 
 	Algo::Render::GL2::MapRender* m_render ;
 	Algo::Render::GL2::TopoRender* m_topoRender ;

include/Topology/generic/traversorCell.h

@@ -21,6 +21,7 @@
 * Contact information: cgogn@unistra.fr                                        *
 *                                                                              *
 *******************************************************************************/
+
 #include "Topology/generic/traversorGen.h"
 
 #ifndef __TRAVERSOR_CELL_H__
@@ -34,7 +35,7 @@ namespace CGoGN
 {
 
 template <typename MAP, unsigned int ORBIT>
-class TraversorCell: public Traversor<MAP>
+class TraversorCell : public Traversor<MAP>
 {
 private:
 	MAP& m ;
@@ -99,7 +100,7 @@ public:
 
 
 template <typename MAP, unsigned int ORBIT>
-class TraversorDartsOfOrbit: public Traversor<MAP>
+class TraversorDartsOfOrbit : public Traversor<MAP>
 {
 private:
 	std::vector<Dart>::iterator m_current ;

include/Topology/generic/traversorCell.hpp

@@ -111,31 +111,32 @@ Dart TraversorCell<MAP, ORBIT>::next()
 		}
 		else
 		{
-			bool ismarked ;
 			if(dmark)
-				ismarked = dmark->isMarked(current) ;
-			else
-				ismarked = cmark->isMarked(current) ;
-
-			while(current != NIL && (ismarked || m.isBoundaryMarked(current) || !m_good(current)))
 			{
-				m.next(current) ;
-				if(current == m.end())
-					current = NIL ;
-				else
+				bool ismarked = dmark->isMarked(current) ;
+				while(current != NIL && (ismarked || m.isBoundaryMarked(current) || !m_good(current)))
 				{
-					if(dmark)
-						ismarked = dmark->isMarked(current) ;
+					m.next(current) ;
+					if(current == m.end())
+						current = NIL ;
 					else
-						ismarked = cmark->isMarked(current) ;
+						ismarked = dmark->isMarked(current) ;
 				}
+				if(current != NIL)
+					dmark->markOrbit<ORBIT>(current) ;
 			}
-
-			if(current != NIL)
+			else
 			{
-				if(dmark)
-					dmark->markOrbit<ORBIT>(current) ;
-				else
+				bool ismarked = cmark->isMarked(current) ;
+				while(current != NIL && (ismarked || m.isBoundaryMarked(current) || !m_good(current)))
+				{
+					m.next(current) ;
+					if(current == m.end())
+						current = NIL ;
+					else
+						ismarked = cmark->isMarked(current) ;
+				}
+				if(current != NIL)
 					cmark->mark(current) ;
 			}
 		}

include/Topology/generic/traversorGen.h

@@ -79,7 +79,6 @@ public:
 	 * @return a ptr on Generic Traversor
 	 */
 	static Traversor<MAP>* createCell(MAP& map, unsigned int orb, const FunctorSelect& good = allDarts, bool forceDartMarker = false, unsigned int thread = 0);
-
 };
 
 } // namespace CGoGN