Changeset 1696 for GTP/trunk/Lib/Vis/Preprocessing/src/ViewCellsManager.cpp

Timestamp:

10/29/06 18:17:38 (18 years ago)

Author:

mattausch

Message:

removed memory leaks

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/ViewCellsManager.cpp (modified) (4 diffs)

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

@@ -244 +244 @@
         {
                 CLEAR_CONTAINER(mViewCells);
+        }
+        else
+        {
+                DEL_PTR(mViewCellsTree);
         }
 }
@@ -3041 +3045 @@
                         {       
                                 // prepare some rays for output
-                                VssRayContainer::const_iterator rit, rit_end = (*vit)->mVssRays.end();
-                                for (rit = (*vit)->mVssRays.begin(); rit != rit_end; ++ rit)
+                                VssRayContainer::const_iterator rit, rit_end = (*vit)->GetOrCreateRays()->end();
+                                for (rit = (*vit)->GetOrCreateRays()->begin(); rit != rit_end; ++ rit)
                                 {
                                         collectRays.push_back(*rit);
@@ -4968 +4972 @@
 
 
-        // should maybe be done here to allow merge working with area or volume
-        // and to correct the rendering statistics
-        if (0) FinalizeViewCells(false);
-                
         // compute tree by merging the nodes of the spatial hierarchy
         ViewCell *root = ConstructSpatialMergeTree(mHierarchyManager->GetVspTree()->GetRoot());
         mViewCellsTree->SetRoot(root);
 
-
         //////////////////////////
-        //-- update pvs in the whole hierarchy
+        //-- update pvs up to the root of the hierarchy
+
         ObjectPvs pvs;
         UpdatePvsForEvaluation(root, pvs);
@@ -5010 +5010 @@
         //-- some tasks still to do on the view cells:
         //-- Compute meshes from view cell geometry, evaluate volume and / or area
+
         if (1) FinalizeViewCells(true);
 
         // write out view cells (this moved to preprocessor)
-        if (1 && mExportViewCells)
+        if (mExportViewCells)
         {
                 char filename[100];