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

Timestamp:

09/29/06 22:42:25 (18 years ago)

Author:

mattausch

Message:

 

File:

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

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

@@ -265 +265 @@
 
         int polysSize = 0;
-
+        
         for (int i = 0; i < limit; ++ i)
         {
-                if (viewCells[i]->GetMesh()) // copy the mesh data to polygons
-                {
-                        mBox.Include(viewCells[i]->GetBox()); // add to BSP tree aabb
-                        polysSize +=
-                                AddMeshToPolygons(viewCells[i]->GetMesh(),
-                                                                  polys,
-                                                                  viewCells[i]);
-                }
-        }
-
+                Mesh *mesh = viewCells[i]->GetMesh();
+                if (mesh) 
+                {       // // copy the mesh into polygons and add to BSP tree aabb
+                        mBox.Include(viewCells[i]->GetBox()); 
+                        polysSize += AddMeshToPolygons(mesh,
+                                                                                   polys,
+                                                                                   viewCells[i]);
+                }
+        }
+        
         return polysSize;
 }
@@ -2588 +2588 @@
 {
         ViewCell::NewMail();
-        
         CollectViewCells(mRoot, onlyValid, viewCells, true);
 }
-
-
-void VspBspTree::CollapseViewCells()
-{
-// TODO
-#if HAS_TO_BE_REDONE
-        stack<BspNode *> nodeStack;
-
-        if (!mRoot)
-                return;
-
-        nodeStack.push(mRoot);
-        
-        while (!nodeStack.empty()) 
-        {
-                BspNode *node = nodeStack.top();
-                nodeStack.pop();
-                
-                if (node->IsLeaf())
-        {
-                        BspViewCell *viewCell = dynamic_cast<BspLeaf *>(node)->GetViewCell();
-
-                        if (!viewCell->GetValid())
-                        {
-                                BspViewCell *viewCell = dynamic_cast<BspLeaf *>(node)->GetViewCell();
-        
-                                ViewCellContainer leaves;
-                                mViewCellsTree->CollectLeaves(viewCell, leaves);
-
-                                ViewCellContainer::const_iterator it, it_end = leaves.end();
-
-                                for (it = leaves.begin(); it != it_end; ++ it)
-                                {
-                                        BspLeaf *l = dynamic_cast<BspViewCell *>(*it)->mLeaf;
-                                        l->SetViewCell(GetOrCreateOutOfBoundsCell());
-                                        ++ mBspStats.invalidLeaves;
-                                }
-
-                                // add to unbounded view cell
-                                GetOrCreateOutOfBoundsCell()->GetPvs().AddPvs(viewCell->GetPvs());
-                                DEL_PTR(viewCell);
-                        }
-                }
-                else
-                {
-                        BspInterior *interior = dynamic_cast<BspInterior *>(node);
-                
-                        nodeStack.push(interior->GetFront());
-                        nodeStack.push(interior->GetBack());
-                }
-        }
-
-        Debug << "invalid leaves: " << mBspStats.invalidLeaves << endl;
-#endif
-}
-
-
-void VspBspTree::CollectRays(VssRayContainer &rays)
-{
-        vector<BspLeaf *> leaves;
-
-        vector<BspLeaf *>::const_iterator lit, lit_end = leaves.end();
-
-        for (lit = leaves.begin(); lit != lit_end; ++ lit)
-        {
-                BspLeaf *leaf = *lit;
-                VssRayContainer::const_iterator rit, rit_end = leaf->mVssRays.end();
-
-                for (rit = leaf->mVssRays.begin(); rit != rit_end; ++ rit)
-                        rays.push_back(*rit);
-        }
-}
-
-
-void VspBspTree::ValidateTree()
-{
-        stack<BspNode *> nodeStack;
-
-        if (!mRoot)
-                return;
-
-        nodeStack.push(mRoot);
-        
-        mBspStats.invalidLeaves = 0;
-        while (!nodeStack.empty()) 
-        {
-                BspNode *node = nodeStack.top();
-                nodeStack.pop();
-                
-                if (node->IsLeaf())
-                {
-                        BspLeaf *leaf = dynamic_cast<BspLeaf *>(node);
-
-                        if (!leaf->GetViewCell()->GetValid())
-                                ++ mBspStats.invalidLeaves;
-
-                        // validity flags don't match => repair
-                        if (leaf->GetViewCell()->GetValid() != leaf->TreeValid())
-                        {
-                                leaf->SetTreeValid(leaf->GetViewCell()->GetValid());
-                                PropagateUpValidity(leaf);
-                        }
-                }
-                else
-                {
-                        BspInterior *interior = dynamic_cast<BspInterior *>(node);
-                
-                        nodeStack.push(interior->GetFront());
-                        nodeStack.push(interior->GetBack());
-                }
-        }
-
-        Debug << "invalid leaves: " << mBspStats.invalidLeaves << endl;
-}
-
 
 
@@ -2748 +2632 @@
                 }
         }
