diff --git a/Apps/Tests/Algo/ProgressiveMesh/pmesh.cpp b/Apps/Tests/Algo/ProgressiveMesh/pmesh.cpp index 8233191076f234dcdfbf3ffa2368815e2c5e6732..fa83690d302a16adc4f90e41e8f2a2422d5731db 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; -template class Algo::Surface::PMesh::ProgressiveMesh; -template class Algo::Surface::PMesh::ProgressiveMesh; +// TODO modif ProgressiveMesh +//template class Algo::Surface::PMesh::ProgressiveMesh; +//template class Algo::Surface::PMesh::ProgressiveMesh; +//template class Algo::Surface::PMesh::ProgressiveMesh; int test_pmesh() diff --git a/Apps/Tests/Algo/Selection/CMakeLists.txt b/Apps/Tests/Algo/Selection/CMakeLists.txt index 3d36f5d167e814e7b6c8e545c5356646d6ff9f6f..ce55c79c35665a928e592b5d6cd52dc3fe4e10f5 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 3a8712831039378d3686281358051c6ee69ebb37..048828e134dcb03ac1fe67dacc8a76b568483596 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(d) ; - meanEdgeLength += Geometry::edgeLength(map, d, position) ; + meanEdgeLength += Algo::Geometry::edgeLength(map, d, position) ; ++nbEdges ; } } @@ -73,7 +73,7 @@ void pliantRemeshing( if(!m2.isMarked(d)) { m2.template markOrbit(d) ; - REAL length = Geometry::edgeLength(map, d, position) ; + REAL length = Algo::Geometry::edgeLength(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(map, d, position) ; + REAL length = Algo::Geometry::edgeLength(map, d, position); if(length < edgeLengthInf && map.edgeCanCollapse(d)) { bool collapse = true ; @@ -185,7 +185,7 @@ void pliantRemeshing( Algo::Surface::Geometry::computeNormalVertices(map, position, normal) ; // tangential relaxation - VertexAttribute centroid = map.template addAttribute("centroid") ; + VertexAttribute centroid = map.template addAttribute("centroid") ; Surface::Geometry::computeNeighborhoodCentroidVertices(map, position, centroid) ; CellMarker vm(map) ;