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

Timestamp:

02/04/06 12:46:14 (18 years ago)

Author:

mattausch

Message:

updated vspkdtree for regular sudbivision

File:

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

trunk/VUT/GtpVisibilityPreprocessor/src/VspBspTree.cpp

@@ -364 +364 @@
         }
 
+        // normalize
         if (mUseAreaForPvs)
-                mTermMinProbability *= mBox.SurfaceArea(); // normalize
+                mTermMinProbability *= mBox.SurfaceArea(); 
         else 
                 mTermMinProbability *= mBox.GetVolume();
@@ -385 +386 @@
 
 // return memory usage in MB
-float VspBspTree::GetMemUsage() const
+float VspBspTree::GetMemUsage(/*const VspBspTraversalStack &tstack*/) const
 {
         return
                 (sizeof(VspBspTree) +
-                 mBspStats.Leaves() * sizeof(BspLeaf) +
+                 (float)mBspStats.Leaves() * sizeof(BspLeaf) + 
+                 // the nodes in the stack is the minimal additional number of leaves
+                 //(float)tstack.size() * sizeof(BspLeaf) +
                  mBspStats.Interior() * sizeof(BspInterior) +
                  mBspStats.accumRays * sizeof(RayInfo)) / (1024.0f * 1024.0f);
@@ -428 +431 @@
 
         long startTime = GetTime();     
-        // used for intermediate time measurements
+
+        // used for intermediate time measurements and progress
         long interTime = GetTime();     
 
@@ -451 +455 @@
                 }
 
-                        // subdivide leaf node
+                // subdivide leaf node
                 BspNode *r = Subdivide(tStack, tData);
 
@@ -464 +468 @@
                         cout << "leaves=" << mBspStats.Leaves() << endl;
                         Debug << "needed "
-                          << TimeDiff(interTime, GetTime())*1e-3 << " secs to create 500 leaves" << endl;
+                                  << TimeDiff(interTime, GetTime())*1e-3 
+                                  << " secs to create 500 leaves" << endl;
                         interTime = GetTime();
                 }
@@ -1621 +1626 @@
                   << "Depth: " << data.mDepth << " (max: " << mTermMaxDepth << "), "
                   << "PVS: " << data.mPvs << " (min: " << mTermMinPvs << "), "
-          //              << "Area: " << data.mArea << " (min: " << mTermMinArea << "), "
+          //              << "Area: " << data.mProbability << " (min: " << mTermMinProbability << "), "
                   << "#rays: " << (int)data.mRays->size() << " (max: " << mTermMinRays << "), "
                   << "#pvs: " << leaf->GetViewCell()->GetPvs().GetSize() << "=, "