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

Timestamp:

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

Author:

mattausch

Message:

 

File:

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

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