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

Timestamp:

11/23/06 12:25:16 (18 years ago)

Author:

mattausch

Message:

 

File:

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

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

@@ -474 +474 @@
         {
                 // decide upon next split type
-                const float vspPriority = viewSpaceQueue.Top() ? viewSpaceQueue.Top()->GetPriority() : -1e20f;
-                const float ospPriority = objectSpaceQueue.Top() ? objectSpaceQueue.Top()->GetPriority() : -1e20f;
+                const float vspPriority = 
+                        viewSpaceQueue.Top() ? viewSpaceQueue.Top()->GetPriority() : -1e20f;
+                const float ospPriority = 
+                        objectSpaceQueue.Top() ? objectSpaceQueue.Top()->GetPriority() : -1e20f;
                 
                 cout << "new decicion, vsp: " << vspPriority << ", osp: " << ospPriority << endl;
@@ -505 +507 @@
                         const int repaired = RepairQueue(dirtyVspList, viewSpaceQueue, true);
             
-                        cout << "\nrepaired " << repaired << " candidates from " << (int)dirtyVspList.size() << " dirtied candidates" << endl;
+                        cout << "\nrepaired " << repaired << " candidates from " 
+                                 << (int)dirtyVspList.size() << " dirtied candidates" << endl;
                 }
                 else
@@ -535 +538 @@
                         const int repaired = RepairQueue(dirtyOspList, objectSpaceQueue, true);
 
-                        cout << "\nrepaired " << repaired << " candidates from " << (int)dirtyOspList.size() << " dirtied candidates" << endl;
+                        cout << "\nrepaired " << repaired << " candidates from " 
+                                 << (int)dirtyOspList.size() << " dirtied candidates" << endl;
                 }
         }
@@ -586 +590 @@
                 // prepare vsp tree for traversal
         mViewSpaceSubdivisionType = mSavedViewSpaceSubdivisionType;
-                
                 PrepareViewSpaceSubdivision(mTQueue, sampleRays, objects);
         }
@@ -596 +599 @@
                 PrepareObjectSpaceSubdivision(mTQueue, sampleRays, objects);
         }
-
+        
         // begin subdivision
         RunConstruction(mRepairQueue, sampleRays, objects, forcedViewSpace);
@@ -2047 +2050 @@
         
         SubdivisionCandidate *firstVsp = mVspTree->PrepareConstruction(sampleRays, *viewSpaceRays);
+        tQueue.Push(firstVsp);
+
         mBvHierarchy->PrepareConstruction(tQueue, sampleRays, objects);
 
@@ -2054 +2059 @@
         firstVsp->SetPriority((float)-oldVspRoot->mTimeStamp);
         firstBvh->SetPriority((float)-oldBvhRoot->GetTimeStamp());
-
-        tQueue.Push(firstVsp);
         
         ExportStats(stats, tQueue, objects);