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

Timestamp:

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

Author:

mattausch

Message:

removed memory leaks

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/BvHierarchy.cpp (modified) (8 diffs)

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

@@ -214 +214 @@
 BvHierarchy::~BvHierarchy()
 {
-        // delete kd intersectables
+        // delete bvh intersectables
         BvhIntersectableMap::iterator it, it_end = mBvhIntersectables.end();
 
@@ -222 +222 @@
         }
 
+        // delete the local subdivision candidates
         DEL_PTR(mSubdivisionCandidates);
 
+        // delete the presorted objects
         for (int i = 0; i < 3; ++ i)
         {
                 DEL_PTR(mSortedObjects[i]);
         }
-        mSubdivisionStats.close();
+        
+        // delete the tree
+        DEL_PTR(mRoot);
 }
 
@@ -329 +333 @@
         for (oit = objects.begin(); oit != oit_end; ++ oit)
         {
-                nRays += (int)(*oit)->mVssRays.size();
+                nRays += (int)(*oit)->GetOrCreateRays()->size();
         }
 
@@ -1336 +1340 @@
                 if (ray->mTerminationObject)
                 {
-                        ray->mTerminationObject->mVssRays.push_back(ray);
+                        ray->mTerminationObject->GetOrCreateRays()->push_back(ray);
                         if (!ray->Mailed())
                         {
@@ -1346 +1350 @@
                 if (ray->mOriginObject)
                 {
-                        ray->mOriginObject->mVssRays.push_back(ray);
+                        ray->mOriginObject->GetOrCreateRays()->push_back(ray);
 
                         if (!ray->Mailed())
@@ -1385 +1389 @@
         {
                 Intersectable *obj = *oit;
-                VssRayContainer::const_iterator rit, rit_end = obj->mVssRays.end();
-
-                for (rit = obj->mVssRays.begin(); rit < rit_end; ++ rit)
+                VssRayContainer::const_iterator rit, rit_end = obj->GetOrCreateRays()->end();
+
+                for (rit = obj->GetOrCreateRays()->begin(); rit < rit_end; ++ rit)
                 {
                         VssRay *ray = (*rit);
@@ -1514 +1518 @@
                                                                    const bool setCounter) const
 {
-        VssRayContainer::const_iterator rit, rit_end = obj->mVssRays.end();
-
-        for (rit = obj->mVssRays.begin(); rit < rit_end; ++ rit)
+        VssRayContainer::const_iterator rit, rit_end = obj->GetOrCreateRays()->end();
+
+        for (rit = obj->GetOrCreateRays()->begin(); rit < rit_end; ++ rit)
         {
                 VssRay *ray = (*rit);
@@ -1557 +1561 @@
         int result = 0;
         
-        VssRayContainer::const_iterator rit, rit_end = obj->mVssRays.end();
-
-        for (rit = obj->mVssRays.begin(); rit < rit_end; ++ rit)
+        VssRayContainer::const_iterator rit, rit_end = obj->GetOrCreateRays()->end();
+
+        for (rit = obj->GetOrCreateRays()->begin(); rit < rit_end; ++ rit)
         {
                 VssRay *ray = (*rit);