quick traversal fixes

Apps/Examples/viewer.cpp

@@ -214,6 +214,8 @@ void Viewer::importMesh(std::string& filename)
 		position = myMap.getAttribute<PFP::VEC3, VERTEX>(attrNames[0]) ;
 	}
 
+	myMap.enableQuickTraversal<VERTEX>() ;
+
 	m_render->initPrimitives<PFP>(myMap, allDarts, Algo::Render::GL2::POINTS) ;
 	m_render->initPrimitives<PFP>(myMap, allDarts, Algo::Render::GL2::LINES) ;
 	m_render->initPrimitives<PFP>(myMap, allDarts, Algo::Render::GL2::TRIANGLES) ;

include/Topology/generic/genericmap.hpp

@@ -371,13 +371,15 @@ inline void GenericMap::enableQuickTraversal()
 template <unsigned int ORBIT>
 inline void GenericMap::updateQuickTraversal()
 {
-	CellMarker<ORBIT> cm ;
+	assert(m_quickTraversal[ORBIT] != NULL || !"updateQuickTraversal on a disabled orbit") ;
+
+	CellMarker<ORBIT> cm(*this) ;
 	for(Dart d = begin(); d != end(); next(d))
 	{
 		if(!cm.isMarked(d))
 		{
 			cm.mark(d) ;
-			(*m_quickTraversal[ORBIT])[d.index] = d ;
+			(*m_quickTraversal[ORBIT])[getEmbedding<ORBIT>(d)] = d ;
 		}
 	}
 }

include/Topology/generic/traversorCell.h

@@ -37,7 +37,9 @@ class TraversorCell
 {
 private:
 	MAP& m ;
+
 	AttributeContainer* cont ;
+	unsigned int qCurrent ;
 
 	DartMarker* dmark ;
 	CellMarker<ORBIT>* cmark ;

include/Topology/generic/traversorCell.hpp

@@ -60,7 +60,8 @@ Dart TraversorCell<MAP, ORBIT>::begin()
 {
 	if(quickTraversal != NULL)
 	{
-		current = (*quickTraversal)[cont->begin()] ;
+		qCurrent = cont->begin() ;
+		current = (*quickTraversal)[qCurrent] ;
 	}
 	else
 	{
@@ -103,32 +104,40 @@ Dart TraversorCell<MAP, ORBIT>::next()
 {
 	if(current != NIL)
 	{
-		bool ismarked ;
-		if(dmark)
-			ismarked = dmark->isMarked(current) ;
+		if(quickTraversal != NULL)
+		{
+			cont->next(qCurrent) ;
+			current = (*quickTraversal)[qCurrent] ;
+		}
 		else
-			ismarked = cmark->isMarked(current) ;
-
-		while(current != NIL && (ismarked || m.isBoundaryMarked(current) || !m_good(current)))
 		{
-			m.next(current) ;
-			if(current == m.end())
-				current = NIL ;
+			bool ismarked ;
+			if(dmark)
+				ismarked = dmark->isMarked(current) ;
 			else
+				ismarked = cmark->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) ;
+				{
+					if(dmark)
+						ismarked = dmark->isMarked(current) ;
+					else
+						ismarked = cmark->isMarked(current) ;
+				}
 			}
-		}
 
-		if(current != NIL)
-		{
-			if(dmark)
-				dmark->markOrbit<ORBIT>(current) ;
-			else
-				cmark->mark(current) ;
+			if(current != NIL)
+			{
+				if(dmark)
+					dmark->markOrbit<ORBIT>(current) ;
+				else
+					cmark->mark(current) ;
+			}
 		}
 	}
 	return current ;