Changeset 375 for trunk/VUT/GtpVisibilityPreprocessor

Timestamp:

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

Author:

mattausch

Message:

added bsp view cells statistics

Location:

trunk/VUT/GtpVisibilityPreprocessor

Files:

• scripts/Preprocessor.vcproj (modified) (2 diffs)
• scripts/default.env (modified) (1 diff)
• src/Polygon3.cpp (modified) (1 diff)
• src/Polygon3.h (modified) (1 diff)
• src/SamplingPreprocessor.cpp (modified) (12 diffs)
• src/ViewCellBsp.cpp (modified) (10 diffs)
• src/ViewCellBsp.h (modified) (5 diffs)

trunk/VUT/GtpVisibilityPreprocessor/scripts/Preprocessor.vcproj

@@ -255 +255 @@
                         </File>
                         <File
+                                RelativePath="..\src\Statistics.h">
+                        </File>
+                        <File
                                 RelativePath="..\src\Triangle3.cpp">
                         </File>
@@ -286 +289 @@
                         <File
                                 RelativePath="..\src\VisibilityVector3.h">
+                        </File>
+                        <File
+                                RelativePath="..\src\VssPreprocessor.cpp">
+                        </File>
+                        <File
+                                RelativePath="..\src\VssPreprocessor.h">
+                        </File>
+                        <File
+                                RelativePath="..\src\VssRay.cpp">
+                        </File>
+                        <File
+                                RelativePath="..\src\VssRay.h">
+                        </File>
+                        <File
+                                RelativePath="..\src\VssTree.cpp">
+                        </File>
+                        <File
+                                RelativePath="..\src\VssTree.h">
                         </File>
                         <File

trunk/VUT/GtpVisibilityPreprocessor/scripts/default.env

@@ -68 +68 @@
         maxViewCells 0
         
-        minPvsDif 100
+        minPvsDif 1000
 #       maxPvsSize 200
         

trunk/VUT/GtpVisibilityPreprocessor/src/Polygon3.cpp

@@ -414 +414 @@
 }
 
-int Polygon3::CountIntersectables(const PolygonContainer &polys)
+int Polygon3::ParentObjectsSize(const PolygonContainer &polys)
 {
         int count = 0;

trunk/VUT/GtpVisibilityPreprocessor/src/Polygon3.h

@@ -122 +122 @@
         /** Counts the number of different intersectables associated with the polygons.
         */
-        static int CountIntersectables(const PolygonContainer &polys);
+        static int ParentObjectsSize(const PolygonContainer &polys);
 };
 

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;
         }
 

trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellBsp.cpp

@@ -343 +343 @@
 }
 
+void BspViewCellsStatistics::Print(ostream &app) const
+{
+        app << "===== BspViewCells statistics ===============\n";
+
+        app << setprecision(4);
+
+        app << "#N_PMAXPVS ( largest PVS )\n" << maxPvs << endl;
+
+        app << "#N_PMINPVS ( smallest PVS )\n" << minPvs << endl;
+
+        app << "#N_PAVGPVS ( average PVS )\n" << AvgPvs() << endl;
+
+        app << "#N_PEMPTYPVS ( view cells with PVS smaller 2 )\n" << emptyPvs << endl;
+
+        app << "#N_VIEWCELLS ( number of view cells)\n" << viewCells << endl;
+
+        app << "#N_AVGBSPLEAVES (average number of BSP leaves per view cell )\n" << AvgBspLeaves() << endl;
+
+        app << "#N_MAXBSPLEAVES ( maximal number of BSP leaves per view cell )\n" << maxBspLeaves << endl;
+        
+        app << "===== END OF BspViewCells statistics ==========\n";
+}
+
 void BspTreeStatistics::Print(ostream &app) const
 {
@@ -368 +391 @@
         app << "#N_INPUT_POLYGONS (number of input polygons )\n" <<     polys << endl;
 
-        app << "#N_PVS: " << pvs << endl;
+        //app << "#N_PVS: " << pvs << endl;
 
         app << "#N_ROUTPUT_INPUT_POLYGONS ( ratio polygons after subdivision / input polygons )\n" <<
@@ -375 +398 @@
         app << "===== END OF BspTree statistics ==========\n";
 }
+
 
 BspTree::~BspTree()
@@ -1044 +1068 @@
                 ((int)rays.size() > sTermMaxRaysForAxisAligned) &&
                 ((sTermMaxObjectsForAxisAligned < 0) || 
-                  (Polygon3::CountIntersectables(polys) > sTermMaxObjectsForAxisAligned)))
+                  (Polygon3::ParentObjectsSize(polys) > sTermMaxObjectsForAxisAligned)))
         {
                 Plane3 plane;
@@ -1529 +1553 @@
         if (data.mDepth >= sTermMaxDepth)
                 ++ mStat.maxDepthNodes;
+        
         // store maximal and minimal depth
         if (data.mDepth > mStat.maxDepth)
                 mStat.maxDepth = data.mDepth;
+
         if (data.mDepth < mStat.minDepth)
                 mStat.minDepth = data.mDepth;
@@ -1537 +1563 @@
         // accumulate depth to compute average
         mStat.accumDepth += data.mDepth;
-
-        if (leaf->mViewCell != mRootCell)
-        {       
-                ++ mStat.viewCells;
-                mStat.pvs += leaf->mViewCell->GetPvs().GetSize();
-        }
         
 #ifdef _DEBUG
@@ -1695 +1715 @@
 }
 
