Changeset 1415 for GTP/trunk/Lib/Vis/Preprocessing/src/HierarchyManager.cpp

Timestamp:

09/18/06 18:57:34 (18 years ago)

Author:

mattausch

Message:

 

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/HierarchyManager.cpp (modified) (10 diffs)

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

@@ -309 +309 @@
 {
         cout << "starting bv hierarchy construction ... " << endl;
-
         mBvHierarchy->CreateRoot(objects);
 
@@ -317 +316 @@
 
         mTotalCost = mBvHierarchy->mTotalCost;
-        Debug << "reseting cost, new total cost: " << mTotalCost << endl;
+        Debug << "\nreseting cost, new total cost: " << mTotalCost << endl;
 
     mTQueue.Push(sc);
@@ -373 +372 @@
                 }
         }
+
         return true;//!globalTerminationCriteriaMet;
 }
@@ -458 +458 @@
                 }
                 
-                ///////////////////////////
+                ///////////////////
                 //-- subdivide leaf node
+
                 if (ApplySubdivisionCandidate(mCurrentCandidate))
                 {
-                        cout << "subdividing candidate " << ++ i << " of type " << mCurrentCandidate->Type() << endl;
+                        cout << mCurrentCandidate->Type() << " ";
+                        if (0) cout << "subdividing candidate " << ++ i << " of type " << mCurrentCandidate->Type() << endl;
                         mHierarchyStats.nodes += 2;
 
@@ -474 +476 @@
 
                 // we use objects for evaluating vsp tree construction until 
-                // a certain depth once a certain depth existiert ....
+                // a certain depth once a certain depth existiert ...
                 if (StartObjectSpaceSubdivision())
                 {
                         mObjectSpaceSubdivisionType = mSavedObjectSpaceSubdivisionType;
 
-                        cout << "starting object space subdivision at depth " 
+                        cout << "\nstarting object space subdivision at depth " 
                                  << mVspTree->mVspStats.maxDepth << " (" 
                                  << mMinDepthForObjectSpaceSubdivion << ") " << endl;
@@ -494 +496 @@
                         mViewSpaceSubdivisionType = mSavedViewSpaceSubdivisionType;
 
-                        cout << "starting view space subdivision at depth " 
+                        cout << "\nstarting view space subdivision at depth " 
                                  << GetObjectSpaceSubdivisionDepth() << " (" 
                                  << mMinDepthForViewSpaceSubdivion << ") " << endl;
@@ -608 +610 @@
         vector<SubdivisionCandidate *> dirtyList;
         CollectDirtyCandidates(dirtyList);
-        cout << "repairing " << (int)dirtyList.size() << " candidates ... ";
-        
+        if (0) cout << "repairing " << (int)dirtyList.size() << " candidates ... ";
+        
+        /////////////////////////////////
         //-- reevaluate the dirty list
+
         SubdivisionCandidateContainer::const_iterator sit, sit_end = dirtyList.end();
         
@@ -638 +642 @@
         mHierarchyStats.repairTime += timeDiff;
 
-        cout << "finished in " << timeDiff * 1e-3f << " secs" << endl;
+        if (0) cout << "finished in " << timeDiff * 1e-3f << " secs" << endl;
 }
 
@@ -753 +757 @@
         case BV_BASED_OBJ_SUBDIV:
                 {
-                        ExportBvHierarchy(exporter, objects);
+                        AxisAlignedBox3 bbox = mBvHierarchy->GetBoundingBox();
+                        bbox.Scale(Vector3(0.5, 1, 0.5));
+                        
+                        ExportBvHierarchy(exporter, objects, &bbox);
                         break;
                 }
@@ -763 +770 @@
 
 void HierarchyManager::ExportBvHierarchy(Exporter *exporter, 
-                                                                                 const ObjectContainer &objects) const
+                                                                                 const ObjectContainer &objects,
+                                                                                 AxisAlignedBox3 *bbox) const
 {
         exporter->SetWireframe();
-        exporter->ExportBvHierarchy(*mBvHierarchy, 0);
+        exporter->ExportBvHierarchy(*mBvHierarchy, 0, bbox);
 }