Changeset 1785 for GTP/trunk/Lib/Vis/Preprocessing/src/RssTree.cpp

Timestamp:

11/23/06 21:38:45 (18 years ago)

Author:

bittner

Message:

merge, filter update, renderebuffer made functional

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/RssTree.cpp (modified) (7 diffs)

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

@@ -2179 +2179 @@
   int startIndex = (int)rays.size();
 
-  Debug<<"B"<<flush;
+  //  Debug<<"B"<<flush;
 
   AxisAlignedBox3 box = GetBBox(leaf);
@@ -2192 +2192 @@
   }
 
-  Debug<<"R"<<flush;
+  //  Debug<<"R"<<flush;
   
   for (int i=0; i < numberOfRays; i++) {
@@ -2229 +2229 @@
         origin = box.GetPoint(pVector);
         dirVector = dirBox.GetPoint(dVector);
-
+        
         direction = Vector3(sin(dirVector.x), sin(dirVector.y), cos(dirVector.x));
-
         
         
@@ -2253 +2252 @@
 #if 0
         static int counter = 0;
-        Debug<<counter++<<flush;
+        //      Debug<<counter++<<flush;
 
         if (counter > 10374968) {
@@ -2268 +2267 @@
   }
 
-  Debug<<"D"<<flush;
+  //  Debug<<"D"<<flush;
   
   float density = 1.0f;
@@ -2692 +2691 @@
   
   // always generate at leat n ray per leaf
-  int fixedPerLeaf = 0;
+  int fixedPerLeaf = 1;
   // int fixedPerLeaf = 0;
   int fixed = fixedPerLeaf*(int)leaves.size();
-  int iGenerated = numberOfRays;
+
+  // check if the number of fixed is not too big
+
+  if (fixed >= numberOfRays/2) {
+        fixedPerLeaf = 0;
+        fixed = 0;
+  }
+  
+  int iGenerated = numberOfRays - fixed;
   float ratioPerLeaf = iGenerated /(avgContrib*numberOfLeaves);
-
+  
   k = 0;
 
@@ -2749 +2756 @@
 }
 
-float weightAbsContributions = 0.0f;
+float weightAbsContributions = ABS_CONTRIBUTION_WEIGHT;
 // if small very high importance of the last sample
 // if 1.0f then weighs = 1 1/2 1/3 1/4
 float passSampleWeightDecay = 1.0f;
 //float passSampleWeightDecay = 0.0001f;
-
 
 float