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

Timestamp:

09/05/06 09:51:56 (18 years ago)

Author:

mattausch

Message:

 

File:

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

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

@@ -46 +46 @@
                 mOspTree = new OspTree();
                 mOspTree->mVspTree = mVspTree;
-                //mOspTree->mHierarchyManager = this;
+                
                 Debug << "creating osp tree" << endl;
                 break;
@@ -52 +52 @@
         mBvHierarchy = new BvHierarchy();
                 mBvHierarchy->mVspTree = mVspTree;
-                //mBvHierarchy->mHierarchyManager = this;
+                
                 Debug << "creating bv hierachy" << endl;
                 break;
@@ -74 +74 @@
         mOspTree->mVspTree = mVspTree;
 
-        //mOspTree->mHierarchyManager = this;
         Debug << "creating osp tree" << endl;
 
@@ -216 +215 @@
         cout << "Constructing view space / object space tree ... \n";
         
+        // use objects for evaluating vsp tree construction in the first levels
+        // of the subdivision
+        mSavedObjectSpaceSubdivisionType = mObjectSpaceSubdivisionType;
+        mObjectSpaceSubdivisionType = NO_OBJ_SUBDIV;
+
+        // start with view space subdivison: prepare vsp tree for traversal
+        PrepareViewSpaceSubdivision(sampleRays, objects, forcedViewSpace);
+
+        // start object space subdivision immediately?
+        if (StartObjectSpaceSubdivision())
+        {
+                mObjectSpaceSubdivisionType = mSavedObjectSpaceSubdivisionType;
+                PrepareObjectSpaceSubdivision(sampleRays, objects);
+        }
+
         // process object space candidates
         RunConstruction(sampleRays, objects, forcedViewSpace);
@@ -328 +342 @@
         const bool ospDepthReached = 
                 (mMinDepthForObjectSpaceSubdivion <= mVspTree->mVspStats.maxDepth);
-        const bool stillNotOsp = (mObjectSpaceSubdivisionType == NO_OBJ_SUBDIV);
     
-        return stillNotOsp && (mTQueue.Empty() || ((mConstructionType == 1) && ospDepthReached));
+        return !ObjectSpaceSubdivisionConstructed() && 
+                   (mTQueue.Empty() || ((mConstructionType == INTERLEAVED) && ospDepthReached));
 }
 
@@ -340 +354 @@
         mHierarchyStats.nodes = 0;
         mGlobalCostMisses = 0;
-
-        // use objects for evaluating vsp tree construction in the first levels
-        // of the subdivision
-        const int savedObjectSpaceSubdivisionType = mObjectSpaceSubdivisionType;
-        mObjectSpaceSubdivisionType = NO_OBJ_SUBDIV;
-
-        // start with view space subdivison: prepare vsp tree for traversal
-        PrepareViewSpaceSubdivision(sampleRays, objects, forcedViewSpace);
-
-        // start object space subdivision immediately?
-        if (StartObjectSpaceSubdivision())
-        {cout << "here1155 ";
-                mObjectSpaceSubdivisionType = savedObjectSpaceSubdivisionType;
-                PrepareObjectSpaceSubdivision(sampleRays, objects);
-        }
 
         int i = 0;
@@ -389 +388 @@
                 if (StartObjectSpaceSubdivision())
                 {
-                        mObjectSpaceSubdivisionType = savedObjectSpaceSubdivisionType;
+                        mObjectSpaceSubdivisionType = mSavedObjectSpaceSubdivisionType;
 
                         cout << "starting object space subdivision at maximal view space subdivison depth " << mVspTree->mVspStats.maxDepth << " (" << mMinDepthForObjectSpaceSubdivion << ") " << endl;
@@ -401 +400 @@
                 DEL_PTR(mCurrentCandidate);
         }
-        
-        mObjectSpaceSubdivisionType = savedObjectSpaceSubdivisionType;
+
+        mObjectSpaceSubdivisionType = mSavedObjectSpaceSubdivisionType;
 }