Changeset 1841 for GTP/trunk/Lib/Vis/Preprocessing/src/BvHierarchy.cpp

Timestamp:

12/02/06 00:15:15 (18 years ago)

Author:

mattausch

Message:

removed bug in initial subdivision

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/BvHierarchy.cpp (modified) (4 diffs)

GTP/trunk/Lib/Vis/Preprocessing/src/BvHierarchy.cpp

@@ -2179 +2179 @@
                 for (cit = candidateContainer.begin(); cit != cit_end; ++ cit)
                 {
+                        BvhSubdivisionCandidate *sCandidate = dynamic_cast<BvhSubdivisionCandidate *>(*cit);
+                        
                         // reevaluate priority
-                        EvalSubdivisionCandidate(*oSubdivisionCandidate);
-                        tQueue.Push(*cit);
+                        EvalSubdivisionCandidate(*sCandidate);
+                        tQueue.Push(sCandidate);
                 }
         }
@@ -2193 +2195 @@
         }
                 
-        cout << "!!size: " << GetStatistics().Leaves() << endl;
+        cout << "size of initial bv subdivision: " << GetStatistics().Leaves() << endl;
 }
 
@@ -2580 +2582 @@
         ObjectContainer::const_iterator backObjectsStart = objects->begin();
 
-    for (oit = objects->begin(); oit != (objects->end() - 1); ++ oit)
+        for (oit = objects->begin(); oit != (objects->end() - 1); ++ oit)
         {
                 Intersectable *objS = *oit;
@@ -2630 +2632 @@
                         );
 
-        cout << "criteria met: " << terminationCriteriaMet << " " << (int)tData.mNode->mObjects.size() << " " << mInitialMinObjects << endl
-                 << AreaRatio(tData.mNode->mObjects.front(), tData.mNode->mObjects.back()) << " " << mInitialMaxAreaRatio << endl
-                 << tData.mNode->mObjects.back()->GetBox().SurfaceArea() << " " << mInitialMinArea << endl;
+        cout << "criteria met: "<< terminationCriteriaMet << "\n" 
+                 << "size: " << (int)tData.mNode->mObjects.size() << " max: " << mInitialMinObjects << endl
+                 << "ratio: " << AreaRatio(tData.mNode->mObjects.front(), tData.mNode->mObjects.back()) << " max: " << mInitialMaxAreaRatio << endl
+                 << "area: " << tData.mNode->mObjects.back()->GetBox().SurfaceArea() << " max: " << mInitialMinArea << endl << endl;
 
         return terminationCriteriaMet;