pb particules mauvais enregistrement

include/env_map.h

@@ -3,7 +3,7 @@
 
 
 #define DEBUG_affichage
-//#define DEBUG
+#define DEBUG
 
 #include <iostream>
 #include <algorithm>

src/env_map.cpp

@@ -539,9 +539,12 @@ bool EnvMap::subdivideVolume(Dart dglobal)
     {
         Dart nv = map.phi3(dit);
         if(!map.isBoundaryMarked(3, nv))
+        {
             if(map.volumeLevel(nv) == vLevel - 1)
-
+            {
                 subdivideVolume(nv);
+            }
+        }
     }
 
     // on commence ensuite a subdiviser
@@ -590,7 +593,7 @@ bool EnvMap::subdivideVolume(Dart dglobal)
     }
 
     map.setCurrentLevel(map.getMaxLevel()) ;
-    map.check();
+//    map.check();
 #ifdef DEBUG_affichage
     std::cout << "after level = "<< map.getMaxLevel() << std::endl;
 #endif

src/simulator.cpp

@@ -45,15 +45,15 @@ void Simulator::initFixedObjects()
     std::pair<unsigned int,unsigned int> ind;
     VEC3 pos;
 
-    pos=VEC3(2.21,3.02,3.53);
-    p.first=pos;
-    p.second=envMap_.getBelongingCell(pos);
-    startingPoints.push_back(p);
+//    pos=VEC3(2.21,3.02,3.53);
+//    p.first=pos;
+//    p.second=envMap_.getBelongingCell(pos);
+//    startingPoints.push_back(p);
 
-    pos=VEC3(-4.68,1.36,2.15);
-    p.first=pos;
-    p.second=envMap_.getBelongingCell(pos);
-    startingPoints.push_back(p);
+//    pos=VEC3(-4.68,1.36,2.15);
+//    p.first=pos;
+//    p.second=envMap_.getBelongingCell(pos);
+//    startingPoints.push_back(p);
 
     pos=VEC3(4,-2,3);
     p.first=pos;
@@ -65,25 +65,25 @@ void Simulator::initFixedObjects()
     p.second=envMap_.getBelongingCell(pos);
     startingPoints.push_back(p);
 
-    pos=VEC3(2,-2.5f,0.5f);
-    p.first=pos;
-    p.second=envMap_.getBelongingCell(pos);
-    startingPoints.push_back(p);
+//    pos=VEC3(2,-2.5f,0.5f);
+//    p.first=pos;
+//    p.second=envMap_.getBelongingCell(pos);
+//    startingPoints.push_back(p);
 
     ind.first=0;
     ind.second=1;
     segmentParts.push_back(ind);
 
-    ind.first=2;
-    ind.second=3;
-    segmentParts.push_back(ind);
+//    ind.first=2;
+//    ind.second=3;
+//    segmentParts.push_back(ind);
 
-    ind.first=0;
-    ind.second=2;
-    segmentParts.push_back(ind);
-    ind.first=0;
-    ind.second=4;
-    segmentParts.push_back(ind);
+//    ind.first=0;
+//    ind.second=2;
+//    segmentParts.push_back(ind);
+//    ind.first=0;
+//    ind.second=4;
+//    segmentParts.push_back(ind);
 
 
     ArticulatedObject * obj = new Tree(this,startingPoints,segmentParts);

src/viewer.cpp

@@ -416,7 +416,7 @@ void Volusion::cb_redraw()
                 {
                     for (Edge d : edgesIncidentToVolume3(simul.envMap_.map,(*it)))
                     {
-                        m_topo_render->overdrawDart(d,5.0f,0.5f,1.0f,0);
+                        m_topo_render->overdrawDart(d,5.0f,0.5f,0,0.4f);
                     }
 
 
@@ -427,7 +427,7 @@ void Volusion::cb_redraw()
 
 
 
-        if (dock.comboBoxEdge->count()<simul.aiguille->nbEdges)
+        if ((unsigned int)dock.comboBoxEdge->count()<simul.aiguille->nbEdges)
         {
             dock.comboBoxEdge->clear();
             dock.comboBoxEdge->addItem("Aiguille entiere",2);