Changeset 648 for GTP

Timestamp:

02/16/06 16:21:26 (19 years ago)

Author:

mattausch

Message:

removed problems with bsp due to polygons equal to scene box faces. removing
this polyogns in a preprocessing step. also using this for vsp bsp tree, because it
is generally a good thing.

Location:

GTP/trunk

Files:

• App/Demos/Vis/HillyTerrain/OGRE/TestCullingTerrainApplication.cpp (modified) (1 diff)
• Lib/Vis/Preprocessing/scripts/default.env (modified) (4 diffs)
• Lib/Vis/Preprocessing/src/Polygon3.cpp (modified) (1 diff)
• Lib/Vis/Preprocessing/src/ViewCell.cpp (modified) (1 diff)
• Lib/Vis/Preprocessing/src/ViewCellBsp.cpp (modified) (10 diffs)
• Lib/Vis/Preprocessing/src/ViewCellBsp.h (modified) (1 diff)
• Lib/Vis/Preprocessing/src/VspBspTree.cpp (modified) (3 diffs)
• Lib/Vis/Preprocessing/src/VspBspTree.h (modified) (1 diff)

GTP/trunk/App/Demos/Vis/HillyTerrain/OGRE/TestCullingTerrainApplication.cpp

@@ -282 +282 @@
 
         // Use 512x512 texture in GL since we can't go higher than the window res
-        mSceneMgr->setShadowTextureSettings(512, 2);
+        mSceneMgr->setShadowTextureSettings(1024, 2);
 
         mSceneMgr->setShadowColour(ColourValue(0.5, 0.5, 0.5));

GTP/trunk/Lib/Vis/Preprocessing/scripts/default.env

@@ -25 +25 @@
         type vss
 #       type rss
-        detectEmptyViewSpace false
+        detectEmptyViewSpace true
 }
 
@@ -331 +331 @@
                 missTolerance           6
                 
-                maxViewCells            50000
+                maxViewCells            10000
                 
                 # used for pvs criterium
@@ -354 +354 @@
 BspTree {
         Construction {
-                samples 50000
+                samples 500000
                 epsilon 0.005
         }
@@ -420 +420 @@
                 minProbability 0.00001
                 maxRayContribution 9999
-                maxViewCells    5000
+                maxViewCells    10000
 
                 # used for pvs criterium

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

@@ -224 +224 @@
 
         //TODO: remove for performance
-#if 1
+#if 0
         if (1)
         {

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

@@ -512 +512 @@
 
         //-- use priority queue to merge leaf pairs
-// HACK
 
         //const float maxAvgCost = 350;

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

@@ -318 +318 @@
         Debug << "splitting polygons of node " << this << " with plane " << mPlane << endl;
 #endif
+
         PolygonContainer::const_iterator it, it_end = polys.end();
 
@@ -331 +332 @@
                         case Polygon3::COINCIDENT:
                                 coincident.push_back(poly);
-                                Debug << "!!!Coincident: " << poly->GetSupportingPlane() << endl;
                                 break;                  
                         case Polygon3::FRONT_SIDE:      
                                 frontPolys.push_back(poly);
-                                Debug << "!!!front: " << poly->GetSupportingPlane() << endl;
                                 break;
                         case Polygon3::BACK_SIDE:
-                                Debug << "!!!back: " << poly->GetSupportingPlane() << endl;
                                 backPolys.push_back(poly);
                                 break;
@@ -710 +708 @@
         // preprocess: throw out polygons coincident to the view space box (not needed)
         PolygonContainer boxPolys;
-        mBox.ExtractPolygons(boxPolys);
+        mBox.ExtractPolys(boxPolys);
         vector<Plane3> boxPlanes;
-        PolygonContainer::const_iterator pit, pit_end = polys->end();
-
-        for (pit = polys->begin(); pit != pit_end; ++ pit)
-        {
-                
-        }
-}
+
+        PolygonContainer::iterator pit, pit_end = boxPolys.end();
+
+        // extract planes of box
+        // TODO: can be done more elegantly than first extracting polygons
+        // and take their planes
+        for (pit = boxPolys.begin(); pit != pit_end; ++ pit)
+        {
+                boxPlanes.push_back((*pit)->GetSupportingPlane());
+        }
+
+        pit_end = polys.end();
+
+        for (pit = polys.begin(); pit != pit_end; ++ pit)
+        {
+                vector<Plane3>::const_iterator bit, bit_end = boxPlanes.end();
+                
+                for (bit = boxPlanes.begin(); (bit != bit_end) && (*pit); ++ bit)
+                {
+                        const int cf = (*pit)->ClassifyPlane(*bit, mEpsilon);
+
+                        if (cf == Polygon3::COINCIDENT)
+                        {
+                                DEL_PTR(*pit);
+                                //Debug << "coincident!!" << endl;
+                        }
+                }
+        }
+
+        // remove deleted entries
+        for (int i = 0; i < (int)polys.size(); ++ i)
+        {
+                while (!polys[i] && (i < (int)polys.size()))
+                {
+                        swap(polys[i], polys.back());
+                        polys.pop_back();
+                }
+        }
+}
+
+
 
 void BspTree::Construct(const RayContainer &sampleRays,
@@ -794 +826 @@
         }
 
-        PreprocessPolygons();
+        // throw out bad polygons
+        PreprocessPolygons(*polys);
 
         mStat.polys = (int)polys->size();
@@ -838 +871 @@
         }
 
+        PreprocessPolygons(*polys);
         Debug << "tree has " << (int)polys->size() << " polys, " << (int)sampleRays.size() << " rays" << endl;
         Construct(polys, rays);
