Changeset 475 for trunk/VUT/GtpVisibilityPreprocessor/src/VspBspTree.cpp

Timestamp:

12/21/05 20:21:30 (19 years ago)

Author:

mattausch

Message:

bsp merging possible again

File:

• trunk/VUT/GtpVisibilityPreprocessor/src/VspBspTree.cpp (modified) (4 diffs)

trunk/VUT/GtpVisibilityPreprocessor/src/VspBspTree.cpp

@@ -227 +227 @@
         long startTime = GetTime();
 
-        Debug << "**** Extracting polygons from rays ****\n";
+        cout << "Extracting polygons from rays ...";
 
         Intersectable::NewMail();
@@ -276 +276 @@
         mStat.polys = (int)polys.size();
 
-        Debug << "**** Finished polygon extraction ****" << endl;
-        Debug << (int)polys.size() << " polys extracted from " << (int)sampleRays.size() << " rays" << endl;
-        Debug << "extraction time: " << TimeDiff(startTime, GetTime())*1e-3 << "s" << endl;
+        cout << "finished" << endl;
+
+        Debug << "\nPolygon extraction: " << (int)polys.size() << " polys extracted from " 
+                  << (int)sampleRays.size() << " rays in "
+                  << TimeDiff(startTime, GetTime())*1e-3 << " secs" << endl << endl;
 
         Construct(polys, rays);
@@ -321 +323 @@
                 if (r == mRoot)
                         Debug << "VSP BSP tree construction time spent at root: " 
-                                  << TimeDiff(startTime, GetTime())*1e-3 << "s" << endl;
+                                  << TimeDiff(startTime, GetTime())*1e-3 << "s" << endl << endl;
         }
 
@@ -336 +338 @@
                  (data.mPvs <= mTermMinPvs)   ||
                  (data.mArea <= mTermMinArea) ||
-                 (numLeaves >= mMaxViewCells) ||
+                 ((mStat.nodes / 2 + 1) >= mMaxViewCells) ||
                 // (data.GetAvgRayContribution() >= mTermMaxRayContribution) ||
                  (data.mDepth >= mTermMaxDepth));