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

Timestamp:

08/30/06 21:54:49 (18 years ago)

Author:

mattausch

Message:

 

File:

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

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

@@ -232 +232 @@
                 || (mHierarchyStats.Leaves() >= mTermMaxLeaves) 
                 //|| (mGlobalCostMisses >= mTermGlobalCostMissTolerance)
-                //||    candidate->GlobalTerminationCriteriaMet()
+                ||      candidate->GlobalTerminationCriteriaMet()
                 );
 }
@@ -269 +269 @@
                                                 *objectSpaceRays);
 
-
         cout << "Constructing view space / object space tree ... \n";
         const long startTime = GetTime();       
         
         const bool repairQueue = true;
+        //const bool repairQueue = false;
+
         // process object space candidates
         RunConstruction(repairQueue);
-
-        cout << "finished in " << TimeDiff(startTime, GetTime())*1e-3 << " secs" << endl;
+        cout << "finished in " << TimeDiff(startTime, GetTime()) * 1e-3 << " secs" << endl;
 
         mVspTree->mVspStats.Stop();
@@ -424 +424 @@
                         if (repair) RepairQueue();
 
-                        cout << "candidate: " << mCurrentCandidate->Type() << ", priority: " 
-                                 << mCurrentCandidate->GetPriority() << endl;
-                }
-
+                        Debug << "candidate: " << mCurrentCandidate->Type() << ", priority: " 
+                                  << mCurrentCandidate->GetPriority() << endl;
+                }
+                
                 DEL_PTR(mCurrentCandidate);
         }
@@ -457 +457 @@
 
                         mBvHierarchy->CollectDirtyCandidates(sc, dirtyList);
+
+sc->mParentData.mNode->SetSubdivisionCandidate(NULL); // HACK
                         break;
                 }
@@ -471 +473 @@
 
         mVspTree->CollectDirtyCandidates(sc, dirtyList);
+
+sc->mParentData.mNode->SetSubdivisionCandidate(NULL); // HACK
 }
 
 
 void HierarchyManager::CollectDirtyCandidates(SubdivisionCandidateContainer &dirtyList)
-{       
+{
         // we have either a object space or view space split
         if (mCurrentCandidate->Type() == SubdivisionCandidate::VIEW_SPACE)
         {
+                Debug << "collecting candidates after view space split" << endl;
                 CollectViewSpaceDirtyList(dirtyList);
         }
         else // object space split
-        {       
+        {       Debug << "collecting candidates after object space split" << endl;
                 CollectObjectSpaceDirtyList(dirtyList);
         }
@@ -509 +514 @@
         // collect list of "dirty" candidates
         vector<SubdivisionCandidate *> dirtyList;
+        Debug << "collecting dirty candidates" << endl;
         CollectDirtyCandidates(dirtyList);
         
         //-- reevaluate the dirty list
         vector<SubdivisionCandidate *>::const_iterator sit, sit_end = dirtyList.end();
+        
+        Debug << "collected " << (int)dirtyList.size() << " candidates" << endl;
 
         for (sit = dirtyList.begin(); sit != sit_end; ++ sit)
         {
                 SubdivisionCandidate* sc = *sit;
-                // erase from queue
-                mTQueue.Erase(sc);
-                // reevaluate
-                sc->EvalPriority();
-                // reinsert
-                mTQueue.Push(sc);
+                float rcd = sc->GetRenderCostDecrease();
+                Debug << "here6 " << rcd << endl;
+                Debug << "here84 " << endl;
+                Debug << "here7 " << sc << endl;
+                Debug << "here90 " << sc->GetPosition() << endl;
+                Debug << "here91 " << sc->Type() << endl;
+                //Debug << "here1191" << sc->Type() << endl;
+                //Debug << "sc: " << sc << " " << sc->GetPosition() << " " << sc->Type() << endl;
+                
+                Debug << "here11" << endl;
+                mTQueue.Erase(sc); // erase from queue
+                Debug << "here2" << endl;
+
+                sc->EvalPriority(); // reevaluate
+                
+        /*      cout << "render cost decrease diff " << rcd - sc->GetRenderCostDecrease() 
+                         << " old: " << rcd << " new " << sc->GetRenderCostDecrease()
+                         << " type " << sc->Type() << endl;*/
+
+                mTQueue.Push(sc); // reinsert
         }
 }