Commit 2f21d74f authored by Thomas Pitiot 's avatar Thomas Pitiot

merge

parents bafd5d27 6d79dea8
QGLViewer
nl
tinyxml2
/usr/lib64/libGLU.so
/usr/lib64/libGL.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
/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
pthread
/usr/lib/x86_64-linux-gnu/libboost_regex.so
......@@ -1159,16 +1159,35 @@ void mapOperators::resetPartSimplif(Triangle* o, Dart d)
void mapOperators::subdivideToMaxLevel()
{
#ifdef IHMap
<<<<<<< HEAD
TraversorW<MAP> tra(*map);
=======
>>>>>>> 6d79dea8a0201b77f7661520f61554a74f9e9511
bool res;
do
{
for (Dart d = tra.begin(); d != tra.end(); d = tra.next())
res=false;
TraversorW<MAP> tra(*map);
for (Dart volume = tra.begin(); volume != tra.end(); volume = tra.next())
{
if(!CellOnMaxLevel[volume] && RegisteredAgents[volume].size()>nbAgentsToSubdivide)
{
// CGoGNout<<" volume :"<<volume<< " has agents : "<<RegisteredAgents[volume].size()<<CGoGNendl;
REAL rayon = volumeMaxdistance(volume) ;
if(rayon >2* maxCellRay ) // on subdivise si le rayon est 2 fois le maxCellRay
{
refineMark.mark(d);
subdivideVolume(volume);
res=true;
}
else
{
CellOnMaxLevel[volume]=true;
}
}
}
}while(subdivideMap());
}while(res);
#endif
}
......
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