Changeset 1557 for GTP/trunk/Lib/Vis/Preprocessing/src/ViewCellBsp.cpp

Timestamp:

10/03/06 10:10:01 (18 years ago)

Author:

mattausch

Message:

 

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/ViewCellBsp.cpp (modified) (6 diffs)

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

@@ -174 +174 @@
 {
         Randomize(); // initialise random generator for heuristics
-        mOutOfBoundsCell = new BspViewCell();
-        mOutOfBoundsCell->SetId(-1);
+        mOutOfBoundsCell = GetOrCreateOutOfBoundsCell();
+
         /////////
         //-- termination criteria for autopartition
@@ -277 +277 @@
 
 
+BspViewCell *BspTree::GetOrCreateOutOfBoundsCell()
+{
+        if (!mOutOfBoundsCell)
+        {
+                mOutOfBoundsCell = new BspViewCell();
+                mOutOfBoundsCell->SetId(OUT_OF_BOUNDS_ID);
+                mOutOfBoundsCell->SetValid(false);
+        }
+
+        return mOutOfBoundsCell;
+}
+
 int BspTree::SplitPolygons(const Plane3 &plane,
                                                    PolygonContainer &polys, 
@@ -420 +432 @@
         if (mOutOfBoundsCellPartOfTree)
         {
-                cout << "here223 " << mOutOfBoundsCell << endl;
                 // out of bounds cell not part of tree =>
                 // delete manually
                 DEL_PTR(mOutOfBoundsCell);
-        }else cout << "here991 " << endl;
+        }
 }
 
@@ -999 +1010 @@
                         // add predefined view cell to leaf
                         viewCell = dynamic_cast<BspViewCell *>(tData.mViewCell);
-                
-                        /// out of bounds cell can be handled as any other cell
+
+                        // from now on out of bounds cell can be handled as any other cell,
+                        // responsibility for deleting has been shifted
                         if (viewCell == mOutOfBoundsCell)
+                        {
                                 mOutOfBoundsCellPartOfTree = true;
+                        }
                 }
 
@@ -2364 +2378 @@
 
 
-
 void BspTree::ConstructGeometry(ViewCell *vc, 
                                                                 BspNodeGeometry &vcGeom) const
@@ -2379 +2392 @@
         for (it = leaves.begin(); it != it_end; ++ it)
         {
+                // per definition out of bounds cell has zero volume
+                if ((*it) == mOutOfBoundsCell)
+                        continue;
+
                 BspViewCell *bspVc = dynamic_cast<BspViewCell *>(*it);
                 vector<BspLeaf *>::const_iterator bit, bit_end = bspVc->mLeaves.end();