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

Timestamp:

02/20/06 02:13:08 (18 years ago)

Author:

mattausch

Message:

 

File:

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

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

@@ -415 +415 @@
 
 // TODO: return memory usage in MB
-float VspBspTree::GetMemUsage(/*const VspBspTraversalQueue &tstack*/) const
-{
-        return
-                (sizeof(VspBspTree) +
-                 (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);
+float VspBspTree::GetMemUsage() const
+{
+        return (float)
+                 (sizeof(VspBspTree) + 
+                  mBspStats.Leaves() * sizeof(BspLeaf) + 
+                  mCreatedViewCells * sizeof(BspViewCell) +
+                  mBspStats.pvs * sizeof(ObjectPvsData) +
+                  mBspStats.Interior() * sizeof(BspInterior) +
+                  mBspStats.accumRays * sizeof(RayInfo)) / (1024.0f * 1024.0f);
 }
 
@@ -1994 +1994 @@
                 mBspStats.maxPvs = data.mPvs;
         
+        mBspStats.pvs += data.mPvs;
+
         if (data.mDepth < mBspStats.minDepth)
                 mBspStats.minDepth = data.mDepth;
-
+        
         if (data.mDepth >= mTermMaxDepth)
                 ++ mBspStats.maxDepthNodes;
@@ -2019 +2021 @@
 
         ++ mCreatedViewCells;
+
 #ifdef _DEBUG
         Debug << "BSP stats: "