Changeset 1112 for GTP/trunk/Lib/Vis/Preprocessing/src/Ray.h

Timestamp:

07/10/06 19:21:19 (18 years ago)

Author:

bittner

Message:

Merge with Olivers code

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/Ray.h (modified) (1 diff)

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

@@ -317 +317 @@
 public:
   
-  float mSumPdf;
-  
-  SimpleRayContainer():vector<SimpleRay>(), mSumPdf(0.0f) {}
-  
-  void NormalizePdf() {
+  
+  SimpleRayContainer():vector<SimpleRay>() {}
+  
+  void NormalizePdf(float scale = 1.0f) {
         iterator it = begin();
-        float c = 1.0f/mSumPdf;
+        float sumPdf = 0.0f;
         for (; it != end(); it++)
+          sumPdf += (*it).mPdf;
+
+        float c = scale/sumPdf;
+        
+        for (it = begin(); it != end(); it++) {
           (*it).mPdf*=c;
-  }
-
+        }
+  }
+  
   void AddRay(const SimpleRay &ray) {
         push_back(ray);
-        mSumPdf += ray.mPdf;
   }
 };