From 005e0485410a209e0102081da7e3050e611926e1 Mon Sep 17 00:00:00 2001
From: Thomas PITIOT <thomas@pitiot.eu>
Date: Mon, 23 Feb 2015 18:14:23 +0100
Subject: [PATCH]  bug de particule volume into volumeSpecialCase et particule
 memo ...

---
 src/env_map.cpp | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/env_map.cpp b/src/env_map.cpp
index 290abb3..4c59eb3 100644
--- a/src/env_map.cpp
+++ b/src/env_map.cpp
@@ -389,11 +389,9 @@ void EnvMap::FirstRegistrationSegment(Segment * o)// réenregistre l'Segment en
         VEC3 p1 = o->p1;
         VEC3 p2 =  o->p2;
 
-        Dart d1=NIL;
-        Dart d2=NIL;
+        Dart d1=mo->parts_[n1]->d;
+        Dart d2=mo->parts_[n2]->d;
         std::vector<Dart> memo;
-        d1=mo->parts_[n1]->d;
-        d2=mo->parts_[n2]->d;
 
 
         memo = getMemoCross(p1,p2,d1);
@@ -462,7 +460,7 @@ void EnvMap::pushSegmentInSetOfCells(Segment* o, const std::vector<Dart>& memo_c
 #ifdef DEBUG_affichage
     CGoGNout<<"Push in set of cells segment arete "<<n<<CGoGNendl;
 #endif
-    assert(!memo_cross.empty());
+    assert(!memo_cross.empty() && memo_cross.size() > 1);
     ArticulatedObject * mo = o->nid;
 
     mo->belonging_cells[n] = memo_cross;
@@ -526,9 +524,11 @@ void EnvMap::popSegment(Segment* o)
 
 bool EnvMap::subdivideVolume(Dart dglobal)
 {
+    bool res =false;
+#ifdef IHMap
+
 
-    unsigned int max = map.getMaxLevel() ;
-    map.setCurrentLevel(max) ;
+    map.setCurrentLevel(map.getMaxLevel()) ;
     unsigned int vLevel = map.volumeLevel(dglobal);
     Dart old = map.volumeOldestDart(dglobal);
 
@@ -542,6 +542,9 @@ bool EnvMap::subdivideVolume(Dart dglobal)
         {
             if(map.volumeLevel(nv) == vLevel - 1)
             {
+#ifdef DEBUG_affichage
+    std::cout << "cascade en : "<<nv<< std::endl;
+#endif
                 subdivideVolume(nv);
             }
         }
@@ -550,10 +553,10 @@ bool EnvMap::subdivideVolume(Dart dglobal)
     // on commence ensuite a subdiviser
 
 
-    bool res =false;
-#ifdef IHMap
+
+
     CGoGNout<<"debut refine"<<CGoGNendl;
-    map.setCurrentLevel(max) ;
+    map.setCurrentLevel(map.getMaxLevel()) ;
 
 #ifdef DEBUG_affichage
     std::cout << "dglobal = " << dglobal << "level = "<< map.getDartLevel(dglobal) << std::endl;
-- 
GitLab