-
+}
+
+
+void VspBspTree::CollapseViewCells()
+{
+// TODO
+#if HAS_TO_BE_REDONE
+        stack<BspNode *> nodeStack;
+
+        if (!mRoot)
+                return;
+
+        nodeStack.push(mRoot);
+        
+        while (!nodeStack.empty()) 
+        {
+                BspNode *node = nodeStack.top();
+                nodeStack.pop();
+                
+                if (node->IsLeaf())
+        {
+                        BspViewCell *viewCell = dynamic_cast<BspLeaf *>(node)->GetViewCell();
+
+                        if (!viewCell->GetValid())
+                        {
+                                BspViewCell *viewCell = dynamic_cast<BspLeaf *>(node)->GetViewCell();
+        
+                                ViewCellContainer leaves;
+                                mViewCellsTree->CollectLeaves(viewCell, leaves);
+
+                                ViewCellContainer::const_iterator it, it_end = leaves.end();
+
+                                for (it = leaves.begin(); it != it_end; ++ it)
+                                {
+                                        BspLeaf *l = dynamic_cast<BspViewCell *>(*it)->mLeaf;
+                                        l->SetViewCell(GetOrCreateOutOfBoundsCell());
+                                        ++ mBspStats.invalidLeaves;
+                                }
+
+                                // add to unbounded view cell
+                                GetOrCreateOutOfBoundsCell()->GetPvs().AddPvs(viewCell->GetPvs());
+                                DEL_PTR(viewCell);
+                        }
+                }
+                else
+                {
+                        BspInterior *interior = dynamic_cast<BspInterior *>(node);
+                
+                        nodeStack.push(interior->GetFront());
+                        nodeStack.push(interior->GetBack());
+                }
+        }
+
+        Debug << "invalid leaves: " << mBspStats.invalidLeaves << endl;
+#endif
+}
+
+
+void VspBspTree::CollectRays(VssRayContainer &rays)
+{
+        vector<BspLeaf *> leaves;
+
+        vector<BspLeaf *>::const_iterator lit, lit_end = leaves.end();
+
+        for (lit = leaves.begin(); lit != lit_end; ++ lit)
+        {
+                BspLeaf *leaf = *lit;
+                VssRayContainer::const_iterator rit, rit_end = leaf->mVssRays.end();
+
+                for (rit = leaf->mVssRays.begin(); rit != rit_end; ++ rit)
+                        rays.push_back(*rit);
+        }
+}
+
+
+void VspBspTree::ValidateTree()
+{
+        stack<BspNode *> nodeStack;
+
+        if (!mRoot)
+                return;
+
+        nodeStack.push(mRoot);
+        
+        mBspStats.invalidLeaves = 0;
+        while (!nodeStack.empty()) 
+        {
+                BspNode *node = nodeStack.top();
+                nodeStack.pop();
+                
+                if (node->IsLeaf())
+                {
+                        BspLeaf *leaf = dynamic_cast<BspLeaf *>(node);
+
+                        if (!leaf->GetViewCell()->GetValid())
+                                ++ mBspStats.invalidLeaves;
+
+                        // validity flags don't match => repair
+                        if (leaf->GetViewCell()->GetValid() != leaf->TreeValid())
+                        {
+                                leaf->SetTreeValid(leaf->GetViewCell()->GetValid());
+                                PropagateUpValidity(leaf);
+                        }
+                }
+                else
+                {
+                        BspInterior *interior = dynamic_cast<BspInterior *>(node);
+                
+                        nodeStack.push(interior->GetFront());
+                        nodeStack.push(interior->GetBack());
+                }
+        }
+
+        Debug << "invalid leaves: " << mBspStats.invalidLeaves << endl;
 }