Commit 912c8127 authored by Kenneth Vanhoey's avatar Kenneth Vanhoey

separation selecteurs en 2 fichiers (edgeSelector et halfEdgeSelector)

parent 223428d1
......@@ -25,7 +25,8 @@
#ifndef __DECIMATION_H__
#define __DECIMATION_H__
#include "Algo/Decimation/selector.h"
#include "Algo/Decimation/edgeSelector.h"
#include "Algo/Decimation/halfEdgeSelector.h"
#include "Algo/Decimation/geometryApproximator.h"
#include "Algo/Decimation/lightfieldApproximator.h"
......
......@@ -122,18 +122,18 @@ void decimate(
case S_QEM :
selector = new EdgeSelector_QEM<PFP>(map, position, approximators) ;
break ;
case S_Lightfield :
selector = new EdgeSelector_Lightfield<PFP>(map, position, approximators) ;
break ;
case S_LightfieldHalf :
selector = new HalfEdgeSelector_Lightfield<PFP>(map, position, approximators) ;
break ;
case S_Curvature :
selector = new EdgeSelector_Curvature<PFP>(map, position, approximators) ;
break ;
case S_MinDetail :
selector = new EdgeSelector_Random<PFP>(map, position, approximators) ;
break ;
case S_hLightfield :
selector = new HalfEdgeSelector_QEMml<PFP>(map, position, approximators) ;
break ;
case S_hQEMml :
selector = new HalfEdgeSelector_Lightfield<PFP>(map, position, approximators) ;
break ;
}
for(typename std::vector<ApproximatorGen<PFP>*>::iterator it = approximators.begin(); it != approximators.end(); ++it)
......
This diff is collapsed.
This diff is collapsed.
......@@ -22,7 +22,6 @@
* *
*******************************************************************************/
namespace CGoGN
{
......@@ -66,6 +65,8 @@ bool SharedMemSeg<DATA>::initMaster(int key)
m_ptr1 = reinterpret_cast<DATA*>(m_ptr + 2);
m_ptr2 = m_ptr1+1;
*m_ptr = 0;
return true ;
}
template<typename DATA>
......@@ -88,6 +89,8 @@ bool SharedMemSeg<DATA>::initSlave(int key)
m_ptr1 = reinterpret_cast<DATA*>(m_ptr + 2);
m_ptr2 = m_ptr1+1;
*(int*)m_ptr = 0;
return true ;
}
......
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