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

Timestamp:

10/27/06 10:39:58 (18 years ago)

Author:

mattausch

Message:

 

File:

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

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

@@ -1667 +1667 @@
         firstBvh->mEvaluationHack = oldBvhRoot;
 
+        firstVsp->SetPriority((float)-oldVspRoot->mTimeStamp);
+        firstBvh->SetPriority((float)-oldBvhRoot->mTimeStamp);
+
         tQueue.Push(firstVsp);
         tQueue.Push(firstBvh);
@@ -1726 +1729 @@
                 cout << "next candidate: " << nextCandidate->GetPriority() << endl;
 
-                if (nextCandidate->Type() == SubdivisionCandidate::VIEW_SPACE)
+        if (nextCandidate->Type() == SubdivisionCandidate::VIEW_SPACE)
+                {
+                        cout << "here8" << endl;
                         mVspTree->SubdivideAndCopy(tQueue, nextCandidate);
+
+                        VspNode *oldNode = (VspNode *)nextCandidate->mEvaluationHack;
+                        
+                        totalRenderCost -= oldNode->mRenderCostDecr;
+                        entriesInPvs += oldNode->mPvsEntriesIncr;
+                }
                 else
+                {cout << "here9" << endl;
                         mBvHierarchy->SubdivideAndCopy(tQueue, nextCandidate);
-
-                totalRenderCost -= nextCandidate->GetRenderCostDecrease();
-                entriesInPvs += nextCandidate->GetPvsEntriesIncr();
+                        
+                        BvhNode *oldNode = (BvhNode *)nextCandidate->mEvaluationHack;
+                        
+                        totalRenderCost -= oldNode->mRenderCostDecr;
+                        entriesInPvs += oldNode->mPvsEntriesIncr;
+                }               
 
                 ++ steps;
-                
+                cout << "rc: " << nextCandidate->GetRenderCostDecrease() << endl;
+                cout << "pvs: " << nextCandidate->GetPvsEntriesIncr() << endl;
+
                 const float memoryCost = (float)entriesInPvs * (float)ObjectPvs::GetEntrySize();
                 UpdateStats(stats, steps, totalRenderCost, entriesInPvs, memoryCost, false);