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

Timestamp:

11/25/05 22:31:30 (19 years ago)

Author:

mattausch

Message:

detected leak in BspTree?
added specialised fast view cell bsp tree called VspBspTree?

File:

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

trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellBsp.cpp

@@ -124 +124 @@
                                                            PolygonContainer &coincident)
 {
-        Polygon3 *splitPoly = NULL;
-
         int splits = 0;
 
@@ -140 +138 @@
                 // classify polygon
                 const int cf = poly->ClassifyPlane(mPlane);
-
-                Polygon3 *front_piece = NULL;
-                Polygon3 *back_piece = NULL;
 
                 switch (cf)
@@ -156 +151 @@
                                 break;
                         case Polygon3::SPLIT:
-                                front_piece = new Polygon3(poly->mParent);
-                                back_piece = new Polygon3(poly->mParent);
-
-                                //-- split polygon into front and back part
-                                poly->Split(mPlane, 
-                                                        *front_piece, 
-                                                        *back_piece);
+                                {
+                                        Polygon3 *front_piece = new Polygon3(poly->mParent);
+                                        Polygon3 *back_piece = new Polygon3(poly->mParent);
+
+                                        //-- split polygon into front and back part
+                                        poly->Split(mPlane, *front_piece, *back_piece);
                                         
-                                ++ splits; // increase number of splits
-
-                                //-- inherit rays from parent polygon for blocked ray criterium
-                                poly->InheritRays(*front_piece, *back_piece);
-                                //Debug << "p: " << poly->mPiercingRays.size() << " f: " << front_piece->mPiercingRays.size() << " b: " << back_piece->mPiercingRays.size() << endl;
+                                        ++ splits; // increase number of splits
+
+                                        //-- inherit rays from parent polygon for blocked ray criterium
+                                        poly->InheritRays(*front_piece, *back_piece);
+                                        //Debug << "p: " << poly->mPiercingRays.size() << " f: " << front_piece->mPiercingRays.size() << " b: " << back_piece->mPiercingRays.size() << endl;
                                 
-                                // check if polygons still valid 
-                                if (front_piece->Valid())
-                                        frontPolys.push_back(front_piece);
-                                else
-                                        DEL_PTR(front_piece);
+                                        // check if polygons still valid 
+                                        if (front_piece->Valid())
+                                                frontPolys.push_back(front_piece);
+                                        else
+                                                DEL_PTR(front_piece);
                                 
-                                if (back_piece->Valid())
-                                        backPolys.push_back(back_piece);
-                                else                            
-                                        DEL_PTR(back_piece);
+                                        if (back_piece->Valid())
+                                                backPolys.push_back(back_piece);
+                                        else                            
+                                                DEL_PTR(back_piece);
                                 
 #ifdef _DEBUG
-                                Debug << "split " << *poly << endl << *front_piece << endl << *back_piece << endl;
+                                        Debug << "split " << *poly << endl << *front_piece << endl << *back_piece << endl;
 #endif
-                                DEL_PTR(poly);                  
+                                        DEL_PTR(poly);
+                                }
                                 break;
                         default:
@@ -273 +268 @@
 mRootCell(viewCell), 
 mRoot(NULL), 
-mGenerateViewCells(false),
 mStoreLeavesWithRays(false),
-mPvsUseArea(true)
+mPvsUseArea(true),
+mGenerateViewCells(true)
 {
         Randomize(); // initialise random generator for heuristics
@@ -447 +442 @@
         PolygonContainer *polys = new PolygonContainer();
 
+        // don't generate new view cell, insert this one
+        mGenerateViewCells = false;
         // extract polygons that guide the split process
         mStat.polys += AddMeshToPolygons(viewCell->GetMesh(), *polys, viewCell);
@@ -457 +454 @@
 {       
         std::stack<BspTraversalData> tStack;
-        
+
         // traverse existing tree or create new tree
     if (!mRoot)
@@ -624 +621 @@
         mStat.polys = AddToPolygonSoup(viewCells, *polys);
 
+        // view cells are given
+        mGenerateViewCells = false;
         // construct tree from the view cell polygons
         Construct(polys, new BoundedRayContainer());
@@ -635 +634 @@
         
         PolygonContainer *polys = new PolygonContainer();
-        
+
+        mGenerateViewCells = true;
         // copy mesh instance polygons into one big polygon soup
         mStat.polys = AddToPolygonSoup(objects, *polys);
@@ -652 +652 @@
 
         RayContainer::const_iterator rit, rit_end = sampleRays.end();
+
+        // generate view cells
+        mGenerateViewCells = false;
 
         long startTime = GetTime();
@@ -726 +729 @@
         PolygonContainer *polys = new PolygonContainer();
         
+        mGenerateViewCells = true;
+
         // copy mesh instance polygons into one big polygon soup
         mStat.polys = AddToPolygonSoup(objects, *polys);
@@ -844 +849 @@
         PolygonContainer coincident;
         
-        PolygonContainer *frontPolys = new PolygonContainer();
-        PolygonContainer *backPolys = new PolygonContainer();
-
-        BoundedRayContainer *frontRays = new BoundedRayContainer();
-        BoundedRayContainer *backRays = new BoundedRayContainer();
-        
         BspTraversalData tFrontData(NULL, new PolygonContainer(), tData.mDepth + 1, mRootCell, 
                                                                 new BoundedRayContainer(), 0, 0, new BspNodeGeometry());
@@ -856 +855 @@
 
         // create new interior node and two leaf nodes
-        BspInterior *interior = SubdivideNode(tData,
-                                                                                  tFrontData,
-                                                                                  tBackData,
-                                                                                  coincident);
+        BspInterior *interior = 
+                SubdivideNode(tData, tFrontData, tBackData, coincident);
 
 #ifdef _DEBUG   
@@ -897 +894 @@
                                                            BspTraversalData &backData, 
                                                            const PolygonContainer &coincident,
-                                                           const Plane3 splitPlane) const
+                                                           const Plane3 &splitPlane) const
 {
         // if not empty, tree is further subdivided => don't have to find view cell
@@ -1534 +1531 @@
                         
                         // add the termination object
-                        AddObjToPvs(ray->intersections[0].mObject, cf, frontPvs, backPvs);
+                        if (!ray->intersections.empty())
+                                AddObjToPvs(ray->intersections[0].mObject, cf, frontPvs, backPvs);
                         
                         // add the source object
@@ -1592 +1590 @@
 
         const float raysSize = (float)rays.size() + Limits::Small;
+
         if (mSplitPlaneStrategy & LEAST_RAY_SPLITS)
                 val += mLeastRaySplitsFactor * sumRaySplits / raysSize;
@@ -1604 +1603 @@
 
                 // give penalty to unbalanced split
-                if (1)
+                if (0)
                 if (((pFront * 0.2 + Limits::Small) > pBack) || (pFront < (pBack * 0.2 + Limits::Small)))
                         val += 0.5;
@@ -1614 +1613 @@
                   << " backpvs: " << backPvs << " pBack: " << pBack << endl << endl;
 #endif
+        
         return val;
 }
@@ -2036 +2036 @@
 }
 
-void BspTree::SetGenerateViewCells(int generateViewCells)
-{
-        mGenerateViewCells = generateViewCells;
-}
 
 BspTreeStatistics &BspTree::GetStat()