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

Timestamp:

10/06/06 21:37:00 (18 years ago)

Author:

mattausch

Message:

 

File:

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

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

@@ -58 +58 @@
         mVspTree->mHierarchyManager = this;
         
+        mViewSpaceSubdivisionType = KD_BASED_VIEWSPACE_SUBDIV;
         ParseEnvironment();
 }
@@ -72 +73 @@
         mVspTree->mHierarchyManager = this;
 
+        mViewSpaceSubdivisionType = KD_BASED_VIEWSPACE_SUBDIV;
         ParseEnvironment();
 }
@@ -78 +80 @@
 void HierarchyManager::ParseEnvironment()
 {
-        char subdivisionStatsLog[100];
-        Environment::GetSingleton()->GetStringValue("Hierarchy.subdivisionStats", 
-                subdivisionStatsLog);
-        mSubdivisionStats.open(subdivisionStatsLog);
-
         Environment::GetSingleton()->GetFloatValue(
                 "Hierarchy.Termination.minGlobalCostRatio", mTermMinGlobalCostRatio);
@@ -109 +106 @@
                 "Hierarchy.Construction.useMultiLevel", mUseMultiLevelConstruction);
 
-         mUseMultiLevelConstruction;
+        Environment::GetSingleton()->GetIntValue(
+                "Hierarchy.Construction.levels", mNumMultiLevels);
+
         Debug << "******** Hierachy Manager Parameters ***********" << endl;
         Debug << "max leaves: " << mTermMaxLeaves << endl;
@@ -117 +116 @@
         Debug << "min depth for object space subdivision: " << mMinDepthForObjectSpaceSubdivion << endl;
         Debug << "repair queue: " << mRepairQueue << endl;
+        Debug << "number of multilevels: " << mNumMultiLevels << endl;
         Debug << endl;
 }
