Changeset 605 for trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellsManager.cpp

Timestamp:

02/08/06 15:05:04 (18 years ago)

Author:

mattausch

Message:

 

File:

• trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellsManager.cpp (modified) (18 diffs)

trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellsManager.cpp

@@ -16 +16 @@
 #include "RssPreprocessor.h"
 
+#define SAMPLE_AFTER_SUBDIVISION 1
 
 
@@ -189 +190 @@
 
                 // TODO: leak?
-                if(0)ComputeSampleContributions(constructionSamples, true, false);
+                if (SAMPLE_AFTER_SUBDIVISION)
+                        ComputeSampleContributions(constructionSamples, true, false);
                 cout << "finished" << endl;
 
@@ -211 +213 @@
         // store viewCells for postprocessing
         const bool storeViewCells = true;
-        if(0)ComputeSampleContributions(postProcessSamples, true, storeViewCells);
+
+        if (SAMPLE_AFTER_SUBDIVISION)
+                ComputeSampleContributions(postProcessSamples, true, storeViewCells);
         // merge the view cells
         PostProcess(preprocessor->mObjects, postProcessSamples);
@@ -224 +228 @@
                                         visualizationSamples);
 
-        if(0)ComputeSampleContributions(visualizationSamples, true, storeViewCells);
+        if (SAMPLE_AFTER_SUBDIVISION)
+                ComputeSampleContributions(visualizationSamples, true, storeViewCells);
 
         //Debug << "visualizationsamples: " << mVisualizationSamples << " " << visualizationSamples.size() << endl;
@@ -377 +382 @@
         for (it = mViewCells.begin(); it != it_end; ++ it)
         {
-                (*it)->UpdateViewCellsStats(mViewCellsStats);
+                mViewCellsTree->UpdateViewCellsStats(*it, mViewCellsStats);
         }
 }
@@ -858 +863 @@
 
 
+float ViewCellsManager::GetRendercost(ViewCell *viewCell, float objRendercost) const
+{
+        return mViewCellsTree->GetPvsSize(viewCell) * objRendercost;
+}
+
+
 float ViewCellsManager::GetAccVcArea()
 {
@@ -1082 +1093 @@
 
 
-float BspViewCellsManager::GetRendercost(ViewCell *viewCell, 
-                                                                                 float objRendercost) const
-{
-        return viewCell->GetPvs().GetSize() * objRendercost;
-}
-
 
 int BspViewCellsManager::CastLineSegment(const Vector3 &origin,
@@ -1157 +1162 @@
     // reset view cells and stats
         ResetViewCells();
+        Debug << "\nView cells after merge:\n" << mViewCellsStats << endl;
 
         int savedColorCode  = mColorCode;
-
+        
         //BspLeaf::NewMail();
         if (1) // export merged view cells
         {
                 mColorCode = 0;
-                cout << "reseting view cells ... ";
-                ResetViewCells();
-                cout << "finished" << endl;
-
+                
                 Exporter *exporter = Exporter::GetExporter("merged_view_cells.x3d");
-                Debug << "\nView cells after merge:\n" << mViewCellsStats << endl;
+                
 
                 cout << "exporting view cells after merge ... ";
@@ -1387 +1390 @@
                 ExportViewCellGeometry(exporter, vc);
                 
-
-                Debug << i << ": pvs size=" << (int)mViewCellsTree->GetPvsSize(vc)
-                          << ", piercing rays=" << (int)vcRays.size() << endl;
-                         // << ", leaves=" << (int)vc->mLeaves.size() << endl;
-
-
                 // export rays piercing this view cell
                 exporter->ExportRays(vcRays, RgbColor(0, 1, 0));
@@ -1677 +1674 @@
 }
 
+
 float KdViewCellsManager::GetProbability(ViewCell *viewCell)
 {
         // compute view cell area / volume as subsititute for probability
-#if 0
-        return GetArea(viewCell) / GetViewSpaceBox().SurfaceArea();
-#endif
-#if 1
-        return GetArea(viewCell) / GetAccVcArea();
-#endif
-#if 0
-        return GetVolume(viewCell) / GetViewSpaceBox().GetVolume();
-#endif
-}
-
-
-float KdViewCellsManager::GetRendercost(ViewCell *viewCell, float objRendercost) const
-{
-        return viewCell->GetPvs().GetSize() * objRendercost;
-}
+        if (0)
+                return GetArea(viewCell) / GetViewSpaceBox().SurfaceArea();
+        else
+                return GetVolume(viewCell) / GetViewSpaceBox().GetVolume();
+}
+
+
 
 
@@ -1810 +1799 @@
                         AxisAlignedBox3 box = mKdTree->GetBox(leaf);
                         exporter->ExportBox(box);
-
-                        Debug << i << ": pvs size=" << (int)vc->GetPvs().GetSize()
-                                << ", piercing rays=" << (int)vcRays.size() << endl;
 
                         // export rays piercing this view cell
@@ -1995 +1981 @@
 float VspKdViewCellsManager::GetProbability(ViewCell *viewCell)
 {
-        // volume or area substitutes for view point probability
-#if 0
-        return GetArea(viewCell) / GetViewSpaceBox().SurfaceArea();
-#else
-        return GetArea(viewCell) / GetAccVcArea();
-#endif
-}
-
-
-float VspKdViewCellsManager::GetRendercost(ViewCell *viewCell, float objRendercost) const
-{
-        return viewCell->GetPvs().GetSize() * objRendercost;
-}
+        // compute view cell area / volume as subsititute for probability
+        if (0)
+                return GetArea(viewCell) / GetViewSpaceBox().SurfaceArea();
+        else
+                return GetVolume(viewCell) / GetViewSpaceBox().GetVolume();
+}
+
+
 
 
@@ -2144 +2125 @@
                 VspKdViewCell *vc = dynamic_cast<VspKdViewCell *>(mViewCells[idx]);
 
