Changeset 711

Timestamp:

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

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/Preprocessing

Files:

• scripts/egsr_test_script (modified) (1 diff)
• src/ViewCellBsp.cpp (modified) (5 diffs)
• src/ViewCellsManager.cpp (modified) (1 diff)
• src/VspBspTree.cpp (modified) (7 diffs)

GTP/trunk/Lib/Vis/Preprocessing/scripts/egsr_test_script

@@ -2 +2 @@
 PROGRAM=../bin/release/Preprocessor.exe
 
-SCENE=soda5
-#SCENE=soda
+#SCENE=$1
+SCENE=soda
+#SCENE=soda5
 #SCENE=atlanta
 #SCENE=vienna

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

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

@@ -16 +16 @@
 #include "RssPreprocessor.h"
 
-#define SAMPLE_AFTER_SUBDIVISION 0
+#define SAMPLE_AFTER_SUBDIVISION 1
 #define TEST_EMPTY_VIEW_CELLS 0
 

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

@@ -1055 +1055 @@
         // subdivide further
 
+        // store maximal and minimal depth
+        if (tData.mDepth > mBspStats.maxDepth)
+        {
+                Debug << "max depth increases to " << tData.mDepth << " at " << mBspStats.Leaves() << " leaves" << endl;
+                mBspStats.maxDepth = tData.mDepth;
+        }
+
         mBspStats.nodes += 2;
 
-        
+    
         BspInterior *interior = new BspInterior(splitPlane);
 
@@ -1064 +1071 @@
 #endif
 
+
         //-- create front and back leaf
 
@@ -1087 +1095 @@
         interior->mTimeStamp = mTimeStamp ++;
         
+
         //DEL_PTR(leaf);
         return interior;
@@ -1142 +1151 @@
         // creates a sorted split candidates array
         if (mSplitCandidates->capacity() > 500000 &&
-                requestedSize < (int)(mSplitCandidates->capacity()  / 10) )
+                requestedSize < (int)(mSplitCandidates->capacity() / 10) )
         {
         delete mSplitCandidates;
@@ -1851 +1860 @@
                 pBack = pOverall - pFront;
                 
-                // clamp because of possible precision issues
+                // precision issues possible for unbalanced split => don't take this split!
                 if (1 && 
                         (!splitSuccessFull || (pFront <= 0) || (pBack <= 0) || 
@@ -1857 +1866 @@
                 {
                         Debug << "error f: " << pFront << " b: " << pBack << endl;
-                        return 999;
+                        return 99999.9f;
                 }
         }
@@ -2167 +2176 @@
         BspLeaf *leaf = dynamic_cast<BspLeaf *>(data.mNode);
 
-        // store maximal and minimal depth
-        if (data.mDepth > mBspStats.maxDepth)
-                mBspStats.maxDepth = data.mDepth;
 
         if (data.mPvs > mBspStats.maxPvs)
+        {
                 mBspStats.maxPvs = data.mPvs;
-        
+        }
+
         mBspStats.pvs += data.mPvs;
 
         if (data.mDepth < mBspStats.minDepth)
+        {
                 mBspStats.minDepth = data.mDepth;
+        }
         
         if (data.mDepth >= mTermMaxDepth)
+        {
                 ++ mBspStats.maxDepthNodes;
+        }
 
         // accumulate rays to compute rays /  leaf