Commit 61a8faf4 authored by Sylvain Thery's avatar Sylvain Thery

compil...

parent 97585ab7
...@@ -22,10 +22,10 @@ struct PFP3 : public PFP_DOUBLE ...@@ -22,10 +22,10 @@ struct PFP3 : public PFP_DOUBLE
typedef EmbeddedGMap2 MAP; typedef EmbeddedGMap2 MAP;
}; };
// TODO modif ProgressiveMesh
template class Algo::Surface::PMesh::ProgressiveMesh<PFP1>; //template class Algo::Surface::PMesh::ProgressiveMesh<PFP1>;
template class Algo::Surface::PMesh::ProgressiveMesh<PFP2>; //template class Algo::Surface::PMesh::ProgressiveMesh<PFP2>;
template class Algo::Surface::PMesh::ProgressiveMesh<PFP3>; //template class Algo::Surface::PMesh::ProgressiveMesh<PFP3>;
int test_pmesh() int test_pmesh()
......
...@@ -5,7 +5,7 @@ project(testing_algo_selection) ...@@ -5,7 +5,7 @@ project(testing_algo_selection)
add_executable( test_algo_selection add_executable( test_algo_selection
algo_selection.cpp algo_selection.cpp
collector.cpp collector.cpp
rayselector.cpp raySelector.cpp
) )
target_link_libraries( test_algo_selection target_link_libraries( test_algo_selection
......
...@@ -56,7 +56,7 @@ void pliantRemeshing( ...@@ -56,7 +56,7 @@ void pliantRemeshing(
if(!m1.isMarked(d)) if(!m1.isMarked(d))
{ {
m1.template markOrbit<EDGE>(d) ; m1.template markOrbit<EDGE>(d) ;
meanEdgeLength += Geometry::edgeLength<PFP>(map, d, position) ; meanEdgeLength += Algo::Geometry::edgeLength<PFP>(map, d, position) ;
++nbEdges ; ++nbEdges ;
} }
} }
...@@ -73,7 +73,7 @@ void pliantRemeshing( ...@@ -73,7 +73,7 @@ void pliantRemeshing(
if(!m2.isMarked(d)) if(!m2.isMarked(d))
{ {
m2.template markOrbit<EDGE>(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) if(length > edgeLengthSup)
{ {
Dart dd = map.phi2(d) ; Dart dd = map.phi2(d) ;
...@@ -128,7 +128,7 @@ void pliantRemeshing( ...@@ -128,7 +128,7 @@ void pliantRemeshing(
if(!cornerVertex.isMarked(d) && !cornerVertex.isMarked(d1) && if(!cornerVertex.isMarked(d) && !cornerVertex.isMarked(d1) &&
( (featureVertex.isMarked(d) && featureVertex.isMarked(d1)) || (!featureVertex.isMarked(d) && !featureVertex.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)) if(length < edgeLengthInf && map.edgeCanCollapse(d))
{ {
bool collapse = true ; bool collapse = true ;
...@@ -185,7 +185,7 @@ void pliantRemeshing( ...@@ -185,7 +185,7 @@ void pliantRemeshing(
Algo::Surface::Geometry::computeNormalVertices<PFP>(map, position, normal) ; Algo::Surface::Geometry::computeNormalVertices<PFP>(map, position, normal) ;
// tangential relaxation // 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) ; Surface::Geometry::computeNeighborhoodCentroidVertices<PFP>(map, position, centroid) ;
CellMarker<MAP, VERTEX> vm(map) ; CellMarker<MAP, VERTEX> vm(map) ;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment