Changeset 412 for trunk

Timestamp:

11/15/05 01:42:05 (19 years ago)

Author:

mattausch

Message:

 

Location:

trunk/VUT/GtpVisibilityPreprocessor/src

Files:

• SamplingPreprocessor.cpp (modified) (2 diffs)
• ViewCellBsp.h (modified) (1 diff)
• VspKdTree.h (modified) (4 diffs)

trunk/VUT/GtpVisibilityPreprocessor/src/SamplingPreprocessor.cpp

@@ -741 +741 @@
                         //sampleContributions += mBspTree->GetStat().sampleContributions;
 
+                        Debug << mVspKdTree->GetStatistics();
+
                         // throw away samples because BSP leaves not stored in order 
                         // Need ordered rays for post processing => collect new rays
@@ -784 +786 @@
                         sampleContributions += mBspTree->GetStat().sampleContributions;
 
-                        BspTreeStatistics(Debug);       
+                        BspTreeStatistics(Debug);
 
                         if (0) Export("vc_bsptree.x3d", false, false, true);

trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellBsp.h

@@ -108 +108 @@
   int Interior() const { return nodes / 2; }
   int Leaves() const { return (nodes / 2) + 1; }
-  double AvgDepth() const { return accumDepth / (double)Leaves();}; // TODO: computation wrong
+  // TODO: computation wrong
+  double AvgDepth() const { return accumDepth / (double)Leaves();}; 
   
   void Reset() 

trunk/VUT/GtpVisibilityPreprocessor/src/VspKdTree.h

@@ -68 +68 @@
   
   // Constructor
-  VspKdStatistics() {
-    Reset();
+  VspKdStatistics() 
+  {
+          Reset();
   }
 
@@ -76 +77 @@
   int Leaves() const { return (nodes/2) + 1; }
 
-  void Reset() {
-    nodes = 0;
-    for (int i=0; i<7; i++)
-      splits[i] = 0;
-    rays = queryDomains = 0;
-    rayRefs = 0;
-    maxDepthNodes = 0;
-    minPvsNodes = 0;
-    minRaysNodes = 0;
-    maxRayRefs = 0;
-    addedRayRefs = removedRayRefs = 0;
-                initialPvsSize = 0;
-                maxRayContribNodes = 0;
-                minSizeNodes = 0;
-  }
-
+  void Reset() 
+  {
+          nodes = 0;
+          for (int i=0; i<7; i++)
+                  splits[i] = 0;
+          rays = queryDomains = 0;
+          rayRefs = 0;
+          maxDepthNodes = 0;
+          minPvsNodes = 0;
+          minRaysNodes = 0; 
+          maxRayRefs = 0;
+          addedRayRefs = removedRayRefs = 0;
+          initialPvsSize = 0;
+          maxRayContribNodes = 0;
+          minSizeNodes = 0;
+  }
   
   void
@@ -558 +559 @@
         // axis aligned bounding box of directions
         AxisAlignedBox3 dirBBox;
-  
+
+        const VspKdStatistics &GetStatistics() const {
+                return mStat;
+        }
         /////////////////////////////
         // Construction parameters
@@ -616 +620 @@
         
         /////////////////////////////
-        VspKdStatistics stat;
+        VspKdStatistics mstat;
         
         VspKdTree();