Changeset 375 for trunk/VUT/GtpVisibilityPreprocessor/src/SamplingPreprocessor.cpp

Timestamp:

11/03/05 18:49:59 (19 years ago)

Author:

mattausch

Message:

added bsp view cells statistics

File:

• trunk/VUT/GtpVisibilityPreprocessor/src/SamplingPreprocessor.cpp (modified) (12 diffs)

trunk/VUT/GtpVisibilityPreprocessor/src/SamplingPreprocessor.cpp

@@ -514 +514 @@
                                  << "k   #SampleContributions=" << passSampleContributions << " (" 
                                  << 100*passContributingSamples/(float)passSamples<<"%)" << " avgPVS="
-                                 << pvsSize/(float)objects.size() << endl 
+                                 << pvsSize /(float)objects.size() << endl 
                                  << "avg ray contrib=" << avgRayContrib << endl
                                  << "reverse samples [%]" << reverseSamples/(float)passSamples*100.0f << endl;
@@ -531 +531 @@
                 cout << "#totalPvsSize=" << mKdTree->CollectLeafPvs() << endl;
   
+        //-- post processing of bsp view cells
         if (mBspTree)
         {
+                int vcSize = 0;
+                int pvsSize = 0;
+
+                BspViewCellsStatistics stat;
+                
+                Debug << "overall scene size: " << objects.size() << endl;
+                mBspTree->EvaluateViewCellsStats(stat);
+                
+                Debug << "original view cell partition:\n" << stat << endl;
+                
                 cout << "starting post processing using " << mSampleRays.size() << " samples ... ";
-
-                Debug << "original pvs size: " << mBspTree->CountViewCellPvs() << endl;
-
-                // merge or subdivide view cells
+                
                 long startTime = GetTime();
                 int merged = PostprocessViewCells(mSampleRays);
@@ -545 +553 @@
                          << TimeDiff(startTime, GetTime()) *1e-3 << " secs" << endl;
 
+                cout << "evaluating render time heuristics ... ";
+
                 //-- recount pvs
-                Debug << "merged pvs size: " << mBspTree->CountViewCellPvs() << endl;
-
-
-                cout << "evaluating render time heuristics ... ";
+                mBspTree->EvaluateViewCellsStats(stat);
+                
+                Debug << "after post processing:\n" << stat << endl;
+
                 Real rt = SimulateRendering();
                 cout << "finished" << endl;
@@ -591 +601 @@
 
                 // export the bsp splits
+                cout << "exporting splits ... ";
                 if (exportSplits)
                         ExportSplits(objects);
-                
+                cout << "finished" << endl;
+
                 ExportBspPvs(objects);
         }
@@ -686 +698 @@
 {
         int merged = 0;
+
         RayContainer::const_iterator rit, rit_end = rays.end();
         vector<Ray::BspIntersection>::const_iterator iit;
@@ -708 +721 @@
                         {                       
                                 mBspTree->MergeViewCells(leaf, previousLeaf);
+
                                 ++ merged;
                         }
@@ -723 +737 @@
         if (exporter) 
         {       
-                cout << "exporting splits ... ";
-
                 Material m; 
                 m.mDiffuseColor = RgbColor(1, 0, 0);
@@ -769 +781 @@
 
                 delete exporter;
-
-                cout << "finished" << endl;
         }
 }
@@ -787 +797 @@
         const int raysOut = min((int)mSampleRays.size(), 20000);
 
-        // check whether we can add the current ray to the output rays
-        for (int k = 0; k < raysOut; ++ k) 
+        ViewCell::NewMail();
+
+        for (int i = 0; i < bspLeaves.size(); ++ i)
         {
-                Ray *ray = mSampleRays[k];
-
-                for (int j = 0; j < (int)ray->bspIntersections.size(); ++ j)
-                {
-                        BspLeaf *leaf = ray->bspIntersections[j].mLeaf;
-
-                        for (int i = 0; i < (int)bspLeaves.size(); ++ i)
+                cout << "creating output for view cell " << i << " ... ";
+                // check whether we can add the current ray to the output rays
+                for (int k = 0; k < raysOut; ++ k) 
+                {
+                        Ray *ray = mSampleRays[k];
+
+                        for     (int j = 0; j < (int)ray->bspIntersections.size(); ++ j)
                         {
+                                BspLeaf *leaf = ray->bspIntersections[j].mLeaf;
+
                                 if (bspLeaves[i]->GetViewCell() == leaf->GetViewCell()) 
                                 {
@@ -804 +817 @@
                         }
                 }
-        }
-
-        ViewCell::NewMail();
-
-        for (int i = 0; i < bspLeaves.size(); ++ i)
-        {
+
                 Intersectable::NewMail();
 
@@ -883 +891 @@
                 }
                 DEL_PTR(exporter);
+                cout << "finished" << endl;
         }
 
         if (1) // export view cells and leaves
         {
+                cout << "exporting view cells and leaves ... ";
                 Exporter *exporter = Exporter::GetExporter("viewCells.x3d");
                 if (exporter)
@@ -901 +911 @@
                         delete exporter;
                 }
+                cout << "finished" << endl;
         }