Changeset 308 for trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellBsp.cpp

Timestamp:

10/05/05 02:19:15 (19 years ago)

Author:

mattausch

Message:

bsp tree view cells sampling possible

File:

• trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellBsp.cpp (modified) (17 diffs)

trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellBsp.cpp

@@ -424 +424 @@
                                 interior->ProcessPolygons(&coincident, mStoreSplitPolys);
 
-                                //Debug << "split node on level " << tData.mDepth << " bk: " << backPolys->size() << " frnt: " << frontPolys->size() << endl;
                                 mStat.splits += splits;
 
@@ -437 +436 @@
                 else // reached leaf => subdivide current viewcell
                 {
-                        //if (tData.mPolygons->size() > 0)
-                        //      Debug << "Subdividing further: polygon size: " << (int)tData.mPolygons->size() << ", view cell: " << tData.mViewCell << endl;
-
-                        BspNode *root = Subdivide(tStack, tData, viewCells);            
-
+                        //if (tData.mPolygons->size() > 0) Debug << "Subdividing further: polygon size: " << (int)tData.mPolygons->size() << ", view cell: " << tData.mViewCell << endl;
+                        BspNode *root = Subdivide(tStack, tData);               
+
+                        if (viewCells && root->IsLeaf())
+                        {       // generate new view cell for each leaf
+                                ViewCell *viewCell = new ViewCell();
+                                viewCells->push_back(viewCell);
+                                
+                                dynamic_cast<BspLeaf *>(root)->SetViewCell(viewCell);
+                }
                         if (!mRoot) // tree empty => new root
                                 mRoot = root;
@@ -448 +452 @@
 }
 
