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

Timestamp:

04/24/06 08:21:10 (18 years ago)

Author:

mattausch

Message:

debug version for testing subdivision

File:

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

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

@@ -173 +173 @@
         Debug << "export to file: " << mExportViewCells << endl;
         
-        Debug << "active: " << mNumActiveViewCells << endl;
+        Debug << "active view cells: " << mNumActiveViewCells << endl;
         Debug << "post process compress: " << mCompressViewCells << endl;
         Debug << "visualization use clipPlane: " << mUseClipPlaneForViz << endl; 
@@ -179 +179 @@
         Debug << "evaluate view cells: " << mEvaluateViewCells << endl;
         Debug << "sampling type: " << mSamplingType << endl;
-        Debug << "render cost evaluation type" << mRenderCostEvaluationType << endl;
+        Debug << "render cost evaluation type: " << mRenderCostEvaluationType << endl;
         Debug << "evaluation sampling type: " << mEvaluationSamplingType << endl;
         Debug << "show visualization: " << mShowVisualization << endl;
@@ -479 +479 @@
         if (TEST_EMPTY_VIEW_CELLS)
                 CollectEmptyViewCells();
-
-
+        
+        // evaluation of the paritition, i.e., a number of new samples are cast
+        if (mEvaluateViewCells)
+        {
+                EvalViewCellPartition(preprocessor);
+        }
+        
         //-- visualization
         if (mShowVisualization)
@@ -500 +505 @@
         }
 
-        // evaluation of the paritition, i.e., a number of new samples are cast
-        if (mEvaluateViewCells)
-        {
-                EvalViewCellPartition(preprocessor);
-        }
-        
         return numSamples;
 }
@@ -696 +695 @@
         bool dirSamples = (mEvaluationSamplingType == Preprocessor::DIRECTION_BASED_DISTRIBUTION);
 
-        cout << "collect leaf view cells and reseting pvs ... ";
-
-        ViewCellContainer leaves;
-        mViewCellsTree->CollectLeaves(mViewCellsTree->GetRoot(), leaves);
-        cout << " ... ";
+
+/*ViewCellContainer leaves;
+mViewCellsTree->CollectLeaves(mViewCellsTree->GetRoot(), leaves);
+*/      
+        cout << "reseting pvs ... ";
+                
+
         bool startFromZero = true;
 
@@ -744 +745 @@
                 cout << "compute new statistics ... ";
 
-                // propagate pvs or pvs size information
+/*Debug << "*******+" << endl;
+float overall = 0;
+stable_sort(leaves.begin(), leaves.end(), ViewCell::SmallerPvs);
+        for (int i = 0; i < leaves.size(); ++ i)
+        {
+                overall += leaves[i]->GetPvs().GetSize();
+                Debug << "i " << i << " !size: " << leaves[i]->GetPvs().GetSize() << " vol: " << leaves[i]->GetVolume() << " overall " << overall << endl;
+                
+        }
+*/
+
+                //-- propagate pvs or pvs size information
                 ObjectPvs pvs;
                 UpdatePvsForEvaluation(mViewCellsTree->GetRoot(), pvs);
 
 
-                // output stats
+                //-- output stats
                 sprintf(s, "-%09d-eval.log", castSamples);
                 string fileName = string(statsPrefix) + string(s);
@@ -1793 +1805 @@
                 if (!mOnlyValidViewCells || (*it)->GetValid())
                 {
-                        ExportColor(exporter, *it);             
+                        ExportColor(exporter, *it);     
+
                         ExportViewCellGeometry(exporter, *it, 
                                 mUseClipPlaneForViz ? &mClipPlane : NULL);
@@ -2145 +2158 @@
 
                         //exporter->SetWireframe();
-                        exporter->SetFilled();
+                        //exporter->SetFilled();
+                        bool b = mUseClipPlaneForViz;
+                        mUseClipPlaneForViz = false;
                         ExportViewCellsForViz(exporter);
-
+                        mUseClipPlaneForViz = b;
                         delete exporter;
                 }
@@ -2168 +2183 @@
         // export single view cells
         ExportBspPvs(objects);
-}
-
-
-inline bool vc_gt(ViewCell *a, ViewCell *b)
-{
-        return a->GetPvs().GetSize() > b->GetPvs().GetSize();
 }
 
@@ -2219 +2228 @@
         // sort view cells to get largest view cells
         if (0)
-                stable_sort(mViewCells.begin(), mViewCells.end(), vc_gt);
+                stable_sort(mViewCells.begin(), mViewCells.end(), ViewCell::SmallerPvs);
 
         int limit = min(leafOut, (int)mViewCells.size());
@@ -3329 +3338 @@
         case 1: // pvs
                 {
-                        importance = (float)vc->GetPvs().GetSize() /
+                        importance = (float)mViewCellsTree->GetPvsSize(vc) /
                                 (float)mCurrentViewCellsStats.maxPvs;
                 }
@@ -3541 +3550 @@
                 // compute tree by merging the nodes based on cost heuristics
                 mViewCellsTree->ConstructMergeTree(rays, objects);
+
+        //cout << "here344" << endl;
+                //ObjectPvs pvs;
+                //UpdatePvsForEvaluation(mViewCellsTree->GetRoot(), pvs);
         }
         else
@@ -3881 +3894 @@
                 pvs = root->GetPvs();
 
-                root->mPvsSize = pvs.GetSize();
+                root->mPvsSize = root->GetPvs().GetSize();
                 root->mPvsSizeValid = true;
 
@@ -3887 +3900 @@
         }
         
