Changeset 719 for GTP/trunk/Lib

Timestamp:

03/27/06 18:56:45 (19 years ago)

Author:

mattausch

Message:

updating view cell hierarchy before pvs statistics

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• ViewCell.cpp (modified) (1 diff)
• ViewCellBsp.cpp (modified) (9 diffs)
• ViewCellsManager.cpp (modified) (13 diffs)
• ViewCellsManager.h (modified) (2 diffs)
• VspBspTree.cpp (modified) (4 diffs)

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

@@ -1566 +1566 @@
         if (!mIsCompressed)
                 return vc->GetPvs().GetSize();
+
+
+        ////////////////////////777
+        //-- compressed pvs
 
         int pvsSize = 0;

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

@@ -44 +44 @@
 
 
-/****************************************************************/
-/*                  class BspNode implementation                */
-/****************************************************************/
+/******************************************************************/
+/*                  class BspNode implementation                  */
+/******************************************************************/
 
 
@@ -2086 +2086 @@
         stack<BspRayTraversalData> tStack;
 
-        float mint = 0.0f, maxt = 1.0f;
+                float mint = 0.0f, maxt = 1.0f;
 
         Intersectable::NewMail();
@@ -2097 +2097 @@
         BspNode *farChild = NULL;
 
+
         const float thresh = 1 ? 1e-6f : 0.0f;
 
@@ -2104 +2105 @@
                 {
                         BspInterior *in = dynamic_cast<BspInterior *>(node);
-                
+
                         Plane3 splitPlane = in->GetPlane();
                         
@@ -2113 +2114 @@
                         {
                                 node = in->GetBack();
-                
-                                if(extSide <= 0) // plane does not split ray => no far child
+                                
+                                // plane does not split ray => no far child
+                                if (extSide <= 0) 
                                         continue;
-                
+  
                                 farChild = in->GetFront(); // plane splits ray
-                
                         } 
-                        else if (entSide > 0) 
+                        else if (entSide > 0)
                         {
                                 node = in->GetFront();
-                        
+
                                 if (extSide >= 0) // plane does not split ray => no far child
                                         continue;
-                        
-                                farChild = in->GetBack(); // plane splits ray                   
+
+                                farChild = in->GetBack(); // plane splits ray
                         }
-                        else // ray and plane are coincident
-                        {
-                                // NOTE: what to do if ray is coincident with plane?
+                        else // one of the ray end points is on the plane
+                        {       // NOTE: what to do if ray is coincident with plane?
                                 if (extSide < 0)
                                         node = in->GetBack();
                                 else //if (extSide > 0)
                                         node = in->GetFront();
-                                //else break;
+                                //else break; // coincident => count no intersections
 
                                 continue; // no far child
                         }
-                
+
                         // push data for far child
                         tStack.push(BspRayTraversalData(farChild, extp, maxt));
@@ -2177 +2177 @@
                 }
         }
+
         return hits;
 }
@@ -2319 +2320 @@
                 // split plane of node itself
                 n = n->GetParent();