-                cout << "Output view cell " << i << " with pvs size " << vc->GetPvs().GetSize() << endl;
-                Debug << "Output view cell " << i << " with pvs size " << vc->GetPvs().GetSize() << endl;
                 //-- export geometry
                 Material m;
@@ -2393 +2372 @@
 
 
-float VspBspViewCellsManager::GetRendercost(ViewCell *viewCell,
-                                                                                        float objRendercost) const
-{
-        return viewCell->GetPvs().GetSize() * objRendercost;
-}
-
 
 bool VspBspViewCellsManager::ViewCellsConstructed() const
@@ -2515 +2488 @@
 
         cout << "Computing remaining ray contributions ... ";
+
         // recast rest of rays
-        if (0)
-        ComputeSampleContributions(savedRays, true, false);
+        if (SAMPLE_AFTER_SUBDIVISION)
+                ComputeSampleContributions(savedRays, true, false);
         cout << "finished" << endl;
 
@@ -2697 +2671 @@
 
         VssRayContainer postProcessRays;
-        if(0)GetRaySets(rays, mPostProcessSamples, postProcessRays);
+
+        GetRaySets(rays, mPostProcessSamples, postProcessRays);
 
         Debug << "post processing using " << (int)postProcessRays.size() << " samples" << endl;
@@ -2718 +2693 @@
                 RefineViewCells(postProcessRays, objects);
 
-        
-        if (1)
-        {               
-                float totalCost, erc, var, dev, avg;
-                int totalpvs;
-
-                mViewCellsStats.Reset();
-
-        EvaluateRenderStatistics(totalCost, erc, dev, var, totalpvs, avg);
-                
-                Debug << "statistics after merge "  
-                          << " erc: " << erc 
-                          << " dev: " << dev
-                          << " totalpvs: " << totalpvs 
-                          << " avg: " << avg << endl;
-        }
-
         //-- render simulation after merge
-  cout << "\nevaluating bsp view cells render time before compress ... ";
-  dynamic_cast<RenderSimulator *>(mRenderer)->RenderScene();
-  SimulationStatistics ss;
-  dynamic_cast<RenderSimulator *>(mRenderer)->GetStatistics(ss);
+        cout << "\nevaluating bsp view cells render time before compress ... ";
+        dynamic_cast<RenderSimulator *>(mRenderer)->RenderScene();
+        SimulationStatistics ss;
+        dynamic_cast<RenderSimulator *>(mRenderer)->GetStatistics(ss);
   
-  cout << " finished" << endl;
-  cout << ss << endl;
-  Debug << ss << endl;
+
+        cout << " finished" << endl;
+        cout << ss << endl;
+        Debug << ss << endl;
 
 
@@ -2758 +2717 @@
                 pvsEntries = mViewCellsTree->GetNumPvsEntries(mViewCellsTree->GetRoot());
                 Debug << "number of entries after compress: " << pvsEntries << endl;
-        }
-
-
-        //-- export refined (shuffled) view cells
-        if (0)
-        {
-                cout << "exporting shuffled view cells ... ";
-
-                Exporter *exporter = Exporter::GetExporter("shuffled_view_cells.x3d");
-                if (exporter)
-                {
-                        if (1)
-                        {
-                                exporter->SetWireframe();
-                                exporter->ExportBox(mViewSpaceBox);
-                                exporter->SetFilled();
-                        }
-
-                        if (mExportGeometry)
-                        {
-                                exporter->ExportGeometry(objects);
-                        }
-
-                        ViewCellContainer::const_iterator vit, vit_end = mViewCells.end();
-
-                        Material vm, lm;
-
-                        for (vit = mViewCells.begin(); vit != mViewCells.end(); ++ vit)
-                        {
-                                ViewCell *vc = *vit;
-
-                                vm = RandomMaterial();
-
-                                lm = vm;
-
-                                vm.mDiffuseColor.r -= 0.45f;
-                                vm.mDiffuseColor.g -= 0.45f;
-                                vm.mDiffuseColor.b -= 0.45f;
-
-
-                                ViewCellContainer leaves;
-                                mViewCellsTree->CollectLeaves(vc, leaves);
-
-                                ViewCellContainer::const_iterator lit, lit_end = leaves.end();
-
-                                for (lit = leaves.begin(); lit != lit_end; ++ lit)
-                                {
-                                        BspLeaf *leaf = dynamic_cast<BspViewCell *>(*lit)->mLeaf;
-
-                                        if (leaf->Mailed())
-                                                exporter->SetForcedMaterial(lm);
-                                        else
-                                                exporter->SetForcedMaterial(vm);
-
-                                        BspNodeGeometry geom;
-                                        mVspBspTree->ConstructGeometry(leaf, geom);
-                                        exporter->ExportPolygons(geom.mPolys);
-                                }
-                        }
-
-                        delete exporter;
-                }
-
-
-                cout << "finished" << endl;
         }