Changeset 1551 for GTP/trunk/Lib/Vis/Preprocessing/src/VspBspTree.cpp

Timestamp:

10/02/06 19:07:38 (18 years ago)

Author:

mattausch

Message:

updated view cells loading. probably no optimal for performance

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/VspBspTree.cpp (modified) (9 diffs)

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

@@ -875 +875 @@
                 }
                 
-        viewCell->mLeaf = leaf;
+                viewCell->mLeaves.push_back(leaf);
 
                 if (mUseAreaForPvs)
@@ -973 +973 @@
 
 
+        //////////////////
         //-- terminate traversal and create new view cell
         if (newNode->IsLeaf())
@@ -993 +994 @@
                 mBspStats.sampleContributions +=(int) sampCon;
 
+                viewCell->mLeaves.push_back(leaf);
+
+                ///////////
                 //-- store additional info
                 if (mStoreRays)
@@ -1003 +1007 @@
                         }
                 }
-
-                
-                viewCell->mLeaf = leaf;
-
+        
                 if (mUseAreaForPvs)
                         viewCell->SetArea(tData.mProbability);
@@ -2991 +2992 @@
                                                                    BspNodeGeometry &vcGeom) const
 {
+        // if false, cannot construct geometry for interior leaf
+        if (!mViewCellsTree)
+                return;
+
         ViewCellContainer leaves;
-        
         mViewCellsTree->CollectLeaves(vc, leaves);
 
@@ -2999 +3003 @@
         for (it = leaves.begin(); it != it_end; ++ it)
         {
-                BspLeaf *l = dynamic_cast<BspViewCell *>(*it)->mLeaf;
-                
-                ConstructGeometry(l, vcGeom);
+                BspViewCell *bspVc = dynamic_cast<BspViewCell *>(*it);
+                vector<BspLeaf *>::const_iterator bit, bit_end = bspVc->mLeaves.end();
+
+                for (bit = bspVc->mLeaves.begin(); bit != bit_end; ++ bit)
+                {
+                        BspLeaf *l = *bit;
+                        ConstructGeometry(l, vcGeom);
+                }
         }
 }
@@ -3806 +3815 @@
                 if (ray->mViewCells.size() < 2)
                         continue;
-//TODO viewcellhierarchy
+
                 iit = ray->mViewCells.begin();
                 BspViewCell *bspVc = dynamic_cast<BspViewCell *>(*(iit ++));
-                BspLeaf *leaf = bspVc->mLeaf;
+                BspLeaf *leaf = bspVc->mLeaves[0];
                 
                 // traverse intersections 
@@ -3818 +3827 @@
                         BspLeaf *prevLeaf = leaf;
                         bspVc = dynamic_cast<BspViewCell *>(*iit);
-            leaf = bspVc->mLeaf;
+            leaf = bspVc->mLeaves[0]; // exactly one leaf
 
                         // view space not valid or same view cell
@@ -3984 +3993 @@
 {
         ExportNode(mRoot, stream);
-
         return true;
 }