-                
+
                 if (n)
                 {
@@ -2361 +2362 @@
         vector<Plane3> candidatePlanes;
 
+        vector<Plane3>::const_iterator pit, pit_end = halfSpaces.end();
+
         // bounded planes are added to the polygons
-        for (int i = 0; i < (int)halfSpaces.size(); ++ i)
-        {
-                Polygon3 *p = GetBoundingBox().CrossSection(halfSpaces[i]);
+        for (pit = halfSpaces.begin(); pit != pit_end; ++ pit)
+        {
+                Polygon3 *p = GetBoundingBox().CrossSection(*pit);
 
                 if (p->Valid(mEpsilon))
                 {
                         candidatePolys.push_back(p);
-                        candidatePlanes.push_back(halfSpaces[i]);
+                        candidatePlanes.push_back(*pit);
                 }
         }
@@ -2415 +2418 @@
                                         DEL_PTR(candidatePolys[i]);
 
-                                        if (frontPoly->Valid(mEpsilon))
-                                                candidatePolys[i] = frontPoly;
+                                        if (backPoly->Valid(mEpsilon))
+                                                candidatePolys[i] = backPoly;
                                         else
-                                                DEL_PTR(frontPoly);
-
-                                        DEL_PTR(backPoly);
+                                                DEL_PTR(backPoly);
+
+                                        // outside, don't need this
+                                        DEL_PTR(frontPoly);
                                         break;
                                 // polygon outside of halfspace

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

@@ -47 +47 @@
 mMaxPvsSize(9999999),
 mMinPvsSize(0), // one means only empty view cells are invalid
-mMaxPvsRatio(1.0)
+mMaxPvsRatio(1.0),
+mViewCellPvsIsUpdated(false)
 {
         mViewSpaceBox.Initialize();
@@ -558 +559 @@
         // find empty view cells bug
         if (TEST_EMPTY_VIEW_CELLS)
+        {
                 TestEmptyViewCells(preprocessor->mObjects);
+        }
 }
 
@@ -1131 +1134 @@
 
 
+void ViewCellsManager::UpdatePvs()
+{
+        if (mViewCellPvsIsUpdated)
+                return;
+
+        mViewCellPvsIsUpdated = true;
+
+        ViewCellContainer leaves;
+        mViewCellsTree->CollectLeaves(mViewCellsTree->GetRoot(), leaves);
+
+        ViewCellContainer::const_iterator it, it_end = leaves.end();
+
+        for (it = leaves.begin(); it != it_end; ++ it)
+        {
+                mViewCellsTree->PropagatePvs(*it);
+        }
+}
+
+
 void ViewCellsManager::GetPvsStatistics(PvsStatistics &stat)
 {
-  ViewCellContainer::const_iterator it = mViewCells.begin();
-  stat.viewcells = 0;
-  stat.minPvs = 100000000;
-  stat.maxPvs = 0;
-  stat.avgPvs = 0.0f;
-
-  for (; it != mViewCells.end(); ++it) {
-        ViewCell *viewcell = *it;
-        int pvsSize = viewcell->GetPvs().GetSize();
-        if ( pvsSize < stat.minPvs)
-          stat.minPvs = pvsSize;
-        if (pvsSize > stat.maxPvs)
-          stat.maxPvs = pvsSize;
-        stat.avgPvs += pvsSize;
-        stat.viewcells++;
-  }
-  if (stat.viewcells)
-        stat.avgPvs/=stat.viewcells;
+        // update pvs of view cells tree if necessary
+        UpdatePvs();
+
+        ViewCellContainer::const_iterator it = mViewCells.begin();
+
+        stat.viewcells = 0;
+        stat.minPvs = 100000000;
+        stat.maxPvs = 0;
+        stat.avgPvs = 0.0f;
+
+        for (; it != mViewCells.end(); ++ it) 
+        {
+                ViewCell *viewcell = *it;
+                
+                const int pvsSize = mViewCellsTree->GetPvsSize(viewcell);
+                
+                if (pvsSize < stat.minPvs)
+                        stat.minPvs = pvsSize;
+                if (pvsSize > stat.maxPvs)
+                        stat.maxPvs = pvsSize;
+                stat.avgPvs += pvsSize;
+                
+                ++ stat.viewcells;
+        }
+
+        if (stat.viewcells)
+                stat.avgPvs/=stat.viewcells;
 }
 
@@ -1571 +1602 @@
                 ComputeSampleContributions(savedRays, true, false);
 
+        // real meshes are contructed at this stage
+        if (0)
+        {
+                cout << "finalizing view cells ... ";
+                FinalizeViewCells(true);
+                cout << "finished" << endl;     
+        }
+
         return sampleContributions;
 }
@@ -1732 +1771 @@
         mColorCode = savedColorCode;
 
-        FinalizeViewCells(true);
-        
+        // compute final meshes and volume / area
+        if (1) FinalizeViewCells(true);
+
         // write view cells to disc
         if (mExportViewCells)
@@ -2113 +2153 @@
                 mBspTree->ConstructGeometry(leaf, geom);
 
-                float lVol = geom.GetVolume();
-                float lArea = geom.GetArea();
+                const float lVol = geom.GetVolume();
+                const float lArea = geom.GetArea();
 
                 //(*it)->SetVolume(vol);
@@ -3062 +3102 @@
         cout << "construction finished" << endl;
 
+        // real meshes are contructed at this stage
+        if (0)
+        {
+                cout << "finalizing view cells ... ";
+                FinalizeViewCells(true);
+                cout << "finished" << endl;
+        }
+
         return sampleContributions;
 }
