Changeset 556 for trunk/VUT/GtpVisibilityPreprocessor/src/Pvs.h

Timestamp:

01/19/06 15:30:44 (18 years ago)

Author:

bittner

Message:

debug version looking for glrenderer bug...

File:

• trunk/VUT/GtpVisibilityPreprocessor/src/Pvs.h (modified) (13 diffs)

trunk/VUT/GtpVisibilityPreprocessor/src/Pvs.h

@@ -25 +25 @@
 template<typename T> 
 struct PvsData {
-  int mVisibleSamples;
+  //  int mVisibleSamples;
+  // sum of probability density of visible sample rays
+  float mSumPdf;
   PvsData<T>() {}
-  PvsData<T>(const int samples): mVisibleSamples(samples) {}
+  PvsData<T>(const float sumPdf):
+        mSumPdf(sumPdf) {}
+
+  // $$JB in order to return meaningfull values
+  // it assumes that the sum pdf has been normalized somehow!!!
+  float GetVisibility() { return mSumPdf; }
 };
 
@@ -46 +53 @@
   int GetSize() const {return (int)mEntries.size();}
   bool Empty() const {return mEntries.empty();}
+
+  /** Normalize the visibility of entries in order to get comparable
+          results */
+  
+  void NormalizeMaximum();
   
   /** Merges pvs of a and pvs of b into this pvs.
@@ -61 +73 @@
   PvsData<T> *Find(T sample);
 
-  bool GetSampleContribution(T sample, float &contribution);
+  bool GetSampleContribution(T sample, const float pdf, float &contribution);
   
   /** Adds sample to PVS. 
@@ -67 +79 @@
           @returns true if sample was not already in PVS.
   */
-  bool AddSample(T sample, float &contribution);
+  bool AddSample(T sample, const float pdf, float &contribution);
 
   /** Adds sample to PVS.
           @returns contribution of sample (0 or 1)
   */
-  int AddSample(T sample);
+  float AddSample(T sample, const float pdf);
   
   /** Adds one pvs to another one.
@@ -94 +106 @@
           @param visibleSampels number of references to be removed
   */
-  bool RemoveSample(T sample, const int visibleSamples);
+  bool RemoveSample(T sample, const float pdf);
 
   /// Map of PVS entries
@@ -130 +142 @@
                 
                 if (data)
-                        data->mVisibleSamples += (*it).second.mVisibleSamples;
+                        data->mSumPdf += (*it).second.mSumPdf;
                 else
                         mEntries.insert(*it);
@@ -159 +171 @@
 
 template <typename T>
-int
-Pvs<T>::AddSample(T sample)
+float
+Pvs<T>::AddSample(T sample, const float pdf)
 {
   PvsData<T> *data = Find(sample);
   
   if (data)  {
-        return ++data->mVisibleSamples;
+        data->mSumPdf+=pdf;
+        return data->mSumPdf;
   }
   else {
-        mEntries[sample] = PvsData<T>(1);
-        return 1;
+        mEntries[sample] = PvsData<T>(pdf);
+        return pdf;
   }
 }
@@ -175 +188 @@
 template <typename T>
 bool
