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

Timestamp:

03/06/07 17:37:28 (17 years ago)

Author:

mattausch

Message:

 

File:

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

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

@@ -282 +282 @@
         // split was not reevaluated before => do it now
         if (splitCandidate->IsDirty())
+        {
                 splitCandidate->EvalCandidate();
+        }
 
         return splitCandidate;
@@ -411 +413 @@
 void HierarchyManager::PrintTimings(const bool lastSplitWasOsp)
 {
-        double sortTime, evalTime, nodeTime, splitTime, subdTime;
-
-        sortTime = mBvHierarchy->mSortTimer.TotalTime();
+        double sortTime, evalTime, nodeTime, splitTime, subdTime, planeTime, collectTime, viewCellsTime;
+
+        sortTime = mBvHierarchy->mSort2Timer.TotalTime();
         evalTime = mBvHierarchy->mEvalTimer.TotalTime();
         nodeTime = mBvHierarchy->mNodeTimer.TotalTime();
         splitTime = mBvHierarchy->mSplitTimer.TotalTime();
         subdTime = mBvHierarchy->mSubdivTimer.TotalTime();
+        planeTime = mBvHierarchy->mPlaneTimer.TotalTime();
+        collectTime = mBvHierarchy->mCollectTimer.TotalTime();
 
         cout << "bvh times"
@@ -424 +428 @@
                  << " node : " << nodeTime
                  << " split: " << splitTime
-                 << " subd : " << subdTime << endl;
+                 << " subd : " << subdTime 
+                 << " plane: " << planeTime 
+                 << " colct: " << collectTime
+                 << endl;
 
         Debug << "bvh times"
@@ -431 +438 @@
                  << " node : " << nodeTime
                  << " split: " << splitTime
-                 << " subd : " << subdTime << endl;
+                 << " subd : " << subdTime
+                 << " plane: " << planeTime 
+                 << " colct: " << collectTime
+                 << endl;
 
         sortTime = mVspTree->mSortTimer.TotalTime();
@@ -438 +448 @@
         splitTime = mVspTree->mSplitTimer.TotalTime();
         subdTime = mVspTree->mSubdivTimer.TotalTime();
+        planeTime = mVspTree->mPlaneTimer.TotalTime();
+        viewCellsTime = mVspTree->mViewCellsTimer.TotalTime();
 
         cout << "vsp times"
@@ -444 +456 @@
                  << " node : " << nodeTime
                  << " split: " << splitTime
-                 << " subd : " << subdTime << endl;
+                 << " subd : " << subdTime
+                 << " plane: " << planeTime 
+                 << " viewc: " << viewCellsTime 
+                 << endl;
 
         Debug << "vsp times"
-                << " sort : " << sortTime
-                 << " eval : " << evalTime
-                 << " node : " << nodeTime
-                 << " split: " << splitTime
-                 << " subd : " << subdTime << endl;
+                  << " sort : " << sortTime
+                  << " eval : " << evalTime
+                  << " node : " << nodeTime
+                  << " split: " << splitTime
+                  << " subd : " << subdTime
+                  << " plane: " << planeTime 
+                  << " viewc: " << viewCellsTime 
+                  << endl;
+
         cout << endl;
         Debug << endl;
@@ -854 +873 @@
         }
 
-        //cout << "priority: " << sc->GetPriority() << " rc decr: " << sc->GetRenderCostDecrease() << " | ";
+        
         ///////////////
         //-- split was successful => update stats and queue
@@ -877 +896 @@
         const int pvsEntriesIncr = sc->GetPvsEntriesIncr();
         mHierarchyStats.mPvsEntries += pvsEntriesIncr;
-        //cout << "pvs entries: " << pvsEntriesIncr << " " << mHierarchyStats.pvsEntries << endl;
+        //cout << "pvs entries: " << pvsEntriesIncr << " " << mHierarchyStats.mPvsEntries << endl;
 
         // memory size in byte
@@ -1156 +1175 @@
                         mHierarchyStats.mTotalCost = mBvHierarchy->mTotalCost;
                         
+
                         //mHierarchyStats.mPvsEntries -= mBvHierarchy->mPvsEntries + 1;
                         mHierarchyStats.mPvsEntries = mBvHierarchy->CountViewCells(objects);