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

Timestamp:

06/07/06 10:59:55 (18 years ago)

Author:

mattausch

Message:

debug run: fixing memory holes

File:

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

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

@@ -39 +39 @@
 };
 
-//typedef priority_queue<ViewCell *, vector<ViewCell *>, myless<vector<ViewCell *>::value_type> > FilterQueue;
-
-
 
 ViewCellsManager::ViewCellsManager(Environment *env):
@@ -205 +202 @@
 ViewCellsManager::~ViewCellsManager()
 {
-        DEL_PTR(mRenderer);
+        //DEL_PTR(mRenderer);
 
         if (!ViewCellsTreeConstructed())
                 CLEAR_CONTAINER(mViewCells);
-        else
-                DEL_PTR(mViewCellsTree);
+        //else
+        DEL_PTR(mViewCellsTree);
 }
 
@@ -306 +303 @@
                 }
         }
-        Debug << "\nSampled " << i << " new view cells (" << " of " << (int)mEmptyViewCells.size() << ")" << endl << endl;
+        Debug << "\nSampled " << i << " new view cells (" 
+                  << " of " << (int)mEmptyViewCells.size() << ")" << endl << endl;
 }
 
@@ -395 +393 @@
                   << TimeDiff(startTime, GetTime()) * 1e-3 << " secs" << endl;
 
-
+return 0;
         // take post processing time
         startTime = GetTime();
 
-
-        // testing the view cell filter functionality   
-        if (0) TestFilter(preprocessor->mObjects);
-
         // -- stats after contruction
         ResetViewCells();
-
         Debug << "\nView cells after initial sampling:\n" << mCurrentViewCellsStats << endl;
+
 
         if (1) // export initial view cells
@@ -473 +467 @@
 
         
-
         //-- post processing
         VssRayContainer postProcessSamples;
@@ -494 +487 @@
 
 
-
         cout << "starting post processing and visualization" << endl;
 
@@ -514 +506 @@
                  << TimeDiff(startTime, GetTime()) *1e-3 << " secs" << endl;
 
-        // only for debugging purpose
-        if (TEST_EMPTY_VIEW_CELLS)
-                CollectEmptyViewCells();
-        
+        disposeRays(postProcessSamples, outRays);
+
+        
+        //return 1;
         // evaluation of the paritition, i.e., a number of new samples are cast
         if (mEvaluateViewCells)
@@ -523 +515 @@
                 EvalViewCellPartition(preprocessor);
         }
-        
+
+
         //-- visualization
         if (mShowVisualization)
