Commit 0b98a1d4 authored by Etienne Schmitt's avatar Etienne Schmitt

cleaning.

Signed-off-by: Etienne Schmitt's avatarÉtienne Schmitt <etienne.schmitt@inria.fr>
parent 733fd8a1
......@@ -67,7 +67,10 @@ public :
void display();
inline Dart getCell() const { return d; }
inline Dart getCell() const
{
return d;
}
inline VEC3 pointInFace(Dart d);
......
......@@ -71,47 +71,7 @@ unsigned int IHM2<PFP>::faceLevel(Dart d)
if(m_map.getCurrentLevel() == 0)
return 0 ;
// Methode 1
// unsigned int cur = m_curLevel ;
// Dart it = d ;
// Dart end = d ;
// bool resetEnd = true ;
// bool firstEdge = true ;
// do
// {
// if(!resetEnd)
// firstEdge = false ;
//
// unsigned int eId = m_edgeId[it] ;
// Dart next = it ;
// do
// {
// unsigned int l = edgeLevel(next) ;
// if(l < m_curLevel)
// m_curLevel = l ;
// else // l == curLevel
// {
// if(!firstEdge)
// {
// --m_curLevel ;
// next = it ;
// }
// }
// next = phi1(next) ;
// } while(m_edgeId[next] == eId) ;
// it = next ;
//
// if(resetEnd)
// {
// end = it ;
// resetEnd = false ;
// }
//
// } while(!firstEdge && it != end) ;
//
// unsigned int fLevel = m_curLevel ;
// m_curLevel = cur ;
;
//Methode 2
Dart it = d ;
......@@ -127,8 +87,7 @@ unsigned int IHM2<PFP>::faceLevel(Dart d)
old = it ;
l_old = dl ;
} // in a first time, the level of a face
unsigned int l = edgeLevel(it) ; // is the minimum of the levels
fLevel = l < fLevel ? l : fLevel ; // of its edges
fLevel = std::min(fLevel, edgeLevel(it) ); // is the minimum of the levels of its edges
} while(it != d) ;
// unsigned int cur = m_map.getCurrentLevel() ;
......
......@@ -162,12 +162,10 @@ bool isEdgeInOrIntersectingTetrahedron(VEC3 points[4], VEC3& point1, VEC3& point
}
template <typename VEC>
bool arePointsEquals(const VEC& point1, const VEC& point2)
inline bool arePointsEquals(const VEC& point1, const VEC& point2)
{
VEC v(point1 - point2);
#define PRECISION 1e-5
return v.norm2() <= PRECISION ;
return (point1 - point2).norm2() <= PRECISION ;
#undef PRECISION
}
......
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