From 61a8faf40cdb48dde2163908f34f8b0d587b981b Mon Sep 17 00:00:00 2001
From: Sylvain Thery <thery@unistra.fr>
Date: Wed, 27 May 2015 17:14:44 +0200
Subject: [PATCH] compil...

---
 Apps/Tests/Algo/ProgressiveMesh/pmesh.cpp | 8 ++++----
 Apps/Tests/Algo/Selection/CMakeLists.txt  | 2 +-
 CGoGN/include/Algo/Remeshing/pliant.hpp   | 8 ++++----
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Apps/Tests/Algo/ProgressiveMesh/pmesh.cpp b/Apps/Tests/Algo/ProgressiveMesh/pmesh.cpp
index 823319107..fa83690d3 100644
--- a/Apps/Tests/Algo/ProgressiveMesh/pmesh.cpp
+++ b/Apps/Tests/Algo/ProgressiveMesh/pmesh.cpp
@@ -22,10 +22,10 @@ struct PFP3 : public PFP_DOUBLE
 	typedef EmbeddedGMap2 MAP;
 };
 
-
-template class Algo::Surface::PMesh::ProgressiveMesh<PFP1>;
-template class Algo::Surface::PMesh::ProgressiveMesh<PFP2>;
-template class Algo::Surface::PMesh::ProgressiveMesh<PFP3>;
+// TODO modif ProgressiveMesh
+//template class Algo::Surface::PMesh::ProgressiveMesh<PFP1>;
+//template class Algo::Surface::PMesh::ProgressiveMesh<PFP2>;
+//template class Algo::Surface::PMesh::ProgressiveMesh<PFP3>;
 
 
 int test_pmesh()
diff --git a/Apps/Tests/Algo/Selection/CMakeLists.txt b/Apps/Tests/Algo/Selection/CMakeLists.txt
index 3d36f5d16..ce55c79c3 100644
--- a/Apps/Tests/Algo/Selection/CMakeLists.txt
+++ b/Apps/Tests/Algo/Selection/CMakeLists.txt
@@ -5,7 +5,7 @@ project(testing_algo_selection)
 add_executable( test_algo_selection 
 algo_selection.cpp 
 collector.cpp
-rayselector.cpp
+raySelector.cpp
 )	
 
 target_link_libraries( test_algo_selection 
diff --git a/CGoGN/include/Algo/Remeshing/pliant.hpp b/CGoGN/include/Algo/Remeshing/pliant.hpp
index 3a8712831..048828e13 100644
--- a/CGoGN/include/Algo/Remeshing/pliant.hpp
+++ b/CGoGN/include/Algo/Remeshing/pliant.hpp
@@ -56,7 +56,7 @@ void pliantRemeshing(
 		if(!m1.isMarked(d))
 		{
 			m1.template markOrbit<EDGE>(d) ;
-			meanEdgeLength += Geometry::edgeLength<PFP>(map, d, position) ;
+			meanEdgeLength += Algo::Geometry::edgeLength<PFP>(map, d, position) ;
 			++nbEdges ;
 		}
 	}
@@ -73,7 +73,7 @@ void pliantRemeshing(
 		if(!m2.isMarked(d))
 		{
 			m2.template markOrbit<EDGE>(d) ;
-			REAL length = Geometry::edgeLength<PFP>(map, d, position) ;
+			REAL length = Algo::Geometry::edgeLength<PFP>(map, d, position) ;
 			if(length > edgeLengthSup)
 			{
 				Dart dd = map.phi2(d) ;
@@ -128,7 +128,7 @@ void pliantRemeshing(
 			if(!cornerVertex.isMarked(d) && !cornerVertex.isMarked(d1) &&
 				( (featureVertex.isMarked(d) && featureVertex.isMarked(d1)) || (!featureVertex.isMarked(d) && !featureVertex.isMarked(d1)) ))
 			{
-				REAL length = Geometry::edgeLength<PFP>(map, d, position) ;
+				REAL length = Algo::Geometry::edgeLength<PFP>(map, d, position);
 				if(length < edgeLengthInf && map.edgeCanCollapse(d))
 				{
 					bool collapse = true ;
@@ -185,7 +185,7 @@ void pliantRemeshing(
 	Algo::Surface::Geometry::computeNormalVertices<PFP>(map, position, normal) ;
 
 	// tangential relaxation
-	VertexAttribute<VEC3, MAP> centroid = map.template addAttribute<VEC3, VERTEX>("centroid") ;
+	VertexAttribute<VEC3, MAP> centroid = map.template addAttribute<VEC3, VERTEX, MAP>("centroid") ;
 	Surface::Geometry::computeNeighborhoodCentroidVertices<PFP>(map, position, centroid) ;
 
 	CellMarker<MAP, VERTEX> vm(map) ;
-- 
GitLab