-int BspTree::AddMesh2Polygons(Mesh *mesh, PolygonContainer &polys, Intersectable *parent)
+int BspTree::AddMesh2Polygons(Mesh *mesh, PolygonContainer &polys, MeshInstance *parent)
 {
         FaceContainer::const_iterator fi;
@@ -498 +502 @@
                         mesh = dynamic_cast<MeshInstance *>(object)->GetMesh();
                         break;
-                case Intersectable::VIEWCELL:
+                case Intersectable::VIEW_CELL:
                         mesh = dynamic_cast<ViewCell *>(object)->GetMesh();
                         break;
@@ -586 +590 @@
 
                 // subdivide leaf node
-                BspNode *root = Subdivide(tStack, tData, viewCells);
+                BspNode *root = Subdivide(tStack, tData);
+
+                if (viewCells && root->IsLeaf())
+                {       // generate new view cell for each leaf
+                        ViewCell *viewCell = new ViewCell();
+                        viewCells->push_back(viewCell);
+
+                        dynamic_cast<BspLeaf *>(root)->SetViewCell(viewCell);
+                }
 
                 // empty tree => new root corresponding to unbounded space
@@ -598 +610 @@
 
 
-BspNode *BspTree::Subdivide(BspTraversalStack &tStack, BspTraversalData &tData, 
-                                                        ViewCellContainer *viewCells)
+BspNode *BspTree::Subdivide(BspTraversalStack &tStack, BspTraversalData &tData)
 {
         //-- terminate traversal  
@@ -605 +616 @@
         {
 #ifdef _DEBUG
-                Debug << "subdivision terminated at depth " << tData.mDepth << ", #polys: " << (int)tData.mPolygons->size() << endl;
+                Debug << "subdivision terminated at depth " << tData.mDepth << ", #polys: " 
+                          << (int)tData.mPolygons->size() << endl;
 #endif
 
@@ -611 +623 @@
 
                 BspLeaf *leaf = dynamic_cast<BspLeaf *>(tData.mNode);
-
-                //-- new viewcells are generated and added to each leaf
-                if (viewCells)
-                {
-                        ViewCell *viewCell = new ViewCell();
-                        leaf->SetViewCell(viewCell);
-                        viewCells->push_back(viewCell);
-                        // Debug << "creating new viewcell" << endl;
-                }
-                //-- add viewcell stored in split polygon
-                else if (!leaf->GetViewCell())
+                
+                // add view cell to leaf
+                if (!leaf->GetViewCell())
                         leaf->SetViewCell(tData.mViewCell);
-                //else Debug << "Leaf already has view cell " << endl;
 
                 // remaining polygons are discarded or added to node
-                tData.mNode->ProcessPolygons(tData.mPolygons, mStoreSplitPolys);
+                leaf->ProcessPolygons(tData.mPolygons, mStoreSplitPolys);
                 DEL_PTR(tData.mPolygons);
 
-                return tData.mNode;
+                return leaf;
         }
 
@@ -644 +647 @@
                                                                                   &coincident);
 
-        //-- extract view cells from coincident polygons according to plane normal
         ViewCell *frontViewCell = mViewCell;
         ViewCell *backViewCell = mViewCell;
-        
-    if (!viewCells)
-        {       // extract the pointer to the view cells
-                ExtractViewCells(&backViewCell,
-                                                 &frontViewCell,
-                                                 coincident, 
-                                                 interior->mPlane, 
-                                                 frontPolys->empty(), 
-                                                 backPolys->empty());
-        }
+
+#ifdef _DEBUG   
+        if (frontPolys->empty() && backPolys->empty() && (coincident.size() > 2))
+        {       for (PolygonContainer::iterator it = coincident.begin(); it != coincident.end(); ++it)
+                        Debug << (*it) << " " << (*it)->GetArea() << " " << (*it)->mParent << endl ;
+                Debug << endl;}
+#endif
+
+        //-- extract view cells from coincident polygons according to plane normal
+        ExtractViewCells(&backViewCell, &frontViewCell, coincident, interior->mPlane, 
+                                                 frontPolys->empty(), backPolys->empty());
         
         // don't need coincident polygons anymore
@@ -684 +687 @@
         PolygonContainer::const_iterator it, it_end = coincident.end();
 
+        //-- find first view cells in front and back leafs
         for (it = coincident.begin(); !(foundFront && foundBack) && 
-                (it < coincident.end()); ++it)
+                (it != it_end); ++ it)
         {
                 if (DotProd((*it)->GetSupportingPlane().mNormal, splitPlane.mNormal > 0))
@@ -996 +1000 @@
                 if (sSplitPlaneStrategy & BALANCED_VIEW_CELLS)
                 {
-                        Intersectable *viewCell = (*it)->mParent;
+                        MeshInstance *viewCell = (*it)->mParent;
                 
                         if (classification == Polygon3::FRONT_SIDE)
@@ -1011 +1015 @@
                 val += sLeastSplitsFactor * sumSplits / (float)polys.size();
 
-        if ((sSplitPlaneStrategy & LARGEST_POLY_AREA) && sumPolyArea) 
+        if (sSplitPlaneStrategy & LARGEST_POLY_AREA) 
                 val += sLargestPolyAreaFactor * (float)polys.size() / sumPolyArea; // HACK
 
@@ -1022 +1026 @@
                 ObjectContainer::const_iterator frontIt, frontIt_end = frontViewCells.end();
         
-                Intersectable *intersect = NULL;
+                Intersectable *vc = NULL;
                 // increase counter for view cells in front of plane
                 for (frontIt = frontViewCells.begin(); frontIt != frontIt_end; ++frontIt)
                 {
-                        if (*frontIt != intersect)
+                        if (*frontIt != vc)
                         {
-                                intersect = *frontIt;
+                                vc = *frontIt;
                                 sumBalancedViewCells += 1.0f;
                         }
@@ -1034 +1038 @@
 
                 ObjectContainer::const_iterator backIt, backIt_end = backViewCells.end();
-                intersect = NULL;
+                vc = NULL;
                 // decrease counter for view cells on back side of plane
                 for (backIt = backViewCells.begin(); backIt != backIt_end; ++backIt)
                 {
-                        if (*backIt != intersect)
+                        if (*backIt != vc)
                         {
-                                intersect = *backIt;
+                                vc = *backIt;
                                 sumBalancedViewCells -= 1.0f;
                         }
@@ -1136 +1140 @@
 }
 
-int BspTree::CollectLeafPvs()
-{
-        int totalPvsSize = 0;
-  
-        stack<BspNode *> nodeStack;
-  
-        nodeStack.push(mRoot);
-  
-        while (!nodeStack.empty()) 
-        {
-                BspNode *node = nodeStack.top();
-                
-                nodeStack.pop();
-                
-                if (node->IsLeaf()) 
-                {
-                        BspLeaf *leaf = dynamic_cast<BspLeaf *>(node);
-
-                        ViewCell *viewcell = leaf->GetViewCell();
-                        
-                        if (!viewcell->Mailed()) 
-                        {
-                                viewcell->Mail(); // what does mail mean?
-                                        
-                                // add this node to pvs of all nodes it can see
-                                BspPvsMap::iterator ni; 
-          
-        /*                      for (ni = object->mBspPvs.mEntries.begin(); ni != object->mKdPvs.mEntries.end(); ni++) 
-                                {
-                                        BspNode *node = (*ni).first;
-            
-                                        // $$ JB TEMPORARY solution -> should add object PVS or explictly computed
-                                        // BSP tree PVS
-                                if (leaf->mBspPvs.AddNodeSample(node))
-                                                totalPvsSize++;
-                                }*/
-                        }
-                } else 
-                {
-                        // traverse tree
-                        BspInterior *interior = (BspInterior *)node;
-      
-                        nodeStack.push(interior->GetFront());
-                        nodeStack.push(interior->GetBack());
-                }
-        }
-
-        return totalPvsSize;
-}
-
 AxisAlignedBox3 BspTree::GetBoundingBox() const
 {
@@ -1303 +1257 @@
                         extp = splitPlane->FindIntersection(ray.GetLoc(), extp, &maxt);
 
-                } else // compute intersections with objects in leaf
+                } else // reached leaf => intersection with view cell
                 {
                         BspLeaf *leaf = dynamic_cast<BspLeaf *>(node);
-                        //ray.leaves.push_back(leaf);
-      // TODO
-                        /*ObjectContainer::const_iterator mi;
-                        for (mi = leaf->mObjects.begin(); mi != leaf->mObjects.end(); ++mi) 
+                        
+                        //ray.mBspLeaves.push_back(leaf);
+                        
+                        if (!leaf->mViewCell->Mailed())
                         {
-                                Intersectable *object = *mi;
-                                if (!object->Mailed()) 
-                                {
-                                        object->Mail();
-                                        //ray.meshes.push_back(mesh);
-                                        hits += object->CastRay(ray);
-                                }
-                        }*/
-
-                        if (hits && ray.GetType() == Ray::LOCAL_RAY)
+                                ray.viewCells.push_back(leaf->mViewCell);
+                                mViewCell->Mail();
+                                ++ hits;
+                        }
+
+                        if (hits && ray.GetType() == Ray::LOCAL_RAY)
                                 if (ray.intersections[0].mT <= maxt)
                                         break;
@@ -1355 +1305 @@
         return false;
 }
+
+void BspTree::CollectViewCells(BspNode *n, ViewCellContainer &viewCells)
+{
+        stack<BspNode *> nodeStack;
+
+        nodeStack.push(n);
+
+        while (!nodeStack.empty()) 
+        {
+                BspNode *node = nodeStack.top();
+                nodeStack.pop();
+
+                if (node->IsLeaf()) 
+                {
+                        ViewCell *viewCell = dynamic_cast<BspLeaf *>(node)->mViewCell;
+
+                        if (!viewCell->Mailed()) 
+                        {
+                                viewCell->Mail();
+                                viewCells.push_back(viewCell);
+                        }
+                }
+                else 
+                {
+                        BspInterior *interior = dynamic_cast<BspInterior *>(node);
+                        nodeStack.push(interior->mFront);
+                        nodeStack.push(interior->mBack);
+                }
+        }
+}
 //} // GtpVisibilityPreprocessor