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

Timestamp:

08/25/06 18:25:09 (18 years ago)

Author:

mattausch

Message:

 

File:

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

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

@@ -260 +260 @@
 
 
-void HierarchyManager::Construct2(const VssRayContainer &sampleRays,
-                                                                  const ObjectContainer &objects,
-                                                                  AxisAlignedBox3 *forcedViewSpace)
-{
-        // rays clipped in view space and in object space
-        RayInfoContainer *viewSpaceRays = new RayInfoContainer();
-        RayInfoContainer *objectSpaceRays = new RayInfoContainer();
-
-
-        /////////////////////////////////////////////////////////////
-        // view space space partition
-        /////////////////////////////////////////////////////////////
-
-#if 0
-        // makes no sense otherwise because only one kd cell available
-        // during view space partition
-        const bool savedCountMethod = mVspTree.mUseKdPvsForHeuristics;
-        const bool savedStoreMethod = mVspTree.mStoreObjectPvs;
-        
-        mVspTree.mUseKdPvsForHeuristics = false;
-        mVspTree.mStoreObjectPvs = false;
-#endif
-        SubdivisionCandidate *vsc = 
-                mVspTree->PrepareConstruction(sampleRays, forcedViewSpace, *viewSpaceRays);
-        
-        // add to queue
-        mTQueue.Push(vsc);
-
-        long startTime = GetTime();
-        cout << "starting vsp contruction ... " << endl;
-
-        mVspTree->mVspStats.Reset();
-        mVspTree->mVspStats.Start();
-
-        int i = 0;
-
-        // all objects can be seen from everywhere
-        mTotalCost = (float)dynamic_cast<VspTree::VspSubdivisionCandidate *>(vsc)->mParentData.mPvs;
-
-        const bool repairQueue = false;
-
-        // process view space candidates
-        RunConstruction(repairQueue);
-
-        cout << "finished in " << TimeDiff(startTime, GetTime())*1e-3 << " secs" << endl;
-        mVspTree->mVspStats.Stop();
-
-
-        /////////////////////////////////////////////////////////////
-        // object space partition
-        /////////////////////////////////////////////////////////////
-
-
-        Debug << "\n$$$$$$$$$ osp tree construction $$$$$$$$$$\n" << endl;
-        cout << "starting osp contruction ... " << endl;
-
-        // start with one big kd cell - all objects can be seen from everywhere
-        // note: only true for view space = object space
-
-        // compute first candidate
-        SubdivisionCandidate *osc =
-                mOspTree->PrepareConstruction(sampleRays, objects, forcedViewSpace, *objectSpaceRays);
-
-        Debug << "reseting cost, new total cost: " << mTotalCost << endl;
-        mTotalCost = mOspTree->mTotalCost;
-
-    mTQueue.Push(osc);
-
-        mOspTree->mOspStats.Reset();
-        mOspTree->mOspStats.Start();
-
-        startTime = GetTime();
-        
-        // process object space candidates
-        RunConstruction(repairQueue);
-        
-        cout << "finished in " << TimeDiff(startTime, GetTime()) * 1e-3 << " secs" << endl;
-
-        mOspTree->mOspStats.Stop();
-
-        //////////////////////////
-        // matt: only for debugging purpose
-
-        const float rc = mOspTree->EvalRenderCost(sampleRays);
-
-        Debug << "My render cost evalulation: " << rc << endl;
-
-#if 0
-        // reset parameters
-        mVspTree->mUseKdPvsForHeuristics = savedCountMethod;
-        mVspTree->mStoreObjectPvs = savedStoreMethod;
-#endif
-}
-
-
 void HierarchyManager::Construct3(const VssRayContainer &sampleRays,
                                                                   const ObjectContainer &objects,
@@ -372 +277 @@
         mTQueue.Push(sc);
 
-        cout << "starting vsp contruction ... " << endl;
+        cout << "starting vsp construction ... " << endl;
 
         long startTime = GetTime();
@@ -552 +457 @@
 void HierarchyManager::ExportObjectSpaceHierarchyForViz(const ObjectContainer &objects) const
 {
-        if (mOspTree && mOspTree->GetRoot()) 
-        {       
-                //-- export final object partition
-                Exporter *exporter = Exporter::GetExporter("final_object_partition.wrl");
+        switch (mObjectSpaceSubdivisonType)
+        {
+        case KD_BASED_OBJ_SUBDIV:
+                {
+                        ExportOspTreeForViz(objects);
+                        break;
+                }
+        case BV_BASED_OBJ_SUBDIV:
+                {
+                        ExportBvhForViz(objects);
+                        break;
+                }
+        default:
+                break;
+        }
+}
+
+
+void HierarchyManager::ExportBvhForViz(const ObjectContainer &objects) const
+{
+}
+
+
+void HierarchyManager::ExportOspTreeForViz(const ObjectContainer &objects) const
+{
+        //-- export final object partition
+        Exporter *exporter = Exporter::GetExporter("final_object_partition.wrl");
                 
-                if (exporter)
-                {
-                        cout << "exporting object space partition ... ";
-
-                        if (1)
-                        {
-                                exporter->ExportGeometry(objects);
-                        }
+        if (exporter)
+        {
+                cout << "exporting object space partition ... ";
+
+                if (1) exporter->ExportGeometry(objects);
                         
 #if 0           
-                        // export rays
-                        exporter->ExportRays(visRays, RgbColor(0, 1, 0));
+                // export rays
+                exporter->ExportRays(visRays, RgbColor(0, 1, 0));
 #endif
-
-                        exporter->SetWireframe();
-        
-                        const int colorCode = 0;
-                        const int maxPvs = 0;//mOspTree.GetStatistics().maxPvs;
-
-                        exporter->ExportOspTree(*mOspTree, 0);
-
-                        delete exporter;
-
-                        cout << "finished" << endl;
-                }
-        }
-}
-
-}
+                exporter->SetWireframe();
+        
+                const int colorCode = 0;
+                const int maxPvs = 0;//mOspTree.GetStatistics().maxPvs;
+
+                exporter->ExportOspTree(*mOspTree, 0);
+                delete exporter;
+
+                cout << "finished" << endl;
+        }
+}
+
+
+void HierarchyManager::Construct2(const VssRayContainer &sampleRays,
+                                                                  const ObjectContainer &objects,
+                                                                  AxisAlignedBox3 *forcedViewSpace)
+{
+        // rays clipped in view space and in object space
+        RayInfoContainer *viewSpaceRays = new RayInfoContainer();
+        
+        /////////////////////////////////////////////////////////////
+        // view space space partition
+        /////////////////////////////////////////////////////////////
+
+        // use objects for evaluating vsp tree construction
+        const int savedobjectSpaceSubdivisionType = mObjectSpaceSubdivisonType;
+        mObjectSpaceSubdivisonType = NO_OBJ_SUBDIV;
+
+        SubdivisionCandidate *vsc = 
+                mVspTree->PrepareConstruction(sampleRays, forcedViewSpace, *viewSpaceRays);
+        
+        // add to queue
+        mTQueue.Push(vsc);
+
+        long startTime = GetTime();
+        cout << "starting vsp construction ... " << endl;
+
+        mVspTree->mVspStats.Reset();
+        mVspTree->mVspStats.Start();
+
+        int i = 0;
+
+        // all objects can be seen from everywhere
+        mTotalCost = (float)dynamic_cast<VspTree::VspSubdivisionCandidate *>(vsc)->mParentData.mPvs;
+
+        const bool repairQueue = false;
+
+        // process view space candidates
+        RunConstruction(repairQueue);
+
+        cout << "finished in " << TimeDiff(startTime, GetTime())*1e-3 << " secs" << endl;
+        mVspTree->mVspStats.Stop();
+
+        // reset subdivision type
+        mObjectSpaceSubdivisonType = savedobjectSpaceSubdivisionType;
+
+
+        /////////////////////////////////////////////////////////////
+        // object space partition
+        /////////////////////////////////////////////////////////////
+        
+        
+        switch (mObjectSpaceSubdivisonType)
+        {
+        case KD_BASED_OBJ_SUBDIV:
+                {
+                        ConstructOspTree(sampleRays, objects, forcedViewSpace);
+                        break;
+                }
+        case BV_BASED_OBJ_SUBDIV:
+                {
+                        ConstructBvHierarchy(sampleRays, objects, forcedViewSpace);
+                        break;
+                }
+        default:
+                break;
+        }
+}
+
+
+void HierarchyManager::ConstructBvHierarchy(const VssRayContainer &sampleRays,
+                                                                                        const ObjectContainer &objects,
+                                                                                        AxisAlignedBox3 *forcedViewSpace) 
+
+{
+        Debug << "\n$$$$$$$$$ bv hierarchy construction $$$$$$$$$$\n" << endl;
+        cout << "starting bv hierarchy construction ... " << endl;
+
+        // start with one big kd cell - all objects can be seen from everywhere
+        // note: only true for view space = object space
+
+        ObjectContainer obj = objects;
+
+        // compute first candidate
+        SubdivisionCandidate *sc =
+                mBvHierarchy->PrepareConstruction(sampleRays, obj, forcedViewSpace);
+
+        Debug << "reseting cost, new total cost: " << mTotalCost << endl;
+        mTotalCost = mOspTree->mTotalCost;
+
+    mTQueue.Push(sc);
+
+        mOspTree->mOspStats.Reset();
+        mOspTree->mOspStats.Start();
+
+        const long startTime = GetTime();
+        const bool repairQueue = false;
+
+        // process object space candidates
+        RunConstruction(repairQueue);
+        
+        cout << "finished in " << TimeDiff(startTime, GetTime()) * 1e-3 << " secs" << endl;
+
+        mOspTree->mOspStats.Stop();
+
+        //////////////////////////
+        // matt: only for debugging purpose
+
+        const float rc = mOspTree->EvalRenderCost(sampleRays);
+
+        Debug << "My render cost evalulation: " << rc << endl;
+}
+
+
+void HierarchyManager::ConstructOspTree(const VssRayContainer &sampleRays,
+                                                                                const ObjectContainer &objects,
+                                                                                AxisAlignedBox3 *forcedViewSpace) 
+
+{
+        RayInfoContainer *objectSpaceRays = new RayInfoContainer();
+
+        Debug << "\n$$$$$$$$$ osp tree construction $$$$$$$$$$\n" << endl;
+        cout << "starting osp tree construction ... " << endl;
+
+        // start with one big kd cell - all objects can be seen from everywhere
+        // note: only true for view space = object space
+
+        // compute first candidate
+        SubdivisionCandidate *osc =
+                mOspTree->PrepareConstruction(sampleRays, objects, forcedViewSpace, *objectSpaceRays);
+
+        Debug << "reseting cost, new total cost: " << mTotalCost << endl;
+        mTotalCost = mOspTree->mTotalCost;
+
+    mTQueue.Push(osc);
+
+        mOspTree->mOspStats.Reset();
+        mOspTree->mOspStats.Start();
+
+        const long startTime = GetTime();
+        const bool repairQueue = false;
+        
+        // process object space candidates
+        RunConstruction(repairQueue);
+        
+        cout << "finished in " << TimeDiff(startTime, GetTime()) * 1e-3 << " secs" << endl;
+
+        mOspTree->mOspStats.Stop();
+
+        //////////////////////////
+        // matt: only for debugging purpose
+
+        const float rc = mOspTree->EvalRenderCost(sampleRays);
+
+        Debug << "My render cost evalulation: " << rc << endl;
+}
+
+}