Commit 40221907 authored by Kenneth Vanhoey's avatar Kenneth Vanhoey

Bug correction in decimation and pmesh

parent 85440360
...@@ -62,7 +62,7 @@ void decimate( ...@@ -62,7 +62,7 @@ void decimate(
std::vector<VertexAttribute<typename PFP::VEC3> *>& position, std::vector<VertexAttribute<typename PFP::VEC3> *>& position,
unsigned int nbWantedVertices, unsigned int nbWantedVertices,
const FunctorSelect& selected = allDarts, const FunctorSelect& selected = allDarts,
VertexAttribute<typename PFP::VEC3> *edgeErrors = NULL, EdgeAttribute<typename PFP::VEC3> *edgeErrors = NULL,
void (*callback_wrapper)(void*, const void*) = NULL, void *callback_object = NULL void (*callback_wrapper)(void*, const void*) = NULL, void *callback_object = NULL
) ; ) ;
......
...@@ -65,7 +65,7 @@ private: ...@@ -65,7 +65,7 @@ private:
std::vector<VSplit<PFP>*> m_splits ; std::vector<VSplit<PFP>*> m_splits ;
unsigned int m_cur ; unsigned int m_cur ;
Algo::Decimation::HalfEdgeApproximator<PFP, VEC3, EDGE>* m_positionApproximator ; Algo::Decimation::Approximator<PFP, VEC3, EDGE>* m_positionApproximator ;
bool m_initOk ; bool m_initOk ;
......
...@@ -108,7 +108,7 @@ ProgressiveMesh<PFP>::ProgressiveMesh( ...@@ -108,7 +108,7 @@ ProgressiveMesh<PFP>::ProgressiveMesh(
if(! (*it)->init()) if(! (*it)->init())
m_initOk = false ; m_initOk = false ;
if((*it)->getApproximatedAttributeName() == "position") if((*it)->getApproximatedAttributeName() == "position")
m_positionApproximator = reinterpret_cast<Algo::Decimation::HalfEdgeApproximator<PFP, VEC3, EDGE>*>(*it) ; m_positionApproximator = reinterpret_cast<Algo::Decimation::Approximator<PFP, VEC3, EDGE>*>(*it) ;
} }
CGoGNout << "..done" << CGoGNendl ; CGoGNout << "..done" << CGoGNendl ;
......
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