Merge cgogn:~thery/CGoGN

SCHNApps/Plugins/differentialProperties/src/differentialProperties.cpp

@@ -61,7 +61,7 @@ void DifferentialPropertiesPlugin::cb_computeNormal()
 		if(!normal.isValid())
 			normal = map->addAttribute<VEC3, VERTEX>(normalName);
 
-		Algo::Geometry::computeNormalVertices<PFP>(*map, position, normal);
+		Algo::Surface::Geometry::computeNormalVertices<PFP>(*map, position, normal);
 
 		if(m_computeNormalDialog->check_createVBO->checkState() == Qt::Checked)
 			mh->createVBO(normal);

SCHNApps/Plugins/importSurface/importSurface.cpp

@@ -26,7 +26,7 @@ void ImportSurfacePlugin::cb_import()
 		MapHandler<PFP>* h = new MapHandler<PFP>(fi.baseName(), m_window, m);
 
 		std::vector<std::string> attrNames ;
-		Algo::Import::importMesh<PFP>(*m, fileName.toUtf8().constData(), attrNames);
+		Algo::Surface::Import::importMesh<PFP>(*m, fileName.toUtf8().constData(), attrNames);
 
 		// get vertex position attribute
 		VertexAttribute<VEC3> position = m->getAttribute<VEC3, CGoGN::VERTEX>(attrNames[0]);

SCHNApps/Plugins/subdivideSurface/subdivideSurface.cpp

@@ -82,7 +82,7 @@ void SubdivideSurfacePlugin::cb_loopSubdivision()
 		std::string positionName = m_dockTab->combo_positionAttribute->currentText().toUtf8().constData();
 		VertexAttribute<VEC3> position = map->getAttribute<VEC3, VERTEX>(positionName);
 
-		Algo::Modelisation::LoopSubdivision<PFP>(*map, position);
+		Algo::Surface::Modelisation::LoopSubdivision<PFP>(*map, position);
 
 		mh->updatePrimitives(Algo::Render::GL2::POINTS);
 		mh->updatePrimitives(Algo::Render::GL2::LINES);
@@ -109,7 +109,7 @@ void SubdivideSurfacePlugin::cb_CCSubdivision()
 		std::string positionName = m_dockTab->combo_positionAttribute->currentText().toUtf8().constData();
 		VertexAttribute<VEC3> position = map->getAttribute<VEC3, VERTEX>(positionName);
 
-		Algo::Modelisation::CatmullClarkSubdivision<PFP>(*map, position);
+		Algo::Surface::Modelisation::CatmullClarkSubdivision<PFP>(*map, position);
 
 		mh->updatePrimitives(Algo::Render::GL2::POINTS);
 		mh->updatePrimitives(Algo::Render::GL2::LINES);
@@ -136,7 +136,7 @@ void SubdivideSurfacePlugin::cb_trianguleFaces()
 		std::string positionName = m_dockTab->combo_positionAttribute->currentText().toUtf8().constData();
 		VertexAttribute<VEC3> position = map->getAttribute<VEC3, VERTEX>(positionName);
 
-		Algo::Modelisation::trianguleFaces<PFP>(*map, position);
+		Algo::Surface::Modelisation::trianguleFaces<PFP>(*map, position);
 
 		mh->updatePrimitives(Algo::Render::GL2::POINTS);
 		mh->updatePrimitives(Algo::Render::GL2::LINES);

src/Topology/generic/genericmap.cpp

@@ -293,10 +293,10 @@ void GenericMap::removeLevelFront()
 	if(maxL > 0) //must have at min 2 levels (0 and 1) to remove the front one
 	{
 		AttributeMultiVector<unsigned int>* minMR = m_mrDarts[0] ;
-		AttributeMultiVector<unsigned int>* firstMR = m_mrDarts[1] ;
+//		AttributeMultiVector<unsigned int>* firstMR = m_mrDarts[1] ;
 		for(unsigned int i = m_mrattribs.begin(); i != m_mrattribs.end(); m_mrattribs.next(i))
 		{
-			unsigned int idx = (*minMR)[i] ;
+//			unsigned int idx = (*minMR)[i] ;
 			if((*m_mrLevels)[i] != 0)	// if the MRdart was introduced after the level we're removing
 			{
 				--(*m_mrLevels)[i]; //decrement his level of insertion