Changeset 413 for trunk/VUT

Timestamp:

11/15/05 01:46:26 (19 years ago)

Author:

mattausch

Message:

 

Location:

trunk/VUT/GtpVisibilityPreprocessor/src

Files:

• VspKdTree.cpp (modified) (3 diffs)
• VspKdTree.h (modified) (1 diff)

trunk/VUT/GtpVisibilityPreprocessor/src/VspKdTree.cpp

@@ -739 +739 @@
 
         if (data.depth >= termMaxDepth)
-                ++ stat.maxDepthNodes;
+                ++ mStat.maxDepthNodes;
   
         //  if ( (int)(leaf->rays.size()) < termMinCost)
         //    stat.minCostNodes++;
         if (leaf->GetPvsSize() < termMinPvs)
-                ++ stat.minPvsNodes;
+                ++ mStat.minPvsNodes;
 
         if (leaf->GetPvsSize() < termMinRays)
-                ++ stat.minRaysNodes;
+                ++ mStat.minRaysNodes;
 
         if (0 && leaf->GetAvgRayContribution() > termMaxRayContribution)
-                ++ stat.maxRayContribNodes;
+                ++ mStat.maxRayContribNodes;
         
         if (SqrMagnitude(data.bbox.Size()) <= termMinSize) 
-                ++ stat.minSizeNodes;
-
-        if ((int)(leaf->rays.size()) > stat.maxRayRefs)
-                stat.maxRayRefs = (int)leaf->rays.size();
+                ++ mStat.minSizeNodes;
+
+//      if ((int)(leaf->rays.size()) > stat.maxRayRefs)
+//              mStat.maxRayRefs = (int)leaf->rays.size();
 }
 
@@ -799 +799 @@
         }
   
-        stat.nodes += 2;
-        ++ stat.splits[axis];
+        mStat.nodes += 2;
+        //++ mStat.splits[axis];
 
         // add the new nodes to the tree
@@ -1134 +1134 @@
                         VspKdTreeLeaf *leaf = (VspKdTreeLeaf *)data.node;
                         leaf->AddRay(data.rayData);
-                        ++ stat.addedRayRefs;
+                        ++ mStat.addedRayRefs;
                 }
         }

trunk/VUT/GtpVisibilityPreprocessor/src/VspKdTree.h

@@ -663 +663 @@
                 return 
                         (sizeof(VspKdTree) + 
-                         stat.Leaves() * sizeof(VspKdTreeLeaf) +
-                         stat.Interior() * sizeof(VspKdTreeInterior) +
-                         stat.rayRefs * sizeof(VspKdTreeNode::RayInfo)) / (1024.0f*1024.0f);
+                         mStat.Leaves() * sizeof(VspKdTreeLeaf) +
+                         mStat.Interior() * sizeof(VspKdTreeInterior) +
+                         mStat.rayRefs * sizeof(VspKdTreeNode::RayInfo)) / (1024.0f*1024.0f);
         }
         
         float GetRayMemUsage() const 
         {
-                return stat.rays * (sizeof(VssRay))/(1024.0f * 1024.0f);
+                return mStat.rays * (sizeof(VssRay))/(1024.0f * 1024.0f);
         }