Changeset 646

Timestamp:

02/16/06 10:30:24 (18 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/Preprocessing

Files:

• scripts/default.env (modified) (1 diff)
• src/ViewCellBsp.cpp (modified) (6 diffs)
• src/ViewCellBsp.h (modified) (2 diffs)

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

@@ -414 +414 @@
         Termination {
                 # parameters used for autopartition
-                minRays 10
-                minPolygons -1
+                minRays -1
+                minPolygons 1
                 maxDepth 30
                 minPvs -1
-                minProbability 0.001
+                minProbability 0.00001
                 maxRayContribution 9999
-                maxViewCells    1000
+                maxViewCells    5000
 
                 # used for pvs criterium

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

@@ -331 +331 @@
                         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;
@@ -984 +987 @@
                 Debug << "cost ratio: " << (cFront + cBack) / cData << endl;
 
-                if ((cFront + cBack) / cData > 1)
+                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();
@@ -1073 +1088 @@
         
         
-#ifdef _DEBUG
+//#ifdef _DEBUG
         Debug << interior << endl;
-#endif
+        Debug << interior->GetPlane() << endl;
+//#endif
         
 
@@ -1103 +1119 @@
                                                                            interior->mPlane,
                                                                            mBox,
-                                                                           0.000000000001);
-                                                                           //mEpsilon);
+                                                                           //0.000000000001);
+                                                                           mEpsilon);
         
                 
@@ -1298 +1314 @@
 Plane3 BspTree::SelectPlane(BspLeaf *leaf, BspTraversalData &data)
 {
-        if (data.mPolygons->empty() && data.mRays->empty())
+        if ((!mMaxPolyCandidates || data.mPolygons->empty()) && 
+                (!mMaxRayCandidates || data.mRays->empty()))
         {
                 Debug << "Warning: No autopartition polygon candidate available\n";
@@ -1489 +1506 @@
         Debug << "plane lowest cost: " << lowestCost << endl;
 #endif
+        Debug << "choosen plane: " << bestPlane << endl;
 
         return bestPlane;

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

@@ -72 +72 @@
         */
         PolygonContainer mPolys;
+
+        friend ostream &operator<<(ostream &s, const BspNodeGeometry &a)
+        {
+                PolygonContainer::const_iterator it, it_end = a.mPolys.end();
+
+                for (it = a.mPolys.begin(); it != it_end; ++ it)
+                        s << *(*it) << endl;
+                return s << endl;
+        }
+
 };
 
@@ -275 +285 @@
 /** BSP interior node implementation 
 */
-class BspInterior : public BspNode 
+class BspInterior: public BspNode 
 {
         friend class BspTree;