Changeset 489 for trunk/VUT/GtpVisibilityPreprocessor/src/VspBspTree.cpp

Timestamp:

01/02/06 13:42:43 (19 years ago)

Author:

mattausch

Message:

valid view point regions working now for bsp view cells (crit: maxpvs)

File:

• trunk/VUT/GtpVisibilityPreprocessor/src/VspBspTree.cpp (modified) (14 diffs)

trunk/VUT/GtpVisibilityPreprocessor/src/VspBspTree.cpp

@@ -45 +45 @@
 mViewCellsManager(NULL),
 mStoreRays(false),
-mOnlyDrivingAxis(false)
+mOnlyDrivingAxis(false),
+mOutOfBoundsCell(NULL)
 {
         bool randomize = false;
@@ -128 +129 @@
         }
 
+
         mSplitCandidates = new vector<SortableEntry>;
 
         Debug << endl;
+}
+
+
+BspViewCell *VspBspTree::GetOrCreateOutOfBoundsCell()
+{
+        if (!mOutOfBoundsCell)
+                mOutOfBoundsCell = new BspViewCell();
+
+        return mOutOfBoundsCell;
 }
 
@@ -401 +412 @@
         {
                 BspLeaf *leaf = dynamic_cast<BspLeaf *>(newNode);
+                BspViewCell *viewCell;
 
                 if (!CheckValid(tData))
@@ -406 +418 @@
                         leaf->SetTreeValid(false);
                         PropagateUpValidity(leaf);
-                }
-
-                // create new view cell for this leaf
-                BspViewCell *viewCell = new BspViewCell();
+                        // view cell for invalid view space
+                        viewCell = GetOrCreateOutOfBoundsCell();
+                }
+                else
+                {
+                        // create new view cell for this leaf
+                        viewCell = new BspViewCell();
+                }
+                
                 leaf->SetViewCell(viewCell);
         
@@ -1206 +1223 @@
         {
                 BspNode *node = nodeStack.top();
-
                 nodeStack.pop();
+                
+                // this subtree is not valid view space
+                if (!node->TreeValid())
+                        continue;
 
                 if (node->IsLeaf())
@@ -1224 +1244 @@
 }
 
+
 AxisAlignedBox3 VspBspTree::GetBoundingBox() const
 {
@@ -1229 +1250 @@
 }
 
+
 BspNode *VspBspTree::GetRoot() const
 {
         return mRoot;
 }
+
+
+BspViewCell *VspBspTree::GetOutOfBoundsCell() const
+{
+        return mOutOfBoundsCell;
+}
+
 
 void VspBspTree::EvaluateLeafStats(const VspBspTraversalData &data)
@@ -1399 +1428 @@
                 BspNode *node = nodeStack.top();
                 nodeStack.pop();
+                // this subtree is not valid view space
+                if (!node->TreeValid())
+                        continue;
 
                 if (node->IsLeaf())
@@ -1635 +1667 @@
                 nodeStack.pop();
 
+                // view space not valid
+                if (!node->TreeValid())
+                        continue;
+
                 if (node->IsLeaf())
                 {
@@ -1687 +1723 @@
         return (int)neighbors.size();
 }
+
 
 BspLeaf *VspBspTree::GetRandomLeaf(const Plane3 &halfspace)
@@ -2002 +2039 @@
 
                         BspLeaf *leaf = new BspLeaf(interior->GetParent(), vc);
+                        leaf->SetTreeValid(frontLeaf->TreeValid());
 
                         // replace a link from node's parent
@@ -2170 +2208 @@
           
                 iit = ray->intersections.begin();
-                BspLeaf *prevLeaf = (*(iit ++)).mLeaf;
+                BspLeaf *leaf = (*(iit ++)).mLeaf;
                 
                 // create leaf pvs (needed for post processing)
-                if (!prevLeaf->mPvs)
-                {
-                        prevLeaf->mPvs = 
-                                new ObjectPvs(prevLeaf->GetViewCell()->GetPvs());
+                if (!leaf->mPvs)
+                {
+                        leaf->mPvs = 
+                                new ObjectPvs(leaf->GetViewCell()->GetPvs());
 
                         BspMergeCandidate::sOverallCost += 
-                                prevLeaf->mArea * prevLeaf->mPvs->GetSize();
+                                leaf->mArea * leaf->mPvs->GetSize();
                         
                         ++ leaves;
@@ -2185 +2223 @@
                 
                 // traverse intersections 
-                // consecutive leaves are neighbors => 
-                // add them to queue
+                // consecutive leaves are neighbors => add them to queue
                 for (; iit != ray->intersections.end(); ++ iit)
                 {
-            BspLeaf *leaf = (*iit).mLeaf;
-            
+                        // next pair
+                        BspLeaf *prevLeaf = leaf;
+            leaf = (*iit).mLeaf;
+
+                        // view space does not correspond to valid space
+                        if (!leaf->TreeValid() || !prevLeaf->TreeValid())
+                                continue;
+
+            // create leaf pvs (needed for post processing)
                         if (!leaf->mPvs)
                         {
@@ -2229 +2273 @@
                                 mMergeQueue.push(BspMergeCandidate(leaf, prevLeaf));
                         }
-
-                        prevLeaf = leaf;
         }
         }