Merge cgogn:~thery/CGoGN

include/Algo/Import/importObjTex.h

@@ -369,7 +369,13 @@ public:
 	 */
 	bool createGroupMatVBO_PTN( Utils::VBO* positionVBO, Utils::VBO* texcoordVBO, Utils::VBO* normalVBO);
 
-
+	/**
+	 * @brief add a dart by each face of group in a vector
+	 * @param groupId the group to add
+	 * @param dartFaces the vector in which we want to add
+	 * @return the number of faces added.
+	 */
+	unsigned int storeFacesOfGroup(unsigned int groupId, std::vector<Dart>& dartFaces);
 };
 
 

include/Algo/Import/importObjTex.hpp

@@ -1395,6 +1395,22 @@ bool OBJModel<PFP>::import( const std::string& filename, std::vector<std::string
 
 }
 
+template <typename PFP>
+unsigned int OBJModel<PFP>::storeFacesOfGroup(unsigned int groupId, std::vector<Dart>& dartFaces)
+{
+	unsigned int nb=dartFaces.size();
+
+	TraversorF<typename PFP::MAP> traf(m_map);
+	for (Dart d=traf.begin(); d!= traf.end(); d = traf.next())
+	{
+		if (m_groups[d] == groupId)
+		{
+			dartFaces.push_back(d);
+		}
+	}
+
+	return dartFaces.size()-nb;
+}
 
 
 }

include/Topology/generic/traversor2_closed.h

@@ -41,7 +41,7 @@ namespace ClosedMap
 
 // Traverse the edges incident to a given vertex
 template <typename MAP>
-class Traversor2VE: public Traversor<MAP>
+class Traversor2VE: public Traversor
 {
 private:
 	MAP& m ;
@@ -58,7 +58,7 @@ public:
 
 // Traverse the faces incident to a given vertex
 template <typename MAP>
-class Traversor2VF : public Traversor<MAP>
+class Traversor2VF : public Traversor
 {
 private:
 	MAP& m ;
@@ -75,7 +75,7 @@ public:
 
 // Traverse the vertices adjacent to a given vertex through sharing a common edge
 template <typename MAP>
-class Traversor2VVaE : public Traversor<MAP>
+class Traversor2VVaE : public Traversor
 {
 private:
 	MAP& m ;
@@ -92,7 +92,7 @@ public:
 
 // Traverse the vertices adjacent to a given vertex through sharing a common face
 template <typename MAP>
-class Traversor2VVaF : public Traversor<MAP>
+class Traversor2VVaF : public Traversor
 {
 private:
 	MAP& m ;
@@ -115,7 +115,7 @@ public:
 
 // Traverse the vertices incident to a given edge
 template <typename MAP>
-class Traversor2EV : public Traversor<MAP>
+class Traversor2EV : public Traversor
 {
 private:
 	MAP& m ;
@@ -132,7 +132,7 @@ public:
 
 // Traverse the faces incident to a given edge
 template <typename MAP>
-class Traversor2EF : public Traversor<MAP>
+class Traversor2EF : public Traversor
 {
 private:
 	MAP& m ;
@@ -149,7 +149,7 @@ public:
 
 // Traverse the edges adjacent to a given edge through sharing a common vertex
 template <typename MAP>
-class Traversor2EEaV : public Traversor<MAP>
+class Traversor2EEaV : public Traversor
 {
 private:
 	MAP& m ;
@@ -168,7 +168,7 @@ public:
 
 // Traverse the edges adjacent to a given edge through sharing a common face
 template <typename MAP>
-class Traversor2EEaF : public Traversor<MAP>
+class Traversor2EEaF : public Traversor
 {
 private:
 	MAP& m ;
@@ -191,7 +191,7 @@ public:
 
 // Traverse the vertices incident to a given face
 template <typename MAP>
-class Traversor2FV : public Traversor<MAP>
+class Traversor2FV : public Traversor
 {
 private:
 	MAP& m ;
@@ -217,7 +217,7 @@ public:
 
 // Traverse the faces adjacent to a given face through sharing a common vertex
 template <typename MAP>
-class Traversor2FFaV : public Traversor<MAP>
+class Traversor2FFaV : public Traversor
 {
 private:
 	MAP& m ;
@@ -236,7 +236,7 @@ public:
 
 // Traverse the faces adjacent to a given face through sharing a common edge
 template <typename MAP>
-class Traversor2FFaE : public Traversor<MAP>
+class Traversor2FFaE : public Traversor
 {
 private:
 	MAP& m ;