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

Timestamp:

10/09/06 15:57:28 (18 years ago)

Author:

mattausch

Message:

resolved bug for object space distribution using triangles
fixed biasing bug for mesh::GetRandomSurfacePoint? method and
GetRandomVisibleSurfacePoint?.

File:

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

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

@@ -911 +911 @@
                 cout << "compute new statistics ... " << endl;
         
+                ///////////////7
                 //-- propagate pvs or pvs size information
+
                 ObjectPvs pvs;
                 UpdatePvsForEvaluation(mViewCellsTree->GetRoot(), pvs);
 
+                ///////////
                 //-- output stats
                 sprintf(str, "-%09d-eval.log", castSamples);
@@ -1128 +1131 @@
                                                                            ) const
 {
-  if (!vc->IsLeaf() && vc->GetMergeCost() < 0.0f) {
-        ViewCellInterior *vci = (ViewCellInterior *) vc;
-        ViewCellContainer::const_iterator it, it_end = vci->mChildren.end();
-        
-        for (it = vci->mChildren.begin(); it != it_end; ++ it)
-          DeleteLocalMergeTree(*it);
-        vci->mChildren.clear();
-        delete vci;
+        if (!vc->IsLeaf() && vc->GetMergeCost() < 0.0f) 
+        {       
+                ViewCellInterior *vci = (ViewCellInterior *) vc;
+                ViewCellContainer::const_iterator it, it_end = vci->mChildren.end();
+
+        for (it = vci->mChildren.begin(); it != it_end; ++ it)
+                        DeleteLocalMergeTree(*it);
+                
+                vci->mChildren.clear();
+                
+                delete vci;
   }
 }
@@ -1489 +1495 @@
         //-- extrude new vertices for top of prism
 
-        Vector3 triNorm = baseTri.GetNormal();
+        const Vector3 triNorm = baseTri.GetNormal();
         Triangle3 topTri;
 
@@ -2236 +2242 @@
         if (viewSpaceFilterSize >= 0.0f) {
 
-  bool usePrVS = false;
+  const bool usePrVS = false;
 
   if (!usePrVS) {
@@ -2351 +2357 @@
 
         // $$ warning collect objects takes only unmailed ones!
-        kdTree->CollectObjects(box,
-                                                   objects);
+        kdTree->CollectObjects(box, objects);
         //      cout<<"collected objects="<<objects.size()<<endl;
         ObjectContainer::const_iterator noi = objects.begin();
-        for (; noi != objects.end(); ++noi) {
-          Intersectable *o = *noi;
-          // $$ JB warning: pdfs are not correct at this point!
-          nPvs.AddSample(o, Limits::Small);
-          nPvsSize++;
+        for (; noi != objects.end(); ++ noi) 
+        {
+                Intersectable *o = *noi;
+                // $$ JB warning: pdfs are not correct at this point!     
+                nPvs.AddSample(o, Limits::Small);
+                nPvsSize ++;
         }
   }
@@ -2455 +2461 @@
         }
         
-        //-- interior node => propagate pvs up
+        ////////////////
+        //-- interior node => propagate pvs up the tree
+
         ViewCellInterior *interior = dynamic_cast<ViewCellInterior *>(root);
         interior->GetPvs().Clear();
@@ -2467 +2475 @@
                 ObjectPvs objPvs;
                 
+                //////////////////
                 //-- recursivly compute child pvss
+
                 UpdatePvsForEvaluation(*vit, objPvs);
 
@@ -2478 +2488 @@
 
         //-- faster way of computing pvs:
-        //   construct merged pvs by adding 
-        //   and only those of the next pvs which were not mailed.
-        //   note: sumpdf is not correct!!
+        //-- construct merged pvs by adding
+        //-- and only those of the next pvs which were not mailed.
+        //-- note: sumpdf is not correct!!
+
         vector<ObjectPvs>::iterator oit = pvsList.begin();
 
@@ -2508 +2519 @@
         UpdateScalarPvsSize(interior, pvs.CountObjectsInPvs(), pvs.GetSize());
         
-
-#else // really merge cells: slow put sumPdf is correct
+#else 
+        // really merge cells: slow put sumPdf is correct
         viewCellInterior->GetPvs().Merge(backVc->GetPvs());
         viewCellInterior->GetPvs().Merge(frontVc->GetPvs());
@@ -2561 +2572 @@
 
         const float prop = (float)limit / ((float)rays.size() + Limits::Small);
+
         for (it = rays.begin(); it != it_end; ++ it)
         {
@@ -4046 +4058 @@
         ////////////
         //-- compression
-
+//#if HAS_TO_BE_REDONE
         if (ViewCellsTreeConstructed() && mCompressViewCells)
         {
-                int pvsEntries = mViewCellsTree->GetStoredPvsEntriesNum(mViewCellsTree->GetRoot());
+                int pvsEntries = mViewCellsTree->CountStoredPvsEntries(mViewCellsTree->GetRoot());
                 Debug << "number of entries before compress: " << pvsEntries << endl;
 
                 mViewCellsTree->SetViewCellsStorage(ViewCellsTree::COMPRESSED);
 
-                pvsEntries = mViewCellsTree->GetStoredPvsEntriesNum(mViewCellsTree->GetRoot());
+                pvsEntries = mViewCellsTree->CountStoredPvsEntries(mViewCellsTree->GetRoot());
                 Debug << "number of entries after compress: " << pvsEntries << endl;
         }
-
+//#endif
 
         // collapse sibling leaves that share the same view cell
@@ -4919 +4931 @@
         
 
-        ///////////////
+        ///////////
         //-- compression
 
+//#if HAS_TO_BE_REDONE
         if (ViewCellsTreeConstructed() && mCompressViewCells)
         {
-                int pvsEntries = mViewCellsTree->GetStoredPvsEntriesNum(mViewCellsTree->GetRoot());
+                int pvsEntries = mViewCellsTree->CountStoredPvsEntries(mViewCellsTree->GetRoot());
                 Debug << "number of entries before compress: " << pvsEntries << endl;
 
                 mViewCellsTree->SetViewCellsStorage(ViewCellsTree::COMPRESSED);
 
-                pvsEntries = mViewCellsTree->GetStoredPvsEntriesNum(mViewCellsTree->GetRoot());
+                pvsEntries = mViewCellsTree->CountStoredPvsEntries(mViewCellsTree->GetRoot());
                 Debug << "number of entries after compress: " << pvsEntries << endl;
         }
+//#endif
 
         /////////////