Commit 5419938e authored by Thomas Pitiot 's avatar Thomas Pitiot

pas bien

parent 165f463b
......@@ -60,7 +60,7 @@ unsigned int IHM2<PFP>::edgeLevel(Dart d)
assert(m_map.getDartLevel(d) <= m_map.getCurrentLevel() || !"Access to a dart introduced after current level") ;
unsigned int ld = m_map.getDartLevel(d);
// unsigned int ldd = m_dartLevel[phi2(d)] ; // the level of an edge is the maximum of the
unsigned int ldd = m_map.getDartLevel(m_map.phi1(d));
unsigned int ldd = m_map.getDartLevel(m_map.phi2(d));
return ld < ldd ? ldd : ld ;
}
......@@ -134,20 +134,22 @@ unsigned int IHM2<PFP>::faceLevel(Dart d)
unsigned int cur = m_map.getCurrentLevel() ;
m_map.setCurrentLevel(fLevel) ;
// unsigned int nbSubd = 0 ;
// it = old ;
// unsigned int eId = m_map.getEdgeId(old) ; // the particular case of a face
// do // with all neighboring faces regularly subdivided
// { // but not the face itself
// ++nbSubd ; // is treated here
// it = m_map.phi1(it) ;
// } while(m_map.getEdgeId(it) == eId) ;
// while(nbSubd > 1)
// {
// nbSubd /= 2 ;
// --fLevel ;
// }
unsigned int nbSubd = 0 ;
it = old ;
unsigned int eId = m_map.getEdgeId(old) ; // the particular case of a face
CGoGNout<<"catastrophe"<<m_map.getEdgeId(it)<<CGoGNendl;
do // with all neighboring faces regularly subdivided
{
// but not the face itself
++nbSubd ; // is treated here
it = m_map.phi1(it) ;
} while(m_map.getEdgeId(it) == eId && it!=old) ;
while(nbSubd > 1)
{
nbSubd /= 2 ;
--fLevel ;
}
m_map.setCurrentLevel(cur) ;
......@@ -356,6 +358,7 @@ unsigned int IHM2<PFP>::subdivideFace(Dart d, bool triQuad, bool OneLevelDiffere
assert(!faceIsSubdivided(d) || !"Trying to subdivide an already subdivided face") ;
unsigned int fLevel = faceLevel(d) ;
CGoGNout<<" Subdivision : "<<fLevel<<CGoGNendl;
Dart old = faceOldestDart(d) ;
unsigned int cur = m_map.getCurrentLevel() ;
......@@ -384,6 +387,7 @@ unsigned int IHM2<PFP>::subdivideFace(Dart d, bool triQuad, bool OneLevelDiffere
if((degree == 3) && triQuad) // if subdividing a triangle
{
CGoGNout<<" Subdivided a triangle "<<CGoGNendl;
Dart dd = m_map.phi1(old) ;
Dart e = m_map.phi1(dd) ;
(*vertexVertexFunctor)(e) ;
......@@ -417,6 +421,7 @@ unsigned int IHM2<PFP>::subdivideFace(Dart d, bool triQuad, bool OneLevelDiffere
}
else // if subdividing a polygonal face
{
CGoGNout<<" Subdivided a polygone "<<degree<<CGoGNendl;
Dart dd = m_map.phi1(old) ;
Dart next = m_map.phi1(dd) ;
(*vertexVertexFunctor)(next) ;
......
QGLViewer
nl
tinyxml2
/usr/lib/x86_64-linux-gnu/libGLU.so
/usr/lib/x86_64-linux-gnu/libGL.so
/usr/lib/x86_64-linux-gnu/libSM.so
/usr/lib/x86_64-linux-gnu/libICE.so
/usr/lib/x86_64-linux-gnu/libX11.so
/usr/lib/x86_64-linux-gnu/libXext.so
/usr/lib/x86_64-linux-gnu/libGLEW.so
/usr/lib/x86_64-linux-gnu/libz.so
/usr/lib/x86_64-linux-gnu/libamd.so
/usr/lib/x86_64-linux-gnu/libcamd.so
/usr/lib/x86_64-linux-gnu/libccolamd.so
/usr/lib/x86_64-linux-gnu/libcolamd.so
/usr/lib/x86_64-linux-gnu/libcholmod.so
/usr/lib/x86_64-linux-gnu/libspqr.so
/usr/lib/x86_64-linux-gnu/libldl.so
/usr/lib/x86_64-linux-gnu/libbtf.so
/usr/lib/x86_64-linux-gnu/libklu.so
/usr/lib/x86_64-linux-gnu/libcxsparse.so
/usr/lib/x86_64-linux-gnu/libumfpack.so
/usr/lib64/libGLU.so
/usr/lib64/libGL.so
/usr/lib64/libSM.so
/usr/lib64/libICE.so
/usr/lib64/libX11.so
/usr/lib64/libXext.so
/usr/lib64/libGLEW.so
/usr/lib64/libz.so
/usr/lib64/libamd.so
/usr/lib64/libcamd.so
/usr/lib64/libccolamd.so
/usr/lib64/libcolamd.so
/usr/lib64/libcholmod.so
/usr/lib64/libspqr.so
/usr/lib64/libldl.so
/usr/lib64/libbtf.so
/usr/lib64/libklu.so
/usr/lib64/libcxsparse.so
/usr/lib64/libumfpack.so
pthread
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