Changeset 1329 for GTP/trunk/Lib

Timestamp:

09/11/06 00:45:27 (18 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• HierarchyManager.cpp (modified) (4 diffs)
• HierarchyManager.h (modified) (2 diffs)

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

@@ -221 +221 @@
 
         // start with view space subdivison: prepare vsp tree for traversal
-        PrepareViewSpaceSubdivision(sampleRays, objects, forcedViewSpace);
-
+        if (StartViewSpaceSubdivision())
+        {
+                mViewSpaceSubdivisionType = mSavedViewSpaceSubdivisionType;
+                PrepareViewSpaceSubdivision(sampleRays, objects, forcedViewSpace);
+        }
+        
         // start object space subdivision immediately?
         if (StartObjectSpaceSubdivision())
@@ -345 +349 @@
         return !ObjectSpaceSubdivisionConstructed() && 
                    (mTQueue.Empty() || ((mConstructionType == INTERLEAVED) && ospDepthReached));
+}
+
+
+bool HierarchyManager::StartViewSpaceSubdivision() const
+{
+        const bool vspDepthReached = 
+                (mMinDepthForObjectSpaceSubdivion <= mVspTree->mVspStats.maxDepth);
+    
+        return !ViewSpaceSubdivisionConstructed() && 
+                   (mTQueue.Empty() || ((mConstructionType == INTERLEAVED) && vspDepthReached));
 }
 
@@ -390 +404 @@
                         mObjectSpaceSubdivisionType = mSavedObjectSpaceSubdivisionType;
 
-                        cout << "starting object space subdivision at maximal view space subdivison depth " << mVspTree->mVspStats.maxDepth << " (" << mMinDepthForObjectSpaceSubdivion << ") " << endl;
+                        cout << "starting object space subdivision at depth " 
+                                 << mVspTree->mVspStats.maxDepth << " (" 
+                                 << mMinDepthForObjectSpaceSubdivion << ") " << endl;
+
                         PrepareObjectSpaceSubdivision(sampleRays, objects);
+
+                        cout << "reseting queue ... ";
+                        ResetQueue();
+                        cout << "finished" << endl;
+                }
+
+                if (StartViewSpaceSubdivision())
+                {
+                        mViewSpaceSubdivisionType = mSavedViewSpaceSubdivisionType;
+
+                        cout << "starting view space subdivision at depth " 
+                                 << mVspTree->mVspStats.maxDepth << " (" 
+                                 << mMinDepthForObjectSpaceSubdivion << ") " << endl;
+
+                        PrepareViewSpaceSubdivision(sampleRays, objects, forcedViewSpace);
 
                         cout << "reseting queue ... ";
@@ -422 +454 @@
         return false;
         }
+}
+
+
+bool HierarchyManager::ViewSpaceSubdivisionConstructed() const
+{
+        return mVspTree && mVspTree->GetRoot();
 }
 

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

@@ -252 +252 @@
 
         bool StartObjectSpaceSubdivision() const;
+        bool StartViewSpaceSubdivision() const;
 
         void PrepareViewSpaceSubdivision(
                 const VssRayContainer &sampleRays,
                 const ObjectContainer &objects,
-                AxisAlignedBox3 *forcedViewSpace);
+                AxisAlignedBox3 *forcedViewSpace = NULL);
 
         bool ObjectSpaceSubdivisionConstructed() const;
+        bool ViewSpaceSubdivisionConstructed() const;
 
     void ResetQueue();
@@ -266 +268 @@
 
         enum {SEQUENTIAL, INTERLEAVED};
+        
         int mObjectSpaceSubdivisionType;
+    int mViewSpaceSubdivisionType;
+
         /// the original osp type
         int mSavedObjectSpaceSubdivisionType;
+        int mSavedViewSpaceSubdivisionType;
 
         int mConstructionType;