Changeset 276 for trunk

Timestamp:

09/16/05 08:27:42 (19 years ago)

Author:

mattausch

Message:

 

File:

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

trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellBsp.cpp

@@ -147 +147 @@
                                                                 PolygonContainer *frontPolys, 
                                                                 PolygonContainer *backPolys, 
+                                                                PolygonContainer *coincident, 
                                                                 int &splits, bool storePolys)
 {
 #ifdef _Debug
-        //if (BspTree::displayDebug)Debug << "Splitting polygons of node " << this << " with plane " << mPlane << endl;
+        if (BspTree::displayDebug)Debug << "Splitting polygons of node " << this << " with plane " << mPlane << endl;
 #endif
-        bool inside = false;
-
         while (!polys->empty())
         {
@@ -170 +169 @@
                 {
                         case Polygon3::COINCIDENT:
-
-                                if (!inside)
-                                        // same surface normal
-                                        inside = (DotProd(mPlane.mNormal, poly->GetSupportingPlane().mNormal) > 0);
-                                        //if (BspTree::displayDebug)    Debug << "coincident" << endl;
-                                // discard polygons or saves them in node
-                                ProcessPolygon(poly, storePolys);
-                                break;
+                                // same surface normal
+                                if (DotProd(mPlane.mNormal, poly->GetSupportingPlane().mNormal) > 0)
+                                {
+                                        coincident->push_back(poly);
+                                        break;
+                                }
+                                //if (BspTree::displayDebug)    Debug << "coincident" << endl;                          
+                                
                         case Polygon3::FRONT_SIDE:      
                                 //if (BspTree::displayDebug)Debug << "front" << endl;
@@ -183 +182 @@
                                 break;
                         case Polygon3::BACK_SIDE:
-                                inside = true;  //if (BspTree::displayDebug)Debug << "back" << endl;
+                                //if (BspTree::displayDebug)Debug << "back" << endl;
                                 backPolys->push_back(poly);
                                 break;
                         case Polygon3::SPLIT:
-                                inside = true;                          
-
-                                front_piece = new Polygon3();
-                                back_piece = new Polygon3();
+                                front_piece = new Polygon3(poly->GetParent());
+                                back_piece = new Polygon3(poly->GetParent());
 
                                 //-- split polygon
@@ -201 +198 @@
                                 if (BspTree::displayDebug)Debug << "split " << *poly << endl << *front_piece << endl << *back_piece << endl;
 #endif
-                                // save or discard polygons
                                 ProcessPolygon(poly, storePolys);
                                 
@@ -213 +209 @@
         // contains nothing
         delete polys;
-
-        return inside;
 }
 
@@ -390 +384 @@
                                 PolygonContainer *frontPolys = new PolygonContainer();
                                 PolygonContainer *backPolys = new PolygonContainer();
+                                PolygonContainer *coincident = new PolygonContainer();
 
                                 int splits = 0;
@@ -396 +391 @@
                                 bool inside = interior->SplitPolygons(tData.mPolygons, 
                                                                                                           frontPolys, 
-                                                                                                          backPolys, 
+                                                                                                          backPolys,
+                                                                                                          coincident,
                                                                                                           splits, 
                                                                                                           mStorePolys);
-
+                                
                                 //Debug << "split node on level " << tData.mDepth << " bk: " << backPolys->size() << " frnt: " << frontPolys->size() << endl;
                                 mStat.splits += splits;
 
                                 // push the children on the stack
-                                tStack.push(BspTraversalData(interior->GetFront(), frontPolys, tData.mDepth + 1, false));
-                                tStack.push(BspTraversalData(interior->GetBack(), backPolys, tData.mDepth + 1, inside));
+                                tStack.push(BspTraversalData(interior->GetFront(), frontPolys, tData.mDepth + 1));
+                                tStack.push(BspTraversalData(interior->GetBack(), backPolys, tData.mDepth + 1));
                         
                         }
@@ -578 +574 @@
         std::stack<BspTraversalData> tStack;
         
-        BspTraversalData tData(new BspLeaf(), polys, 0, true);
+        BspTraversalData tData(new BspLeaf(), polys, 0, true, viewCells);
 
         tStack.push(tData);
@@ -589 +585 @@
             tStack.pop();
 
+                //TODO
                 ViewCell *viewCell = NULL;
 
-        if (viewCells) // generate new view cell in leaf
+        /*if (viewCells) // generate new view cell in leaf
                 {
                         viewCell = new ViewCell();
                         viewCells->push_back(viewCell);
-                }
+                }*/
 
                 // subdivide leaf node
@@ -625 +622 @@
 
             // add view cell if inside object) 
-                if (viewCell && tData.mIsInside) // || (tData.mGeometry->size() > 0) // or if there is still geometry left 
+                if (viewCell && tData.mCoincident && (tData.mCoincident->size() > 0))) // || (tData.mGeometry->size() > 0) // or if there is still geometry left 
                 {
                         BspLeaf *leaf = dynamic_cast<BspLeaf *>(tData.mNode);
@@ -634 +631 @@
                         //leaf->mViewCellIdx = counter;
                         //Debug << "insert view cell" << endl;
-                        leaf->SetViewCell(viewCell);
+
+                        leaf->SetViewCell(coincident[0]->GetParent());
                 }
 
                 // add or delete remaining polygons
                 tData.mNode->ProcessPolygons(tData.mPolygons, mStorePolys);
+                tData.mNode->ProcessPolygons(tData.coincident, mStorePolys);
 
                 return tData.mNode;
         }
+
+        tData.mNode->ProcessPolygons(tData.coincident, mStorePolys);
 
         //-- create new subdivided node
         PolygonContainer *backPolys = new PolygonContainer();
         PolygonContainer *frontPolys = new PolygonContainer();
-
-        bool inside = false;
-
+        PolygonContainer *coincident = new PolygonContainer();
+        
         BspInterior *interior = SubdivideNode(dynamic_cast<BspLeaf *>(tData.mNode),
                                                                                   tData.mPolygons,
                                                                                   frontPolys,
-                                                                                  backPolys, inside);
+                                                                                  backPolys, 
+                                                                                  coincident);
 
         // push the children on the stack
         // inside information is only propagated with the back leaf
-        tStack.push(BspTraversalData(interior->GetBack(), backPolys, tData.mDepth + 1, inside));
-        tStack.push(BspTraversalData(interior->GetFront(), frontPolys, tData.mDepth + 1, false));
+        tStack.push(BspTraversalData(interior->GetBack(), backPolys, tData.mDepth + 1, coincident));
+        tStack.push(BspTraversalData(interior->GetFront(), frontPolys, tData.mDepth + 1));
 
         return interior;
@@ -665 +666 @@
 BspInterior *BspTree::SubdivideNode(BspLeaf *leaf, 
                                                                         PolygonContainer *polys, 
-                                                                        PolygonContainer *frontPolys, 
+                                                                        PolygonContainer *frontPolys,
+                                                                        PolygonContainer *coincident, 
                                                                         PolygonContainer *backPolys, bool &inside)
 {
@@ -680 +682 @@
         int splits = 0;
                 
-        inside = interior->SplitPolygons(polys, frontPolys, backPolys, splits, mStorePolys);
+        inside = interior->SplitPolygons(polys, frontPolys, backPolys, coincident, splits, mStorePolys);
         
         mStat.splits += splits;