Changeset 1696 for GTP/trunk/Lib/Vis/Preprocessing/src

Timestamp:

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

Author:

mattausch

Message:

removed memory leaks

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• BvHierarchy.cpp (modified) (8 diffs)
• GvsPreprocessor.cpp (modified) (2 diffs)
• HierarchyManager.cpp (modified) (6 diffs)
• Intersectable.h (modified) (4 diffs)
• Preprocessor.cpp (modified) (1 diff)
• Preprocessor.vcproj (modified) (1 diff)
• ViewCellsManager.cpp (modified) (4 diffs)
• VspTree.cpp (modified) (5 diffs)
• VspTree.h (modified) (1 diff)
• main.cpp (modified) (2 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);

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

@@ -96 +96 @@
                         {
                                 VssRay *nray = new VssRay(*vssRay);
-                                (*vit)->mVssRays.push_back(nray);                               
+                                (*vit)->GetOrCreateRays()->push_back(nray);                             
                         }
                 }
@@ -480 +480 @@
                 for (vit = mViewCellsManager->GetViewCells().begin(); vit != vit_end; ++ vit)
                 {
-                        CLEAR_CONTAINER((*vit)->mVssRays);
+                        (*vit)->DelRayRefs();
                 }
 
-                CLEAR_CONTAINER(mVssRays);
+                //CLEAR_CONTAINER(mVssRays);
                 // ComputeRenderError();
                 ++ mPass;

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();
         }
 }

GTP/trunk/Lib/Vis/Preprocessing/src/Intersectable.h

@@ -48 +48 @@
   BvhLeaf *mBvhLeaf;
 //BvhNode *mBvhLeaf;
-  /// some rays piercing this intersectable
-  VssRayContainer mVssRays;
-
+  
   /// # of references to this instance
   int mReferences;
 
   //////////////////
-  // note matt: delete these, they are only taking memory+
+  // note matt: delete these, they are only taking memory
 
 
@@ -77 +75 @@
                 };
   
-  Intersectable(): mMailbox(0), mReferences(0), mBvhLeaf(0) {}
+  Intersectable(): mMailbox(0), mReferences(0), mBvhLeaf(0), mVssRays(NULL) {}
 
   virtual Intersectable::~Intersectable() {};
@@ -114 +112 @@
 
   virtual int GetRandomVisibleSurfacePoint(Vector3 &point,
-          Vector3 &normal,
-          const Vector3 &viewpoint,
-          const int maxTries) = 0;
+                                                                                   Vector3 &normal,
+                                                                                   const Vector3 &viewpoint,
+                                           const int maxTries) = 0;
 
   virtual ostream &Describe(ostream &s) = 0;
@@ -160 +158 @@
   }
 
-  /** returns normal from the face with the specified index.
-  PROBLEM: Does not fit to all intersectable types (e.g., spheres)
+  /** Returns normal from the face with the specified index.
+          PROBLEM: Does not fit to all intersectable types (e.g., spheres)
   */
   virtual Vector3 GetNormal(const int idx) const { return Vector3(0, 0, 0); }
+
+  VssRayContainer *GetOrCreateRays() 
+  { 
+          if (!mVssRays)
+                mVssRays = new VssRayContainer();
+          return mVssRays;
+  }
+
+  void DelRayRefs()
+  {
+          DEL_PTR(mVssRays);
+  }
+
+protected:
+
+  /// some rays piercing this intersectable
+  VssRayContainer *mVssRays;
 };
 

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

@@ -772 +772 @@
                 Environment::GetSingleton()->GetStringValue("Hierarchy.type", buf);     
 
-                HierarchyManager *mHierarchyManager = CreateHierarchyManager(buf);
+                mHierarchyManager = CreateHierarchyManager(buf);
                 mViewCellsManager = new VspOspViewCellsManager(vcTree, mHierarchyManager);
         }

GTP/trunk/Lib/Vis/Preprocessing/src/Preprocessor.vcproj

@@ -428 +428 @@
                         <File
                                 RelativePath="..\src\MutualVisibility.h">
+                        </File>
+                        <File
+                                RelativePath=".\ObjExporter.cpp">
+                        </File>
+                        <File
+                                RelativePath=".\ObjExporter.h">
                         </File>
                         <File

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];

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

@@ -345 +345 @@
 
 VspLeaf::VspLeaf(): 
-mViewCell(NULL), mPvs(NULL), mSubdivisionCandidate(NULL)
+mViewCell(NULL), mSubdivisionCandidate(NULL)
+//, mPvs(NULL)
 {
 }
@@ -352 +353 @@
 VspLeaf::~VspLeaf()
 {
-        DEL_PTR(mPvs);
-
         VssRayContainer::const_iterator vit, vit_end = mVssRays.end();
         for (vit = mVssRays.begin(); vit != vit_end; ++ vit)
@@ -380 +379 @@
 
 VspLeaf::VspLeaf(VspInterior *parent): 
-VspNode(parent), mViewCell(NULL), mPvs(NULL)
+VspNode(parent), mViewCell(NULL)
+//, mPvs(NULL)
 {}
 
 
 VspLeaf::VspLeaf(VspInterior *parent, ViewCellLeaf *viewCell): 
-VspNode(parent), mViewCell(viewCell), mPvs(NULL)
+VspNode(parent), mViewCell(viewCell)
+//, mPvs(NULL)
 {
 }
@@ -963 +964 @@
         backData.mNode = backLeaf;
 
-        // explicitely create front and back view cell
+        // create front and back view cell for the new leaves
         CreateViewCell(frontData, false);
         CreateViewCell(backData, false);
@@ -2846 +2847 @@
         // set view cell values
         viewCell->mLeaves.push_back(leaf);
-
         viewCell->SetVolume(mBoundingBox.GetVolume());
-    leaf->mProbability = mBoundingBox.GetVolume();
+
+        leaf->mProbability = mBoundingBox.GetVolume();
 }
 

GTP/trunk/Lib/Vis/Preprocessing/src/VspTree.h

@@ -334 +334 @@
         
         /// leaf pvs
-        ObjectPvs *mPvs;
+        //ObjectPvs *mPvs;
 
         /// Probability that the view point lies in this leaf

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

@@ -160 +160 @@
         //be ignored. Use it as you will!
         //note: from GDNet Direct [3.8.04 - 3.14.04] void detectMemoryLeaks() {
-#if 0
+#if 1
   _CrtSetDbgFlag(_CRTDBG_LEAK_CHECK_DF|_CRTDBG_ALLOC_MEM_DF);
   _CrtSetReportMode(_CRT_ASSERT,_CRTDBG_MODE_FILE);
@@ -325 +325 @@
           preprocessor->mUseGlDebugger = false;
         }
-        
+
         if (!(preprocessor->mUseGlRenderer || preprocessor->mUseGlDebugger)) {
-          // just call the mail method -> will be executed in the main thread
-          pt->Main();
-        }
-        
+                // just call the mail method -> will be executed in the main thread
+                pt->Main();
+        }       
+
         // release memory
         Cleanup();