Changeset 676 for GTP/trunk/Lib/Vis/Preprocessing/src/VspBspTree.cpp

Timestamp:

03/06/06 19:02:49 (18 years ago)

Author:

mattausch

Message:

 

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/VspBspTree.cpp (modified) (9 diffs)

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

@@ -121 +121 @@
         environment->GetBoolValue("VspBspTree.useBreathFirstSplits", mBreathFirstSplits);
 
+        environment->GetBoolValue("ViewCells.PostProcess.emptyViewCellsMergeAllowed", mEmptyViewCellsMergeAllowed);
+        
         char subdivisionStatsLog[100];
         environment->GetStringValue("VspBspTree.subdivisionStats", subdivisionStatsLog);
@@ -184 +186 @@
         mSplitCandidates = new vector<SortableEntry>;
 
+        Debug << "here3" << endl;
         Debug << endl;
 }
@@ -1011 +1014 @@
                                                                            splitPlane,
                                                                            mBox,
-                                                                           0.0000001f);
+                                                                           0.000000001f);
                                                                            //mEpsilon);
                 
@@ -1023 +1026 @@
                         frontData.mProbability = frontData.mGeometry->GetVolume();
                         backData.mProbability = tData.mProbability - frontData.mProbability;
+
+                        if (frontData.mProbability < -0.00001)
+                                Debug << "here2 error: " << frontData.mProbability << endl;
+                        if (backData.mProbability < -0.00001)
+                                Debug << "here2 error: " << backData.mProbability << endl;
+
                         // clamp because of precision issues
-                        if (frontData.mProbability < 0) frontData.mProbability = 0;
-                        if (backData.mProbability < 0) backData.mProbability = 0;
+                        if (0)
+                        {
+                                if (frontData.mProbability < 0) frontData.mProbability = 0;
+                                if (backData.mProbability < 0) backData.mProbability = 0;
+                        }
                 }
         }
@@ -1692 +1704 @@
                                                                   candidatePlane,
                                                                   mBox,
-                                                                  0.0000001f);
+                                                                  0.000000001f);
                                                                   //mEpsilon);
 
@@ -1700 +1712 @@
                 pBack = pOverall - pFront;
 
+                if ((pFront < 0.001) || (pBack < 0.001))
+                {
+                        Debug << "vol f " << pFront << " b " << pBack << " p " << pOverall << endl;
+                        Debug << "real vol f " << pFront << " b " << geomBack.GetVolume() << " p " << pOverall << endl;
+                        Debug << "polys f" << (int)geomFront.mPolys.size() << " b " << (int)geomFront.mPolys.size() << " data " << (int)data.mGeometry->mPolys.size() << endl;
+                }
+
                 // clamp because of possible precision issues
-                if (pFront < 0) pFront = 0;
-                if (pBack < 0) pBack = 0;
+                if (0)
+                {
+                        if (pFront < 0) pFront = 0;
+                        if (pBack < 0) pBack = 0;
+                }
         }
         else
@@ -1785 +1807 @@
                                                                   candidatePlane,
                                                                   mBox,
-
-                                                                  mEpsilon);
+                                                                  0.0000001f);
+                                                                  //mEpsilon);
 
         pOverall = data.mProbability;
@@ -1796 +1818 @@
                 
                 // clamp because of possible precision issues
-                if (pFront < 0) pFront = 0;
-                if (pBack < 0) pBack = 0;
+                if (1)
+                {
+                        if (pFront <= 0)
+                        {
+                                //Debug << "error f: " << pFront << endl;
+                                return 999;
+                        }
+
+                        if (pBack <= 0) 
+                        {
+                                //Debug << "error b: " << pBack << endl;
+                                return 999;
+                        }
+                }
         }
         else
@@ -3335 +3369 @@
                         {
                                 MergeCandidate mc(leaf->GetViewCell(), (*nit)->GetViewCell());
-                                candidates.push_back(mc);
+
+                                // dont't merge view cells if they are empty and not front and back leaf of the same parent
+                                // in the tree?
+                                if (mEmptyViewCellsMergeAllowed ||
+                                        (!leaf->GetViewCell()->GetPvs().Empty() && ! (*nit)->GetViewCell()->GetPvs().Empty()) ||
+                    leaf->IsSibling(*nit))
+                                {
+                                        candidates.push_back(mc);
+                                }
 
                                 ++ numCandidates;