-Pvs<T>::AddSample(T sample, float &contribution)
+Pvs<T>::AddSample(T sample,
+                                  const float pdf,
+                                  float &contribution)
 {
   PvsData<T> *data = Find(sample);
   
   if (data)  {
-        data->mVisibleSamples++;
-        contribution = 1.0f/data->mVisibleSamples;
+        data->mSumPdf+=pdf;
+        contribution = pdf/data->mSumPdf;
         return false;
   }
   else {
-        mEntries[sample] = PvsData<T>(1);
+        mEntries[sample] = PvsData<T>(pdf);
         contribution = 1.0f;
         return true;
@@ -193 +208 @@
 template <typename T>
 bool
-Pvs<T>::GetSampleContribution(T sample, float &contribution) 
+Pvs<T>::GetSampleContribution(T sample,
+                                                          const float pdf,
+                                                          float &contribution) 
 {
   PvsData<T> *data = Find(sample);
   
   if (data)  {
-        contribution = 1.0f/(data->mVisibleSamples + 1);
+        contribution = pdf/(data->mSumPdf + pdf);
         return false;
   }
@@ -208 +225 @@
 
 template <typename T>
-bool Pvs<T>::RemoveSample(T sample, const int visibleSamples)
-{
-        std::map<T, PvsData<T>, LtSample<T> >::
-                iterator it = mEntries.find(sample);
-
-        if (it == mEntries.end())
-                return false;
-
-        PvsData<T> *data = &(*it).second;
-  
-        data->mVisibleSamples -= visibleSamples;
-        if (data->mVisibleSamples <= 0)
-                mEntries.erase(it);
-
-        return true;
+bool Pvs<T>::RemoveSample(T sample,
+                                                  const float pdf)
+{
+  std::map<T, PvsData<T>, LtSample<T> >::
+        iterator it = mEntries.find(sample);
+  
+  if (it == mEntries.end())
+        return false;
+  
+  PvsData<T> *data = &(*it).second;
+  
+  data->mSumPdf -= pdf;
+  if (data->mSumPdf <= 0.0f)
+        mEntries.erase(it);
+  
+  return true;
 }
 
@@ -228 +246 @@
 int Pvs<T>::AddPvs(const Pvs<T> &pvs)
 {
-        std::map<T, PvsData<T>, LtSample<T> >::
-                const_iterator it, it_end = pvs.mEntries.end();
-
-        float contri;
-        // output PVS of view cell
-        for (it = pvs.mEntries.begin(); it != it_end; ++ it) 
-                AddSample((*it).first, contri);
-
-        return GetSize();
+  std::map<T, PvsData<T>, LtSample<T> >::
+        const_iterator it, it_end = pvs.mEntries.end();
+  
+  float contri;
+  // output PVS of view cell
+  for (it = pvs.mEntries.begin(); it != it_end; ++ it) 
+        AddSample((*it).first, (*it).second.mSumPdf, contri);
+  
+  return GetSize();
 }
  
@@ -242 +260 @@
 int Pvs<T>::SubtractPvs(const Pvs<T> &pvs)
 {
-        std::map<T, PvsData<T>, LtSample<T> >::
-                const_iterator it, it_end = pvs.mEntries.end();
-
-        // output PVS of view cell
-        for (it = pvs.mEntries.begin(); it != it_end; ++ it) 
-                RemoveSample((*it).first, (*it).second.mVisibleSamples);
-
-        return GetSize();
+  std::map<T, PvsData<T>, LtSample<T> >::
+        const_iterator it, it_end = pvs.mEntries.end();
+  
+  // output PVS of view cell
+  for (it = pvs.mEntries.begin(); it != it_end; ++ it) 
+        RemoveSample((*it).first, (*it).second.mSumPdf);
+  
+  return GetSize();
 }
 
@@ -262 +280 @@
                 entries.push_back((*it)->first);
 }
+
+template <typename T>
+void Pvs<T>::NormalizeMaximum()
+{
+  std::map<T, PvsData<T>, LtSample<T> >::
+        const_iterator it, it_end = mEntries.end();
+
+  float maxPdfSum = -1.0f;
+
+  // output PVS of view cell
+  for (it = mEntries.begin(); it != it_end; ++ it) {
+        float sum = (*it)->second.sumPdf;
+        if (sum > maxSum)
+          maxSum = sum;
+  }
+
+  maxSum = 1.0f/maxSum;
+
+  for (it = mEntries.begin(); it != it_end; ++ it) {
+        (*it)->second.sumPdf *= maxSum;
+  }
+  
+}
+
 
 /** Class instantiating the Pvs template for kd tree nodes.