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

Timestamp:

10/03/06 10:10:01 (18 years ago)

Author:

mattausch

Message:

 

File:

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

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

@@ -608 +608 @@
                                                                                                    const ObjectContainer &objects)
 {
-        switch (mObjectSpaceSubdivisionType)
-        {
-        case BV_BASED_OBJ_SUBDIV:
-        Debug << "old bv hierarchy:\n " << mBvHierarchy->mBvhStats << endl;
-                cout << "\nresetting bv hierarchy" << endl;
-                mHierarchyStats.nodes -= mBvHierarchy->mBvhStats.nodes;
 #if 0   
                 DEL_PTR(mBvHierarchy);
@@ -620 +614 @@
 
                 PrepareObjectSpaceSubdivision(sampleRays, objects);
-#else
-                mBvHierarchy->Reset(sampleRays, objects);
+                return;
 #endif
-                break;
+
+        if (!ObjectSpaceSubdivisionConstructed())
+        {
+                return PrepareObjectSpaceSubdivision(sampleRays, objects);
+        }
+
+        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;
+                break;
+
         case KD_BASED_OBJ_SUBDIV:
                 // TODO
@@ -630 +639 @@
                 break;
         }
+}
+
+
+void HierarchyManager::ResetViewSpaceSubdivision(const VssRayContainer &sampleRays, 
+                                                                                                 const ObjectContainer &objects)
+{
+        DEL_PTR(mBvHierarchy);
+        mBvHierarchy = new BvHierarchy();
+        mBvHierarchy->mHierarchyManager = this;
+
+        PrepareViewSpaceSubdivision(sampleRays, objects);
+        return;
 }
 
@@ -639 +660 @@
         mHierarchyStats.Reset();
         mHierarchyStats.Start();
-
         mHierarchyStats.nodes = 2;
         
-
         mTotalCost = (float)objects.size();
         Debug << "setting total cost to " << mTotalCost << endl;
@@ -655 +674 @@
         mSavedViewSpaceSubdivisionType = mViewSpaceSubdivisionType;
         mViewSpaceSubdivisionType = NO_VIEWSPACE_SUBDIV;
-
-        // start with object space subdivision
-        PrepareObjectSpaceSubdivision(sampleRays, objects);
-        
-        // process object space candidates
-        RunConstruction(false);
-
-        mViewSpaceSubdivisionType = mSavedViewSpaceSubdivisionType;
-
-        const int limit = 2;
-        for (int i = 0; i < limit; ++ i)
-        {
-        // again run object space subdivision on the view cells
+        
+        const int limit = 4;
+        int i = 0;
+
+        // render cost optimization
+        // start with object space partiton
+        // then optimizate view space partition for the current osp
+        // and vice versa until iteration depth is reached.
+        while (1)
+        {
+        // first run object space subdivision
                 ResetObjectSpaceSubdivision(sampleRays, objects);
-        
+
                 // process object space candidates
                 RunConstruction(false);
 
-                 /////////////////
-                // now do view space subdivison using the current object space partition
-//              ResetViewSpaceSubdivision(sampleRays, objects);
-        
+                if ((++ i) >= limit)
+                        break;
+
+                /////////////////
+                // do view space subdivison with respect to the object space partition
+                ResetViewSpaceSubdivision(sampleRays, objects);
+
                 // process view space candidates
                 RunConstruction(false);
-        
-                cout << "íteration " << i << " of " << limit << " finished" << endl;
+                mViewSpaceSubdivisionType = mSavedViewSpaceSubdivisionType;
+                
+                if ((++ i) >= limit)
+                        break;
+
+                cout << "iteration " << i << " of " << limit << " finished" << endl;
         }