@@ -991 +1025 @@
         {
                 int pvsData = tData.mPvs;
+
                 float cData = (float)pvsData * tData.mProbability;
-
                 float cFront = (float)tFrontData.mPvs * tFrontData.mProbability;
                 float cBack = (float)tBackData.mPvs * tBackData.mProbability;
-                
-                Debug << "front pvs: " << tFrontData.mPvs << " p: " << tFrontData.mProbability << endl;
-                Debug << "back pvs: " << tBackData.mPvs << " p: " << tBackData.mProbability << endl;
-                Debug << "pvs: " << pvsData << " p: " << tData.mProbability << endl;
-
-                Debug << "data: " << cData << " front: " << cFront << " back: " << cBack << endl;
-                Debug << "cost ratio: " << (cFront + cBack) / cData << endl;
-
-                if (((cFront + cBack) / cData > 1) || (tFrontData.mProbability == 0) || (tBackData.mProbability == 0))
-                {
-                        Debug << "ERROR!!" << endl;
-
-                        vector<Plane3> halfSpaces;
-                        ExtractHalfSpaces(interior, halfSpaces);
-        
-                        for (int i = 0; i < (int)halfSpaces.size(); ++ i)
-                                Debug << halfSpaces[i] << endl;
-
-                        Debug << "geom:\n" << *tData.mGeometry << endl;
-                        Debug << "fgeom:\n" << *tFrontData.mGeometry << endl;
-                        Debug << "bgeom:\n" << *tBackData.mGeometry << endl;
-                }
 
                 float costDecr = (cFront + cBack - cData) / mBox.GetVolume();
-
                 
                 mTotalCost += costDecr;
@@ -1104 +1115 @@
         
         
-//#ifdef _DEBUG
+#ifdef _DEBUG
         Debug << interior << endl;
-        Debug << interior->GetPlane() << endl;
-//#endif
+#endif
         
 
@@ -1148 +1158 @@
                         frontData.mProbability = frontData.mGeometry->GetVolume();
                         backData.mProbability = tData.mProbability - frontData.mProbability;
-
-                        Debug << "************" << endl;
-                        Debug << "plane: " << interior->mPlane << endl;
-                        Debug << "box: " << mBox << endl;
-                        Debug << "all: " << tData.mProbability << " f: " << frontData.mProbability << " b: " << backData.mProbability << endl;
-                        Debug << "real back: " << backData.mGeometry->GetVolume() << endl;
-                        Debug << "data geom: " << tData.mGeometry->mPolys.size() << " f: " << frontData.mGeometry->mPolys.size() << " b: " << backData.mGeometry->mPolys.size() << endl;
                 }
         }
@@ -1497 +1500 @@
                         SplitPlaneCost(poly->GetSupportingPlane(), data);
 
-                Debug << "supporting plane: " << poly->GetSupportingPlane() << endl;
-
                 if (candidateCost < lowestCost)
                 {
@@ -1522 +1523 @@
         Debug << "plane lowest cost: " << lowestCost << endl;
 #endif
-        Debug << "choosen plane: " << bestPlane << endl;
-
+        
         return bestPlane;
 }

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

@@ -876 +876 @@
                                   int &contributingSamples);
 
-
+        /** Preprocesses polygons and throws out all polygons which are coincident to
+                the view space box faces (they can be problematic).
+        */
         void PreprocessPolygons(PolygonContainer &polys);
 

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

@@ -332 +332 @@
                         AddMeshToPolygons(obj->GetMesh(), polys, obj);
                         ++ numObj;
+
                         //-- compute bounding box
                         if (!forcedBoundingBox)
@@ -381 +382 @@
         else 
                 mTermMinProbability *= mBox.GetVolume();
+
+        // throw out unnecessary polygons
+        PreprocessPolygons(polys);
 
         mBspStats.polys = (int)polys.size();
@@ -1994 +1998 @@
 
 
+void VspBspTree::PreprocessPolygons(PolygonContainer &polys)
+{
+        // preprocess: throw out polygons coincident to the view space box (not needed)
+        PolygonContainer boxPolys;
+        mBox.ExtractPolys(boxPolys);
+        vector<Plane3> boxPlanes;
+
+        PolygonContainer::iterator pit, pit_end = boxPolys.end();
+
+        // extract planes of box
+        // TODO: can be done more elegantly than first extracting polygons
+        // and take their planes
+        for (pit = boxPolys.begin(); pit != pit_end; ++ pit)
+        {
+                boxPlanes.push_back((*pit)->GetSupportingPlane());
+        }
+
+        pit_end = polys.end();
+
+        for (pit = polys.begin(); pit != pit_end; ++ pit)
+        {
+                vector<Plane3>::const_iterator bit, bit_end = boxPlanes.end();
+                
+                for (bit = boxPlanes.begin(); (bit != bit_end) && (*pit); ++ bit)
+                {
+                        const int cf = (*pit)->ClassifyPlane(*bit, mEpsilon);
+
+                        if (cf == Polygon3::COINCIDENT)
+                        {
+                                DEL_PTR(*pit);
+                                //Debug << "coincident!!" << endl;
+                        }
+                }
+        }
+
+        // remove deleted entries
+        for (int i = 0; i < (int)polys.size(); ++ i)
+        {
+                while (!polys[i] && (i < (int)polys.size()))
+                {
+                        swap(polys[i], polys.back());
+                        polys.pop_back();
+                }
+        }
+}
+
+
 float VspBspTree::AccumulatedRayLength(const RayInfoContainer &rays) const
 {

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

@@ -601 +601 @@
         int CollectMergeCandidates(const VssRayContainer &rays, vector<MergeCandidate> &candidates);
         
-        
+        /** Preprocesses polygons and throws out all polygons which are coincident to
+                the view space box faces (they can be problematic).
+        */
+        void PreprocessPolygons(PolygonContainer &polys);
         
         /** Propagates valid flag up the tree.