+        //-- interior node => propagate pvs up
         ViewCellInterior *interior = dynamic_cast<ViewCellInterior *>(root);
+        interior->GetPvs().Clear();
+        pvs.Clear();
+        vector<ObjectPvs> pvsList;
+
         ViewCellContainer::const_iterator vit, vit_end = interior->mChildren.end();
 
-        vector<ObjectPvs> pvsList;
-        
-        
         for (vit = interior->mChildren.begin(); vit != vit_end; ++ vit)
         {
@@ -3905 +3920 @@
 
 #if 1
+
         Intersectable::NewMail();
 
@@ -3933 +3949 @@
         {
                 interior->mPvs = pvs;
+                //cout << "here233" << endl;
         }
         
@@ -3940 +3957 @@
 
 #else
+
         // really merge cells: slow put sumpdf is correct
-        ViewCellInterior *viewCellInterior = new ViewCellInterior();
-
         viewCellInterior->GetPvs().Merge(backVc->GetPvs());
         viewCellInterior->GetPvs().Merge(frontVc->GetPvs());
@@ -3995 +4011 @@
         {       // hack pvs
                 int savedColorCode = mColorCode;
-                mColorCode = 0;
+                mColorCode = 1;
+        
                 Exporter *exporter = Exporter::GetExporter("final_view_cells.wrl");
                 
@@ -4020 +4037 @@
                         }
 
+                        //exporter->SetFilled();
+                        bool b = mUseClipPlaneForViz;
+                        mUseClipPlaneForViz = false;
                         ExportViewCellsForViz(exporter);
+                        mUseClipPlaneForViz = b;
+                
                         delete exporter;
                         cout << "finished" << endl;
@@ -4148 +4170 @@
 
         const bool sortViewCells = true;
+        
 
         // sort view cells to visualize the largest view cells
         if (sortViewCells)
-                stable_sort(mViewCells.begin(), mViewCells.end(), vc_gt);
-        
+        {
+                //stable_sort(mViewCells.begin(), mViewCells.end(), ViewCell::SmallerPvs);
+                stable_sort(mViewCells.begin(), mViewCells.end(), ViewCell::LargerRenderCost);
+        }
+
         int limit = min(leafOut, (int)mViewCells.size());
 
@@ -4168 +4194 @@
                 else
                         vc = mViewCells[(int)RandomValue(0, (float)mViewCells.size() - 1)];
+
+                ObjectPvs pvs;
+                mViewCellsTree->GetPvs(vc, pvs);
 
                 //bspLeaves[j]->Mail();
@@ -4175 +4204 @@
                 Debug << i << ": pvs size=" << (int)mViewCellsTree->GetPvsSize(vc) << endl;
 
+                //-- export the sample rays
                 if (1 || mExportRays)
                 {
@@ -4212 +4242 @@
                                                 vcRays.push_back(*rit);
                                 }
+
                                 //-- export rays piercing this view cell
                                 exporter->ExportRays(vcRays, RgbColor(1, 1, 1));
@@ -4221 +4252 @@
                                 VssRayContainer vcRays;
                                 raysOut = min((int)rays.size(), mVisualizationSamples);
+
                                 // check whether we can add the current ray to the output rays
                                 for (int k = 0; k < raysOut; ++ k)
@@ -4251 +4283 @@
                 exporter->SetFilled();
 
-
+                //-- export pvs
                 if (1)
                 {
                         ObjectPvsMap::const_iterator oit,
-                                oit_end = vc->GetPvs().mEntries.end();
-
-
-                        exporter->SetFilled();
+                                oit_end = pvs.mEntries.end();
 
                         Intersectable::NewMail();
-        
+
                         // output PVS of view cell
-                        for (oit = vc->GetPvs().mEntries.begin(); oit != oit_end; ++ oit)
+                        for (oit = pvs.mEntries.begin(); oit != oit_end; ++ oit)
                         {               
                                 Intersectable *intersect = (*oit).first;
@@ -4277 +4306 @@
                         }
                 }
-                else
-                {
+                
+                if (0)
+                {   // export scene geometry
                         m.mDiffuseColor = RgbColor(1, 0, 0);
                         exporter->SetForcedMaterial(m);
@@ -4338 +4368 @@
         case 1: // pvs
                 {
-                        importance = (float)vc->GetPvs().GetSize() /
+                        importance = (float)mViewCellsTree->GetPvsSize(vc) /
 #if 1 // hack for result                        
                                 (float)mCurrentViewCellsStats.maxPvs;
@@ -4377 +4407 @@
                                                                                                         const Plane3 *clipPlane) const
 {
-        if (vc->GetMesh())
-        {
-                exporter->ExportMesh(vc->GetMesh());
-        
-                return;
-        }
-
-        
         if (clipPlane)
         {
@@ -4418 +4440 @@
                                 //Debug << "geo size: " << geom.Size() << endl;
                                 //Debug << "size b: " << back.Size() << " f: " << front.Size() << endl;
+
                                 if (back.Valid())
                                 {
@@ -4427 +4450 @@
         else
         {
-                BspNodeGeometry geom;
-                mVspBspTree->ConstructGeometry(vc, geom);
-                        
-                exporter->ExportPolygons(geom.GetPolys());
+                // export mesh if available
+        /*      if (vc->GetMesh())
+                {
+                        exporter->ExportMesh(vc->GetMesh());
+                }
+                else
+                {*/
+                        BspNodeGeometry geom;
+                        mVspBspTree->ConstructGeometry(vc, geom);
+                        exporter->ExportPolygons(geom.GetPolys());
+                //}
         }
 }