Changeset 711 for GTP/trunk/Lib/Vis/Preprocessing/src/ViewCellBsp.cpp

Timestamp:

03/20/06 16:55:40 (18 years ago)

Author:

mattausch

Message:

 

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/ViewCellBsp.cpp (modified) (5 diffs)

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

@@ -467 +467 @@
 }
 
+
 BspViewCell *BspTree::GetOrCreateOutOfBoundsCell()
 {
@@ -1706 +1707 @@
 
                 // construct child geometry with regard to the candidate split plane
-                BspNodeGeometry frontCell;
-                BspNodeGeometry backCell;
-
-                cell.SplitGeometry(frontCell, 
-                                                   backCell, 
-                                                   candidatePlane,
-                                                   mBox,
-                                                   mEpsilon);
+                BspNodeGeometry geomFront;
+                BspNodeGeometry geomBack;
+
+                const bool splitSuccessFull = 
+                        cell.SplitGeometry(geomFront, 
+                                                           geomBack, 
+                                                           candidatePlane,
+                                                           mBox,
+                                                           mEpsilon);
 
                 if (mUseAreaForPvs)
                 {
-                        pFront = frontCell.GetArea();
-                        pBack = backCell.GetArea();
+                        pFront = geomFront.GetArea();
+                        pBack = geomBack.GetArea();
                 }
                 else
                 {
-                        pFront = frontCell.GetVolume();
+                        pFront = geomFront.GetVolume();
                         pBack = pOverall - pFront;
                 }
                 
+                
+                // give penalty to unbalanced split
+                if (1 && 
+                        (!splitSuccessFull || (pFront <= 0) || (pBack <= 0) || 
+                        !geomFront.Valid() || !geomBack.Valid()))
+                {
+                        Debug << "error f: " << pFront << " b: " << pBack << endl;
+                        return 99999.9f;
+                }
 
                 pOverall = probability;
@@ -1793 +1804 @@
                 val += mBalancedRaysFactor * fabs(sumBalancedRays) /  raysSize;
 
-        const float denom = pOverall * (float)pvs * 2.0f + Limits::Small;
+        const float denom = pOverall * (float)pvs + Limits::Small;
 
         if (mSplitPlaneStrategy & PVS)
         {
                 val += mPvsFactor * (frontPvs * pFront + (backPvs * pBack)) / denom;
-
-                // give penalty to unbalanced split
-                if (0)
-                if (((pFront * 0.2 + Limits::Small) > pBack) || 
-                        (pFront < (pBack * 0.2 + Limits::Small)))
-                        val += 0.5;
         }
 
@@ -1975 +1980 @@
 }
 
-int
-BspTree::_CastRay(Ray &ray)
+
+int BspTree::_CastRay(Ray &ray)
 {
         int hits = 0;
@@ -3085 +3090 @@
                                                                         const float epsilon) const
 {       
-#if 0
-        // trivial cases
-        const int cf = Side(splitPlane, epsilon);
-
-        if (cf == -1)
-        {
-                back = *this;
-                return false;
-        }
-        else if (cf == 1)
-        {
-                front = *this;
-                return false;
-        }
-#endif
+        //-- trivial cases
+        if (0)
+        {
+                const int cf = Side(splitPlane, epsilon);
+
+                if (cf == -1)
+                {
+                        back = *this;
+                        return false;
+                }
+                else if (cf == 1)
+                {
+                        front = *this;
+                        return false;
+                }
+        }
 
         // get cross section of new polygon