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

Timestamp:

08/22/06 22:48:02 (18 years ago)

Author:

mattausch

Message:

 

File:

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

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

@@ -20 +20 @@
 #include "VspTree.h"
 #include "OspTree.h"
+#include "BvHierarchy.h"
 
 
@@ -33 +34 @@
 
 
-HierarchyManager::HierarchyManager(VspTree &vspTree, OspTree &ospTree):
-mVspTree(vspTree), mOspTree(ospTree)
-{
-        // cross references
-        mVspTree.mOspTree = &ospTree;
-        mOspTree.mVspTree = &vspTree;
-
+HierarchyManager::HierarchyManager(VspTree &vspTree, OspTree &ospTree)
+//:mVspTree(vspTree), mOspTree(ospTree)
+{
         char subdivisionStatsLog[100];
         Environment::GetSingleton()->GetStringValue("Hierarchy.subdivisionStats", 
@@ -63 +60 @@
 {
         SubdivisionCandidate *vsc = 
-                mVspTree.PrepareConstruction(sampleRays, forcedViewSpace, viewSpaceRays);
+                mVspTree->PrepareConstruction(sampleRays, forcedViewSpace, viewSpaceRays);
         mTQueue.Push(vsc);
 
         SubdivisionCandidate *osc = 
-                mOspTree.PrepareConstruction(sampleRays, objects, forcedViewSpace, objectSpaceRays);
+                mOspTree->PrepareConstruction(sampleRays, objects, forcedViewSpace, objectSpaceRays);
 
         mTQueue.Push(osc);
@@ -78 +75 @@
 
         //mTotalCost -= costDecr;
-        // mTotalPvsSize += tFrontData.mPvs + tBackData.mPvs - tData.mPvs;
-
-        AddSubdivisionStats(mOspTree.mOspStats.Leaves() + mVspTree.mVspStats.Leaves(),
+        //mTotalPvsSize += tFrontData.mPvs + tBackData.mPvs - tData.mPvs;
+
+        AddSubdivisionStats(mOspTree->mOspStats.Leaves() + mVspTree->mVspStats.Leaves(),
                                                 costDecr,
                                                 mTotalCost
@@ -116 +113 @@
         PrepareConstruction(sampleRays, objects, forcedViewSpace, *viewSpaceRays, *objectSpaceRays);
 
-        mVspTree.mVspStats.Reset();
-        mVspTree.mVspStats.Start();
+        mVspTree->mVspStats.Reset();
+        mVspTree->mVspStats.Start();
 
         cout << "Constructing view space / object space tree ... \n";
@@ -126 +123 @@
         cout << "finished in " << TimeDiff(startTime, GetTime())*1e-3 << " secs" << endl;
 
-        mVspTree.mVspStats.Stop();
+        mVspTree->mVspStats.Stop();
 }
 
@@ -139 +136 @@
         if (vspSplit)
         {
-                VspNode *n = mVspTree.Subdivide(mTQueue, sc, globalTerminationCriteriaMet);
+                VspNode *n = mVspTree->Subdivide(mTQueue, sc, globalTerminationCriteriaMet);
         }
         else
         {
-                KdNode *n = mOspTree.Subdivide(mTQueue, sc, globalTerminationCriteriaMet);
+                KdNode *n = mOspTree->Subdivide(mTQueue, sc, globalTerminationCriteriaMet);
         }
         
@@ -209 +206 @@
         // during view space partition
         const bool savedCountMethod = mVspTree.mUseKdPvsForHeuristics;
-        const bool savedStoreMethod = mVspTree.mStoreKdPvs;
+        const bool savedStoreMethod = mVspTree.mStoreObjectPvs;
         
         mVspTree.mUseKdPvsForHeuristics = false;
-        mVspTree.mStoreKdPvs = false;
+        mVspTree.mStoreObjectPvs = false;
 #endif
 
         SubdivisionCandidate *vsc = 
-                mVspTree.PrepareConstruction(sampleRays, forcedViewSpace, *viewSpaceRays);
+                mVspTree->PrepareConstruction(sampleRays, forcedViewSpace, *viewSpaceRays);
 
         // add to queue
@@ -224 +221 @@
         cout << "starting vsp contruction ... " << endl;
 
-        mVspTree.mVspStats.Reset();
-        mVspTree.mVspStats.Start();
+        mVspTree->mVspStats.Reset();
+        mVspTree->mVspStats.Start();
 
         int i = 0;
@@ -238 +235 @@
 
         cout << "finished in " << TimeDiff(startTime, GetTime())*1e-3 << " secs" << endl;
-        mVspTree.mVspStats.Stop();
-        
+        mVspTree->mVspStats.Stop();
 
 
@@ -255 +251 @@
         // compute first candidate
         SubdivisionCandidate *osc =
-                mOspTree.PrepareConstruction(sampleRays, objects, forcedViewSpace, *objectSpaceRays);
+                mOspTree->PrepareConstruction(sampleRays, objects, forcedViewSpace, *objectSpaceRays);
 
         Debug << "reseting cost, new total cost: " << mTotalCost << endl;
-        mTotalCost = mOspTree.mTotalCost;
+        mTotalCost = mOspTree->mTotalCost;
 
     mTQueue.Push(osc);
 
-        mOspTree.mOspStats.Reset();
-        mOspTree.mOspStats.Start();
+        mOspTree->mOspStats.Reset();
+        mOspTree->mOspStats.Start();
 
         startTime = GetTime();
@@ -272 +268 @@
         cout << "finished in " << TimeDiff(startTime, GetTime()) * 1e-3 << " secs" << endl;
 
-        mOspTree.mOspStats.Stop();
-
-        float rc = mOspTree.EvalRenderCost(sampleRays);
+        mOspTree->mOspStats.Stop();
+
+        float rc = mOspTree->EvalRenderCost(sampleRays);
 
         Debug << "here47 My render cost evalulation: " << rc << endl;
@@ -280 +276 @@
 #if 0
         // reset parameters
-        mVspTree.mUseKdPvsForHeuristics = savedCountMethod;
-        mVspTree.mStoreKdPvs = savedStoreMethod;
+        mVspTree->mUseKdPvsForHeuristics = savedCountMethod;
+        mVspTree->mStoreObjectPvs = savedStoreMethod;
 #endif
 }
@@ -290 +286 @@
                                                                   AxisAlignedBox3 *forcedViewSpace)
 {
-        // only view space partition
+        // construct only view space partition
         // object kd tree is taken for osp
 
-        mVspTree.mVspStats.Reset();
-        mVspTree.mVspStats.Start();
+        mVspTree->mVspStats.Reset();
+        mVspTree->mVspStats.Start();
 
         RayInfoContainer *viewSpaceRays = new RayInfoContainer();
         
         SubdivisionCandidate *sc = 
-                mVspTree.PrepareConstruction(sampleRays, forcedViewSpace, *viewSpaceRays);
+                mVspTree->PrepareConstruction(sampleRays, forcedViewSpace, *viewSpaceRays);
 
         mTQueue.Push(sc);
@@ -310 +306 @@
 
         cout << "finished in " << TimeDiff(startTime, GetTime())*1e-3 << " secs" << endl;
-        mVspTree.mVspStats.Stop();
+        mVspTree->mVspStats.Stop();
 }
 
@@ -320 +316 @@
 
 
-void HierarchyManager::CollectDirtyCandidates(vector<SubdivisionCandidate *> &dirtyList)
+void HierarchyManager::CollectObjectSpaceDirtyList(SubdivisionCandidateContainer &dirtyList)
+{
+        switch (mObjectSpaceSubdivisonType)
+        {
+        case KD_BASED_OBJ_SUBDIV:
+                {
+                        OspTree::OspSubdivisionCandidate *sc = 
+                                dynamic_cast<OspTree::OspSubdivisionCandidate *>(mCurrentCandidate);
+
+                        mOspTree->CollectDirtyCandidates(sc, dirtyList);
+                        break;
+                }
+        case BV_BASED_OBJ_SUBDIV:
+                {
+                        BvHierarchy::BvhSubdivisionCandidate *sc = 
+                                dynamic_cast<BvHierarchy::BvhSubdivisionCandidate *>(mCurrentCandidate);
+
+                        mBvHierarchy->CollectDirtyCandidates(sc, dirtyList);
+                        break;
+                }
+        default:
+                break;
+        }
+}
+
+
+void HierarchyManager::CollectViewSpaceDirtyList(SubdivisionCandidateContainer &dirtyList)
+{
+        VspTree::VspSubdivisionCandidate *sc = 
+                dynamic_cast<VspTree::VspSubdivisionCandidate *>(mCurrentCandidate);
+
+        mVspTree->CollectDirtyCandidates(sc, dirtyList);
+}
+
+
+void HierarchyManager::CollectDirtyCandidates(SubdivisionCandidateContainer &dirtyList)
 {       
         // we have either a object space or view space split
         if (mCurrentCandidate->Type() == SubdivisionCandidate::VIEW_SPACE)
         {
-                VspTree::VspSubdivisionCandidate *sc = 
-                        dynamic_cast<VspTree::VspSubdivisionCandidate *>(mCurrentCandidate);
-
-                mVspTree.CollectDirtyCandidates(sc, dirtyList);
+                CollectViewSpaceDirtyList(dirtyList);
         }
         else // object space split
-        {                       
-                OspTree::OspSubdivisionCandidate *sc = 
-                        dynamic_cast<OspTree::OspSubdivisionCandidate *>(mCurrentCandidate);
-
-                mOspTree.CollectDirtyCandidates(sc, dirtyList);
+        {       
+                CollectObjectSpaceDirtyList(dirtyList);
         }
 }
@@ -380 +405 @@
 }
 
-}
+
+}