Changeset 534 for trunk/VUT/GtpVisibilityPreprocessor/src/RssTree.cpp

Timestamp:

01/13/06 14:17:46 (19 years ago)

Author:

bittner

Message:

vss preprocessor void space identification fixed - by default it is off

File:

• trunk/VUT/GtpVisibilityPreprocessor/src/RssTree.cpp (modified) (5 diffs)

trunk/VUT/GtpVisibilityPreprocessor/src/RssTree.cpp

@@ -2041 +2041 @@
   
   int nrays = leaf->rays.size();
-
-
+  int startIndex = rays.size();
+  
   AxisAlignedBox3 box = GetBBox(leaf);
   AxisAlignedBox3 dirBox = GetDirBBox(leaf);
 
 
-  AxisAlignedBox3 sBox(box);
-  AxisAlignedBox3 sDirBox(dirBox);
-  const float smoothRange = 0.5f;
-  sBox.Scale(1.0f + smoothRange);
-  sDirBox.Scale(1.0f + smoothRange);
-  int smoothRays = (int)numberOfRays*0.0f;
-  
-#if AVG_LEN
-  float avgLength = 0.0f;
-
-  if (nrays) {
-        const int numAvg = 5;
-        
-        int step = (nrays-1)/10;
-        if (step<1)
-          step = 1;
-        
-        int summed = 0;
-        float sumLength = 0.0f;
-        for (int i=0; i < nrays; i+=step) {
-          sumLength += leaf->rays[i].mRay->GetSize();
-          summed++;
-        }
-  
-        avgLength = sumLength/summed;
-  }
-#endif
+  const float smoothRange = 0.0f;
+  if (smoothRange != 0.0f) {
+        box.Scale(1.0f + smoothRange);
+        dirBox.Scale(1.0f + smoothRange);
+  }
+  
   
   Exporter *exporter = NULL;
@@ -2149 +2128 @@
                                                   leaf->halton.GetNumber(5),
                                                   0.0f);
+                
                 leaf->halton.GenerateNext();
           } else {
@@ -2160 +2140 @@
           }
           
-          if (i < smoothRays) {
-                origin = sBox.GetPoint(pVector);
-                dirVector = sDirBox.GetPoint(dVector);
-          } else {
-                origin = box.GetPoint(pVector);
-                dirVector = dirBox.GetPoint(dVector);
-          }
+          origin = box.GetPoint(pVector);
+          dirVector = dirBox.GetPoint(dVector);
+
           direction = Vector3(sin(dirVector.x), sin(dirVector.y), cos(dirVector.x));
         }
@@ -2216 +2192 @@
   }
 
+  
   //  cout<<"desired="<<numberOfRays<<" tries="<<i<<endl;
-  
+  // assign probabilitites to the generated rays
+  for (i=startIndex; i < rays.size(); i++)
+        rays[i].mProbability = 1.0f;
+          
   if (exporter) {
         exporter->ExportRays(selectedRays, RgbColor(1, 0, 0));
@@ -2223 +2203 @@
         CLEAR_CONTAINER(selectedRays);
   }
+  
+  
 }