@@ -679 +672 @@
                                                                                          const ObjectContainer &objects)
 {
-        if (!ViewCellsConstructed())
+        if (!ViewCellsConstructed() || !ViewCellsTreeConstructed())
                 return false;
 
@@ -764 +757 @@
         sort(viewCells.begin(), viewCells.end(), ViewCell::SmallerPvs);
 
-        //Debug << "********************" << endl;
-        //for (int i = 0; i < viewCells.size(); ++ i)
-        //      Debug << "pvs: " << mViewCellsTree->GetPvsSize(viewCells[i]) << " ";
-        //Debug << "\n";
         maxPvs = mViewCellsTree->GetPvsSize(viewCells.back());
         minVal = 0;
@@ -844 +833 @@
 
 
+bool ViewCellsManager::GetExportPvs() const 
+{
+        return mExportPvs;
+}
+
+
 void ViewCellsManager::EvalViewCellPartition(Preprocessor *preprocessor)
 {
@@ -862 +857 @@
         Debug << "view cell stats prefix: " << statsPrefix << endl;
 
-        //VssRayContainer outRays;
+        
         // should directional sampling be used?
         bool dirSamples = (mEvaluationSamplingType == Preprocessor::DIRECTION_BASED_DISTRIBUTION);
@@ -932 +927 @@
 
         //-- histogram
-
 
         bool useHisto;
@@ -1207 +1201 @@
 bool ViewCellsManager::ViewCellsTreeConstructed() const
 {
-        return mViewCellsTree->GetRoot();
+    return (mViewCellsTree && mViewCellsTree->GetRoot());
 }
 
@@ -1419 +1413 @@
 
 
-void ViewCellsManager::DeriveViewCells(const ObjectContainer &objects,
-                                                                           ViewCellContainer &viewCells,
-                                                                           const int maxViewCells) const
+void ViewCellsManager::DeriveViewCellsFromObjects(const ObjectContainer &objects,
+                                                                                                  ViewCellContainer &viewCells,
+                                                                                                  const int maxViewCells) const
 {
         // maximal max viewcells
@@ -1444 +1438 @@
 
                         Mesh *mesh = MeshManager::GetSingleton()->CreateResource();
-
-                        // copy mesh
-                        *mesh = *mi->GetMesh();
-
+                        
                         // transform mesh
-                        Matrix4x4 m;
-                        mi->GetWorldTransform(m);
-                        mesh->ApplyTransformation(m);
+                        mi->GetTransformedMesh(*mesh);
                         
                         // create bb + kd tree
@@ -2168 +2157 @@
 
 
+void ViewCellsManager::SetScalarPvsSize(ViewCell *vc, const int pvsSize) const
+{
+        vc->mPvsSize = pvsSize;
+        vc->mPvsSizeValid = true;
+}
+
+
 /**********************************************************************/
 /*                 BspViewCellsManager implementation                 */
@@ -2964 +2960 @@
         {
                 pvs = root->GetPvs();
-
-                root->mPvsSize = pvs.GetSize();
-                root->mPvsSizeValid = true;
-
+                SetScalarPvsSize(root, pvs.GetSize());
+                
                 return;
         }
@@ -3018 +3012 @@
         if (mViewCellsTree->ViewCellsStorage() == ViewCellsTree::PVS_IN_INTERIORS)
         {
-                interior->mPvs = pvs;
+                interior->SetPvs(pvs);
         }
         
         // set new pvs size
-        interior->mPvsSize = pvs.GetSize();
-        interior->mPvsSizeValid = true;
+    SetScalarPvsSize(interior, pvs.GetSize());
 
 #else
@@ -3781 +3774 @@
         Debug << "saved rays: " << (int)savedRays.size() << endl;
 
-
-        //TODO: remove
+        long startTime;
+
         if (1)
                 mVspBspTree->Construct(constructionRays, &mViewSpaceBox);
@@ -3790 +3783 @@
         // collapse invalid regions
         cout << "collapsing invalid tree regions ... ";
-        long startTime = GetTime();
-        int collapsedLeaves = mVspBspTree->CollapseTree();
+        startTime = GetTime();
+        const int collapsedLeaves = mVspBspTree->CollapseTree();
         Debug << "collapsed in " << TimeDiff(startTime, GetTime()) * 1e-3 
                   << " seconds" << endl;
@@ -3797 +3790 @@
     cout << "finished" << endl;
 
-        // -- stats
+        //-- stats
         Debug << mVspBspTree->GetStatistics() << endl;
 
@@ -4211 +4204 @@
         {
                 pvs = root->GetPvs();
-
-                root->mPvsSize = root->GetPvs().GetSize();
-                root->mPvsSizeValid = true;
-
+                SetScalarPvsSize(root, root->GetPvs().GetSize());
+                
                 return;
         }
@@ -4266 +4257 @@
         if (mViewCellsTree->ViewCellsStorage() == ViewCellsTree::PVS_IN_INTERIORS)
         {
-                interior->mPvs = pvs;
+                interior->SetPvs(pvs);
         }
         
         // set new pvs size
-        interior->mPvsSize = pvs.GetSize();
-        interior->mPvsSizeValid = true;
+        SetScalarPvsSize(interior, pvs.GetSize());
+        
 
 #else
@@ -4325 +4316 @@
         GetRaySets(sampleRays, mVisualizationSamples, visRays);
 
-        
-        if (1) // export view cells
+        //-- export view cells
+        if (1) 
         {       // hack pvs
-                int savedColorCode = mColorCode;
+                const int savedColorCode = mColorCode;
                 mColorCode = 1;
         
@@ -4367 +4358 @@
                 mColorCode = savedColorCode;
         }
+
 
         if (0)
@@ -5035 +5027 @@
   //  AxisAlignedBox3 box(center - Vector3(viewSpaceFilterSize/2),
   //                                      center + Vector3(viewSpaceFilterSize/2));
-
         if (!ViewCellsConstructed())
                 return;
 
-  if (viewSpaceFilterSize >=0.0f) {
+        if (viewSpaceFilterSize >= 0.0f) {
 
   bool usePrVS = false;
 
-  
   if (!usePrVS) {
         AxisAlignedBox3 box = GetViewCellBox(viewCell);
@@ -5052 +5042 @@
         
   //  cout<<"box="<<box<<endl;
-        ViewCellContainer::const_iterator it=viewCells.begin(), it_end = viewCells.end();
+        ViewCellContainer::const_iterator it = viewCells.begin(), it_end = viewCells.end();
         
         int i;
-        for (i=0; it != it_end; ++it, i++) {
-          //    cout<<"v"<<i<<" pvs="<<(*it)->GetPvs().mEntries.size()<<endl;
+        for (i=0; it != it_end; ++ it, ++ i) {
+                cout<<"v"<<i<<" pvs="<<(*it)->GetPvs().mEntries.size()<<endl;
           pvs.Merge((*it)->GetPvs());
         }
@@ -5070 +5060 @@
   } else
         pvs = viewCell->GetPvs();
-  
+   
   if (spatialFilterSize >=0.0f)
         ApplySpatialFilter(kdTree, spatialFilterSize, pvs);
-
+  
 }
 
@@ -5097 +5087 @@
   
   int i;
-  for (i=0, it = mViewCells.begin(); it != it_end; ++ it, i++) {
+  for (i=0, it = mViewCells.begin(); it != it_end; ++ it, ++ i) {
         ApplyFilter(*it,
                                 kdTree,
@@ -5107 +5097 @@
 
   // now replace all pvss
-  for (i= 0, it = mViewCells.begin(); it != it_end; ++ it, i++) {
+  for (i = 0, it = mViewCells.begin(); it != it_end; ++ it, ++ i) {
+            
         ObjectPvs &pvs = (*it)->GetPvs();
         pvs.Clear();
@@ -5114 +5105 @@
   }
   
-  delete newPvs;
+  delete [] newPvs;
 }
 
@@ -5180 +5171 @@
 
 //////////////////////////////////
-ViewCellsManager *ViewCellsManagerFactory::Create(const string mName)
+/*ViewCellsManager *ViewCellsManagerFactory::Create(const string mName)
 {
         //TODO
         return NULL;// new VspBspViewCellsManager();
-}
-
-
-}
+}*/
+
+
+}