Changeset 656 for GTP/trunk

Timestamp:

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

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis

Files:

• Preprocessing/scripts/default.env (modified) (4 diffs)
• Preprocessing/src/Preprocessor.cpp (modified) (1 diff)
• Preprocessing/src/ViewCellBsp.h (modified) (2 diffs)
• Preprocessing/src/VspBspTree.cpp (modified) (3 diffs)
• shared/scripts/EvalStats (added)
• shared/scripts/EvalStats/EvalStats.cpp (added)
• shared/scripts/EvalStats/EvalStats.vcproj (added)
• shared/scripts/EvalStats/stdafx.cpp (added)
• shared/scripts/EvalStats/stdafx.h (added)
• shared/scripts/GtpVisibility.suo (modified) (previous)

GTP/trunk/Lib/Vis/Preprocessing/scripts/default.env

@@ -13 +13 @@
 #;../data/vienna/vienna-plane.x3d
 #       filename ../data/vienna/viewcells-25-sel.x3d
-        filename ../data/atlanta/atlanta2.x3d
+#       filename ../data/atlanta/atlanta2.x3d
 #       filename ../data/soda/soda.dat
-#       filename ../data/soda/soda5.dat
+        filename ../data/soda/soda5.dat
 }
 
@@ -25 +25 @@
         type vss
 #       type rss
-        detectEmptyViewSpace false
+        detectEmptyViewSpace true
 }
 
@@ -332 +332 @@
                 globalCostMissTolerance 4
                 minGlobalCostRatio      0.0000001
+#               minGlobalCostRatio      0.0001
                 maxViewCells            40000
-                useSplitCostQueue       true
+        
 
                 # used for pvs criterium
@@ -344 +345 @@
         }
         
+        useSplitCostQueue       false
+
         useCostHeuristics true
         splitUseOnlyDrivingAxis false

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

@@ -305 +305 @@
 
 #if USE_ASCII
-        ifstream samplesIn(fileName, ios::binary);
+        ifstream samplesIn(fileName);
         if (!samplesIn.is_open())
                 return false;

GTP/trunk/Lib/Vis/Preprocessing/src/ViewCellBsp.h

@@ -168 +168 @@
         /// accumulated number of rays refs
         int accumRays;
+        int pvs;
 
         // Constructor
@@ -193 +194 @@
                 polys = 0;
                 accumDepth = 0;
-        
+        pvs = 0;
                 maxDepthNodes = 0;
                 minPvsNodes = 0;

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: "