@@ -198 +198 @@
 
 
-void HierarchyManager::EvalSubdivisionStats(const SubdivisionCandidate &tData)
-{
-        const float costDecr = tData.GetRenderCostDecrease();
-cout << "here44 " << mHierarchyStats.pvsEntries << endl;
+void HierarchyManager::EvalSubdivisionStats(const float renderCostDecr)
+{
+        //cout << "pvs entries " << mHierarchyStats.pvsEntries << endl;
         AddSubdivisionStats(mHierarchyStats.Leaves(),
-                                                costDecr,
+                                                renderCostDecr,
                                                 mTotalCost,
-                                                //mPvsEntries
                                                 mHierarchyStats.pvsEntries
                                                 );
@@ -253 +251 @@
         else
         {
+                char subdivisionStatsLog[100];
+                Environment::GetSingleton()->GetStringValue("Hierarchy.subdivisionStats", 
+                subdivisionStatsLog);
+                mSubdivisionStats.open(subdivisionStatsLog);
+
                 ConstructInterleaved(sampleRays, objects, forcedViewSpace);
         }
@@ -267 +270 @@
 
         mTotalCost = (float)objects.size();
+        EvalSubdivisionStats(0);
         Debug << "setting total cost to " << mTotalCost << endl;
 
@@ -315 +319 @@
 {
         cout << "\nstarting view space hierarchy construction ... " << endl;
-         // hack: reset global cost misses
+        // hack: reset global cost misses
         mHierarchyStats.mGlobalCostMisses = 0;
-
+        
         RayInfoContainer *viewSpaceRays = new RayInfoContainer();
         SubdivisionCandidate *vsc = 
@@ -346 +350 @@
 
 void HierarchyManager::PrepareBvHierarchy(const VssRayContainer &sampleRays,
-                                                                                  const ObjectContainer &objects) 
-
+                                                                                  const ObjectContainer &objects)
 {
         const long startTime = GetTime();
@@ -387 +390 @@
 
 
-bool HierarchyManager::ApplySubdivisionCandidate(SubdivisionCandidate *sc)
+bool HierarchyManager::ApplySubdivisionCandidate(SubdivisionCandidate *sc, const bool repairQueue)
 {
         const bool globalTerminationCriteriaMet = GlobalTerminationCriteriaMet(sc);
@@ -406 +409 @@
         }
 
-        if (vspSplit)
-        {
-                VspNode *n = mVspTree->Subdivide(mTQueue, sc, globalTerminationCriteriaMet);
-
-                if (n->IsLeaf()) // local or global termination criteria failed
-                        return false;
-        }
-        else
-        {
-                if (mObjectSpaceSubdivisionType == KD_BASED_OBJ_SUBDIV)
-                {
-                        KdNode *n = mOspTree->Subdivide(mTQueue, sc, globalTerminationCriteriaMet);
-                        // local or global termination criteria failed
-                        if (n->IsLeaf()) 
-                                return false;
-                }
-                else if (mObjectSpaceSubdivisionType == BV_BASED_OBJ_SUBDIV)
-                {
-                        BvhNode *n = mBvHierarchy->Subdivide(mTQueue, sc, globalTerminationCriteriaMet);
-                        // local or global termination criteria failed
-                        if (n->IsLeaf())
-                                return false;
-                }
+        bool success;
+        switch (sc->Type())
+        {
+        case SubdivisionCandidate::VIEW_SPACE:
+                {
+                        VspNode *n = mVspTree->Subdivide(mTQueue, sc, globalTerminationCriteriaMet);
+                        success = !n->IsLeaf(); // local or global termination criteria failed?
+                }
+                break;
+        case SubdivisionCandidate::OBJECT_SPACE:
+                {
+                        if (mObjectSpaceSubdivisionType == KD_BASED_OBJ_SUBDIV)
+                        {
+                                KdNode *n = mOspTree->Subdivide(mTQueue, sc, globalTerminationCriteriaMet);
+                                // local or global termination criteria failed
+                                success = !n->IsLeaf();
+                        }
+                        else if (mObjectSpaceSubdivisionType == BV_BASED_OBJ_SUBDIV)
+                        {
+                                BvhNode *n = mBvHierarchy->Subdivide(mTQueue, sc, globalTerminationCriteriaMet);
+                                // local or global termination criteria failed
+                                success = !n->IsLeaf();                                 
+                        }
+                }
+                break;
+        default:
+                break;
+        }
+
+        cout << sc->Type() << " ";
+                
+        // update stats
+        mHierarchyStats.nodes += 2;
+        
+        const int pvsEntries = sc->GetPvsEntriesIncr();
+        mHierarchyStats.pvsEntries += pvsEntries;
+        
+        //cout << "pvs entries: " << pvsEntries << " " << mHierarchyStats.pvsEntries << endl;
+        mHierarchyStats.memory += 0; // TODO
+        
+        // subdivision successful
+        EvalSubdivisionStats(sc->GetRenderCostDecrease());
+                
+        // reevaluate candidates affected by the split for view space splits, 
+        // this would be object space splits and other way round
+        if (repairQueue) 
+        {       
+                RepairQueue();
         }
 
@@ -507 +535 @@
                 //-- subdivide leaf node
 
-                if (ApplySubdivisionCandidate(mCurrentCandidate))
-                {
-                        cout << mCurrentCandidate->Type() << " ";
-                
-                        // update stats
-                        mHierarchyStats.nodes += 2;
-                        const int pvsEntries = mCurrentCandidate->GetPvsEntriesIncr();
-                        mHierarchyStats.pvsEntries += pvsEntries;
-                        cout << "pvs entries: " << pvsEntries << " " << mHierarchyStats.pvsEntries << endl;
-                        mHierarchyStats.memory += 0; // TODO
-                        // subdivision successful
-                        EvalSubdivisionStats(*mCurrentCandidate);
-                
-                        // reevaluate candidates affected by the split for view space splits, 
-                        // this would be object space splits and other way round
-                        if (repairQueue) 
-                        {       
-                                RepairQueue();
-                        }
-                }
-
+                ApplySubdivisionCandidate(mCurrentCandidate, repairQueue);
+                                
                 // we use objects for evaluating vsp tree construction until 
                 // a certain depth once a certain depth existiert ...
@@ -569 +578 @@
 {
         int i = 0;
+        // main loop
         while (!FinishedConstruction())
         {
                 mCurrentCandidate = NextSubdivisionCandidate();    
                         
-                ///////////////////
+                ///////
                 //-- subdivide leaf node
 
-                if (ApplySubdivisionCandidate(mCurrentCandidate))
-                {
-                        cout << mCurrentCandidate->Type() << " ";
-                        if (0) cout << "subdividing candidate " << ++ i << " of type " 
-                                                << mCurrentCandidate->Type() << endl;
-                        mHierarchyStats.nodes += 2;
-
-                        // subdivision successful
-                        EvalSubdivisionStats(*mCurrentCandidate);
-                
-                        // reevaluate candidates affected by the split for view space splits, 
-                        // this would be object space splits and other way round
-                        if (repairQueue) 
-                        {
-                                RepairQueue();
-                        }
-                }
-
+                ApplySubdivisionCandidate(mCurrentCandidate, repairQueue);
                 DEL_PTR(mCurrentCandidate);
         }
@@ -601 +594 @@
 void HierarchyManager::ResetObjectSpaceSubdivision(const VssRayContainer &sampleRays, 
                                                                                                    const ObjectContainer &objects)
-{
+{       
 #if 0   
                 DEL_PTR(mBvHierarchy);
@@ -609 +602 @@
                 PrepareObjectSpaceSubdivision(sampleRays, objects);
                 return;
-#endif
-
+#else
+        
+        // no object space subdivision yet
         if (!ObjectSpaceSubdivisionConstructed())
         {
@@ -616 +610 @@
         }
 
+        // object space partition constructed => reconstruct
         switch (mObjectSpaceSubdivisionType)
         {
         case BV_BASED_OBJ_SUBDIV:
-                cout << "\nreseting bv hierarchy" << endl;
-        Debug << "old bv hierarchy:\n " << mBvHierarchy->mBvhStats << endl;
-        
-                mHierarchyStats.nodes -= mBvHierarchy->mBvhStats.nodes;
-                mTQueue.Push(mBvHierarchy->Reset(sampleRays, objects));
-                mTotalCost = mBvHierarchy->mTotalCost;
+                {
+                        cout << "\nreseting bv hierarchy" << endl;
+                        Debug << "old bv hierarchy:\n " << mBvHierarchy->mBvhStats << endl;
+        
+                        SubdivisionCandidate *firstCandidate = 
+                                mBvHierarchy->Reset(sampleRays, objects);
+
+                        mTQueue.Push(firstCandidate);
+                        mTotalCost = mBvHierarchy->mTotalCost;
+
+                        mHierarchyStats.nodes = 2;
+                        mHierarchyStats.pvsEntries = 0;
+                        EvalSubdivisionStats(0);
+                }
                 break;
 
@@ -633 +636 @@
                 break;
         }
+#endif
 }
 
@@ -639 +643 @@
                                                                                                  const ObjectContainer &objects)
 {
-        DEL_PTR(mBvHierarchy);
-        mBvHierarchy = new BvHierarchy();
-        mBvHierarchy->mHierarchyManager = this;
+        ViewCellsManager *vc = mVspTree->mViewCellsManager;
+
+        DEL_PTR(mVspTree);
+        mVspTree = new VspTree();
+        mVspTree->mHierarchyManager = this;
+        mVspTree->mViewCellsManager = vc;
 
         PrepareViewSpaceSubdivision(sampleRays, objects);
-        return;
+        
+        mHierarchyStats.nodes = 2;
+        mHierarchyStats.pvsEntries = 0;
+        EvalSubdivisionStats(0);
+
 }
 
@@ -665 +676 @@
         mVspTree->ComputeBoundingBox(sampleRays, forcedViewSpace);
 
-        // use sah for evaluating object space construction for the first run
+        // use sah for evaluating osp tree construction 
+        // in the first iteration of the subdivision
+        
         mSavedViewSpaceSubdivisionType = mViewSpaceSubdivisionType;
         mViewSpaceSubdivisionType = NO_VIEWSPACE_SUBDIV;
-        
-        const int limit = 4;
+
+        mSavedObjectSpaceSubdivisionType = mObjectSpaceSubdivisionType;
+        //mObjectSpaceSubdivisionType = NO_OBJ_SUBDIV;
+
+        const int limit = mNumMultiLevels;
         int i = 0;
 
@@ -678 +694 @@
         while (1)
         {
-        // first run object space subdivision
+                char subdivisionStatsLog[100];
+                sprintf(subdivisionStatsLog, "tests/i3d/subdivision-%04d.log", i);
+                mSubdivisionStats.open(subdivisionStatsLog);
+
+                // fsubdivide object space first
                 ResetObjectSpaceSubdivision(sampleRays, objects);
-
                 // process object space candidates
                 RunConstruction(false);
 
-                if ((++ i) >= limit)
+                // object space subdivision constructed
+                mObjectSpaceSubdivisionType = mSavedObjectSpaceSubdivisionType;
+
+                cout << "iteration " << i << " of " << limit << " finished" << endl;
+
+                mSubdivisionStats.close();
+                if ((i ++) >= limit)
                         break;
 
+                sprintf(subdivisionStatsLog, "tests/i3d/subdivision-%04d.log", i);
+                mSubdivisionStats.open(subdivisionStatsLog);
+
                 /////////////////
-                // do view space subdivison with respect to the object space partition
+                // subdivide view space with respect to the objects
+
                 ResetViewSpaceSubdivision(sampleRays, objects);
-
                 // process view space candidates
                 RunConstruction(false);
+                // view space subdivision constructed
                 mViewSpaceSubdivisionType = mSavedViewSpaceSubdivisionType;
-                
-                if ((++ i) >= limit)
+        
+                cout << "iteration " << i << " of " << limit << " finished" << endl;
+
+                mSubdivisionStats.close();
+
+                if ((i ++) >= limit)
                         break;
-
-                cout << "iteration " << i << " of " << limit << " finished" << endl;
         }
         
@@ -729 +760 @@
                 return mBvHierarchy && mBvHierarchy->GetRoot();
         default:
-        return false;
+                return false;
         }
 }
@@ -808 +839 @@
 
         // collect list of "dirty" candidates
-        long startTime = GetTime();
+        const long startTime = GetTime();
    
         vector<SubdivisionCandidate *> dirtyList;
@@ -827 +858 @@
                 sc->EvalPriority(); // reevaluate
                 
-                /*
+#ifdef _DEBUG
                 Debug << "candidate " << sc << " reevaluated\n" 
                           << "render cost decrease diff " <<  rcd - sc->GetRenderCostDecrease()
-                          << " old: " << rcd << " new " << sc->GetRenderCostDecrease() << endl;*/
-                if (0)
-                {
-                        const float rcDiff =  rcd - sc->GetRenderCostDecrease();
-                        mTotalCost += rcDiff;
-                }
+                          << " old: " << rcd << " new " << sc->GetRenderCostDecrease() << endl;
+#endif  
                 mTQueue.Push(sc); // reinsert
+                cout << ".";
         }
 
         long endTime = GetTime();
         Real timeDiff = TimeDiff(startTime, endTime);
-
         mHierarchyStats.repairTime += timeDiff;
 
-        if (0) cout << "finished in " << timeDiff * 1e-3f << " secs" << endl;
+        if (1) cout << "repaired in " << timeDiff * 1e-3f << " secs" << endl;
 }
 
@@ -864 +891 @@
         SubdivisionCandidateContainer::const_iterator sit, sit_end = mCandidateBuffer.end();
     for (sit = mCandidateBuffer.begin(); sit != sit_end; ++ sit)
-        {cout << ":";
+        {
                 mTQueue.Push(*sit);
         }