@@ -3296 +3344 @@
         // should maybe be done here to allow merge working with area or volume
         // and to correct the rendering statistics
-        if (0)
-        {
-                FinalizeViewCells(false);
-        }
-
+        if (0) FinalizeViewCells(false);
+        
         
         //-- merge the individual view cells
@@ -3312 +3357 @@
                 RefineViewCells(postProcessRays, objects);
 
-
+        
         //-- render simulation after merge + refine
         
@@ -3347 +3392 @@
         ResetViewCells();
 
-        // real meshes are only contructed only at this stage
-        FinalizeViewCells(true);
+        // compute final meshes and volume / area
+        if (1) FinalizeViewCells(true);
+
 
         // write view cells to disc
@@ -3967 +4013 @@
                 vm->mMaxPvsSize = (int)objects->size();
 
+                // create the meshes and compute volumes
                 vm->FinalizeViewCells(true);
 
@@ -3977 +4024 @@
                 DEL_PTR(vm);
         }
-
 
         return vm;
@@ -4061 +4107 @@
                 mVspBspTree->ConstructGeometry(leaf, geom);
 
-                float lVol = geom.GetVolume();
-                float lArea = geom.GetArea();
+                const float lVol = geom.GetVolume();
+                const float lArea = geom.GetArea();
 
                 //(*it)->SetVolume(vol);

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

@@ -267 +267 @@
         virtual void PrintPvsStatistics(ostream &s);
 
+        /** Updates pvs of the view cell hierarchy if necessary.
+        */
+        void UpdatePvs();
+
         /** Returns probability that view point lies in one view cell.
         */
@@ -529 +533 @@
         bool mPruneEmptyViewCells;
 
+        bool mViewCellPvsIsUpdated;
         /// maximum number of samples taken for construction of the view cells
         int mConstructionSamples;

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

@@ -2641 +2641 @@
         vector<Plane3> candidatePlanes;
 
+        vector<Plane3>::const_iterator pit, pit_end = halfSpaces.end();
+
         // bounded planes are added to the polygons
-        for (int i = 0; i < (int)halfSpaces.size(); ++ i)
-        {
-                Polygon3 *p = GetBoundingBox().CrossSection(halfSpaces[i]);
+        for (pit = halfSpaces.begin(); pit != pit_end; ++ pit)
+        {
+                Polygon3 *p = GetBoundingBox().CrossSection(*pit);
 
                 if (p->Valid(mEpsilon))
                 {
                         candidatePolys.push_back(p);
-                        candidatePlanes.push_back(halfSpaces[i]);
+                        candidatePlanes.push_back(*pit);
                 }
         }
@@ -3137 +3139 @@
 {
         int hits = 0;
-        stack<BspRayTraversalData> tQueue;
+        stack<BspRayTraversalData> tStack;
 
         float mint = 0.0f, maxt = 1.0f;
@@ -3195 +3197 @@
 
                         // push data for far child
-                        tQueue.push(BspRayTraversalData(farChild, extp));
+                        tStack.push(BspRayTraversalData(farChild, extp));
 
                         // find intersection of ray segment with plane
@@ -3219 +3221 @@
 
                         //-- fetch the next far child from the stack
-                        if (tQueue.empty())
+                        if (tStack.empty())
                                 break;
 
                         entp = extp;
                         
-                        BspRayTraversalData &s = tQueue.top();
+                        const BspRayTraversalData &s = tStack.top();
 
                         node = s.mNode;
                         extp = s.mExitPoint;
 
-                        tQueue.pop();
+                        tStack.pop();
                 }
         }