-int BspTree::CountViewCellPvs() const
-{
-        int count = 0;
+void BspTree::EvaluateViewCellsStats(BspViewCellsStatistics &stat) const
+{
+        stat.Reset();
+
         stack<BspNode *> nodeStack;
         nodeStack.push(mRoot);
@@ -1713 +1734 @@
                 if (node->IsLeaf()) 
                 {
-                        ViewCell *viewCell = dynamic_cast<BspLeaf *>(node)->mViewCell;
+                        ++ stat.bspLeaves;
+
+                        BspViewCell *viewCell = dynamic_cast<BspLeaf *>(node)->mViewCell;
 
                         if (!viewCell->Mailed()) 
                         {
                                 viewCell->Mail();
-                                count += viewCell->GetPvs().GetSize();
+                                
+                                ++ stat.viewCells;
+                                int pvsSize = viewCell->GetPvs().GetSize();
+
+                stat.pvs += pvsSize;
+
+                                if (pvsSize < 2)
+                                        ++ stat.emptyPvs;
+
+                                if (pvsSize > stat.maxPvs)
+                                        stat.maxPvs = pvsSize;
+
+                                if (pvsSize < stat.minPvs)
+                                        stat.minPvs = pvsSize;
+
+                                if ((int)viewCell->mBspLeaves.size() > stat.maxBspLeaves)
+                                        stat.maxBspLeaves = (int)viewCell->mBspLeaves.size();           
                         }
                 }
@@ -1729 +1768 @@
                 }
         }
-        return count;
 }
 
@@ -2308 +2346 @@
                 Ray *ray = (*rit)->mRay;
                 
-                for (iit = ray->bspIntersections.begin(); iit != ray->bspIntersections.end(); ++ iit)
+                for (iit = ray->bspIntersections.begin(); 
+                         iit != ray->bspIntersections.end(); ++ iit)
                 {
                         BspViewCell *vc = (*iit).mLeaf->mViewCell;

trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellBsp.h

@@ -68 +68 @@
   // number of initial polygons
   int polys;
-  /// number of view cells different to the view cell representing unbounded space.
-  int viewCells;
-  /// size of the VPS
-  int pvs;
   /// samples contributing to pvs
   int contributingSamples;
    /// sample contributions to pvs
   int sampleContributions;
+  /// largest pvs
+  int largestPvs;
 
   // Constructor
@@ -97 +95 @@
           polys = 0;
           accumDepth = 0;
-          viewCells = 0;
-          pvs = 0;
+                
           contributingSamples = 0;
           sampleContributions = 0;
@@ -107 +104 @@
 
   friend ostream &operator<<(ostream &s, const BspTreeStatistics &stat) {
+    stat.Print(s);
+    return s;
+  }
+  
+};
+
+class BspViewCellsStatistics
+{
+public:
+  
+  /// number of view cells
+  int viewCells;
+
+  /// size of the PVS
+  int pvs;
+  
+  /// largest PVS of all view cells
+  int maxPvs;
+
+  /// smallest PVS of all view cells
+  int minPvs;
+
+  /// view cells with empty PVS
+  int emptyPvs;
+
+  /// number of bsp leaves covering the view space
+  int bspLeaves;
+
+  /// largest number of leaves covered by one view cell
+  int maxBspLeaves;
+
+  
+  // Constructor
+  BspViewCellsStatistics() 
+  {
+          Reset();
+  }
+
+  double AvgBspLeaves() const {return (double)bspLeaves / (double)viewCells;};
+  double AvgPvs() const {return (double)pvs / (double)viewCells;};
+  
+  
+  void Reset() 
+  {
+          viewCells = 0;
+          pvs = 0;
+          maxPvs = 0;
+          minPvs = 999999;
+          emptyPvs = 0;
+          bspLeaves = 0;
+          maxBspLeaves = 0;
+  }
+
+  void
+  Print(ostream &app) const;
+
+  friend ostream &operator<<(ostream &s, const BspViewCellsStatistics &stat) {
     stat.Print(s);
     return s;
@@ -422 +476 @@
         bool MergeViewCells(BspLeaf *front, BspLeaf *back) const;
 
-        /** Traverses tree and counts PVS size of all view cells
-        */
-        int CountViewCellPvs() const;
+        /** Traverses tree and counts all view cells as well as their PVS size.
+        */
+        void EvaluateViewCellsStats(BspViewCellsStatistics &stat) const;
 
 protected:
@@ -667 +721 @@
         BspNode *mRoot;
 
-        /// Pointer to the root cell of the viewspace
-        // ViewCell *mRootCell;
                 
         BspTreeStatistics mStat;