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

Timestamp:

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

Author:

mattausch

Message:

removed memory leaks

File:

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

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

@@ -389 +389 @@
         SplitQueue viewSpaceQueue;
 
-        int vspSteps, ospSteps;
+        int vspSteps = 0, ospSteps = 0;
 
         // use sah for evaluating osp tree construction 
@@ -451 +451 @@
         // then optimizate view space partition for the current osp
         // and vice versa until iteration depth is reached.
+
         bool lastSplitWasOsp = true;
 
@@ -948 +949 @@
                 SubdivisionCandidate *sc = NextSubdivisionCandidate(splitQueue); 
                 
-                float rc = (float)sc->GetRenderCostDecrease() / (mInitialRenderCost - mHierarchyStats.mTotalCost + 1.0f);
-                float mc = (float)sc->GetPvsEntriesIncr() / (float)mHierarchyStats.mPvsEntries; 
-
+                const float priority = sc->GetPriority();
+                
+                //float rc = (float)sc->GetRenderCostDecrease() / (mInitialRenderCost - mHierarchyStats.mTotalCost + 1.0f);
+                //float mc = (float)sc->GetPvsEntriesIncr() / (float)mHierarchyStats.mPvsEntries;       
                 //cout << "dRc: " << sc->GetRenderCostDecrease() << " dMem: " << sc->GetPvsEntriesIncr() << " ratio1 " << rc << " ratio2 " << mc << " const: " << 1.0f - GetMemoryConst() << endl;
-
-                // minimum slope reached
-                if ((steps > maxSteps) || 
-                        ((sc->GetPriority() < threshold) && !(steps < minSteps)))
-                {
-                        cout << "\n**************** breaking on " << sc->GetPriority() << " smaller than " << threshold << endl;
-                        break;
-                }
 
                 ////////
@@ -969 +963 @@
                 if (success)
                 {
-                        sc->CollectDirtyCandidates(dirtyCandidates, true);
+                        //sc->CollectDirtyCandidates(dirtyCandidates, true);
                         ++ steps;
                 }
+
+                DEL_PTR(sc);
+
+                // minimum slope reached
+                if ((steps >= maxSteps) || 
+                        ((priority < threshold) && !(steps < minSteps)))
+                {
+                        cout << "\n**************** breaking on " << priority << " smaller than " << threshold << endl;
+                        break;
+                }
+
         }
 
@@ -1156 +1161 @@
                                                                                   AxisAlignedBox3 *forcedViewSpace)
 {
-        // assume object space subdivision constructed
-        //mObjectSpaceSubdivisionType = mSavedObjectSpaceSubdivisionType;
-
         const long startTime = GetTime();
         const int limit = mNumMultiLevels;
@@ -1538 +1540 @@
         for (oit = objects.begin(); oit != oit_end; ++ oit)
         {
-                (*oit)->mVssRays.clear();
+                (*oit)->DelRayRefs();
         }
 }