Changeset 1715 for GTP/trunk/Lib/Vis/Preprocessing/src/Pvs.h

Timestamp:

11/06/06 20:47:06 (18 years ago)

Author:

bittner

Message:

new visibility filter support

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/Pvs.h (modified) (8 diffs)

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

@@ -97 +97 @@
 {
 public:
-        Pvs(): /*mSamples(0), */mEntries() {}
+  Pvs(): mSamples(0), mEntries() {}
+  
 
         //virtual ~Pvs();
@@ -199 +200 @@
         /// Map of PVS entries
         std::map<T, S, LtSample<T> > mEntries;
+
+  /// Number of samples used to create the PVS
+  int mSamples;
 };
 
@@ -340 +344 @@
 Pvs<T, S>::AddSample(T sample, const float pdf)
 {
-        S *data = Find(sample);
-  
-        if (data)  
-        {
-                data->mSumPdf += pdf;
-                return data->mSumPdf;
-        }
-        else 
-        {
-                mEntries[sample] = S(pdf);
-                return pdf;
+  mSamples++;
+  S *data = Find(sample);
+  
+  if (data)  
+        {
+          data->mSumPdf += pdf;
+          return data->mSumPdf;
+        }
+  else 
+        {
+          mEntries[sample] = S(pdf);
+          return pdf;
         }
 }
@@ -358 +363 @@
 S * Pvs<T, S>::AddSample2(T sample, const float pdf)
 {
-        S *data = Find(sample);
-  
-        if (data)  
-        {
-                data->mSumPdf += pdf;
-        }
-        else 
-        {
-                mEntries[sample] = S(pdf);
-                data = Find(sample);
-        }
-
-        return data;
+  mSamples++;
+  S *data = Find(sample);
+  
+  if (data)  
+        {
+          data->mSumPdf += pdf;
+        }
+  else 
+        {
+          mEntries[sample] = S(pdf);
+          data = Find(sample);
+        }
+  
+  return data;
 }
 
@@ -378 +384 @@
                                   float &contribution)
 {
+  mSamples++;
   S *data = Find(sample);
   
@@ -415 +422 @@
                                                   const float pdf)
 {
+  mSamples--;
+  
   std::map<T, S, LtSample<T> >::
         iterator it = mEntries.find(sample);
@@ -436 +445 @@
 int Pvs<T, S>::AddPvs(const Pvs<T, S> &pvs)
 {
+  mSamples += pvs.mSamples;
   std::map<T, S, LtSample<T> >::
         const_iterator it, it_end = pvs.mEntries.end();
@@ -452 +462 @@
 int Pvs<T, S>::SubtractPvs(const Pvs<T, S> &pvs)
 {
+  mSamples -= pvs.mSamples;
   std::map<T, S, LtSample<T> >::
         const_iterator it, it_end = pvs.mEntries.end();