Changeset 537

Timestamp:

01/13/06 19:20:27 (18 years ago)

Author:

bittner

Message:

ray probability density support

Location:

trunk/VUT/GtpVisibilityPreprocessor/src

Files:

• Ray.h (modified) (1 diff)
• RssPreprocessor.cpp (modified) (6 diffs)
• RssPreprocessor.h (modified) (1 diff)
• RssTree.cpp (modified) (1 diff)
• VssRay.h (modified) (2 diffs)

trunk/VUT/GtpVisibilityPreprocessor/src/Ray.h

@@ -307 +307 @@
 
   SimpleRay() {}
-  SimpleRay(const Vector3 &o, const Vector3 &d):mOrigin(o), mDirection(d) {}
+  SimpleRay(const Vector3 &o, const Vector3 &d, const float p=1.0f):
+        mOrigin(o), mDirection(d), mProbability(p) {}
 };
 
-typedef vector<SimpleRay> SimpleRayContainer;
+class SimpleRayContainer : public vector<SimpleRay>
+{
+public:
+  
+  float mSumProbabilities;
+  
+  SimpleRayContainer():vector<SimpleRay>(), mSumProbabilities(0.0f) {}
+  
+  void NormalizeProbabilities() {
+        iterator it = begin();
+        float c = 1.0f/mSumProbabilities;
+        for (; it != end(); it++)
+          (*it).mProbability*=c;
+  }
+  
+};
 
 #endif 

trunk/VUT/GtpVisibilityPreprocessor/src/RssPreprocessor.cpp

@@ -68 +68 @@
                                                  Vector3 &viewPoint,
                                                  Vector3 &direction,
+                                                 const float probability,
                                                  VssRayContainer &vssRays
                                                  )
@@ -148 +149 @@
                                                   objectB,
                                                   objectA,
-                                                  mPass
+                                                  mPass,
+                                                  probability
                                                   );
           vssRays.push_back(vssRay);
@@ -159 +161 @@
                                                   objectA,
                                                   objectB,
-                                                  mPass
+                                                  mPass,
+                                                  probability
                                                   );
           vssRays.push_back(vssRay);
@@ -551 +554 @@
           //int s = Min(mSamplesPerPass, mInitialSamples);
           int s = mInitialSamples;
-          
+
+          float probability = 1.0f/mInitialSamples;
           for (int k=0; k < s; k++) {
                 
@@ -561 +565 @@
                 Vector3 direction = InitialGetDirection(viewpoint, mViewSpaceBox);
                 
-                sampleContributions = CastRay(viewpoint, direction, mVssRays);
+                sampleContributions = CastRay(viewpoint, direction, probability, mVssRays);
                 
                 
@@ -694 +698 @@
                 mViewCellsManager->GetViewPoint(viewpoint);
                 Vector3 direction = GetDirection(viewpoint, mViewSpaceBox);
-                rays.push_back(SimpleRay(viewpoint, direction));
+                rays.push_back(SimpleRay(viewpoint, direction, 1.0f));
+                rays.mSumProbabilities+=1.0f;
           }
         } else {
           num = GenerateImportanceRays(rssTree, num, rays);
         }
-                
-                
+
+        rays.NormalizeProbabilities();
+        
         for (int i=0; i < rays.size(); i++)
-          CastRay(rays[i].mOrigin, rays[i].mDirection, vssRays);
+          CastRay(rays[i].mOrigin, rays[i].mDirection, rays[i].mProbability, vssRays);
 
         

trunk/VUT/GtpVisibilityPreprocessor/src/RssPreprocessor.h

@@ -78 +78 @@
                   Vector3 &viewPoint,
                   Vector3 &direction,
+                  const float probability,
                   VssRayContainer &vssRays
 

trunk/VUT/GtpVisibilityPreprocessor/src/RssTree.cpp

@@ -2195 +2195 @@
   //  cout<<"desired="<<numberOfRays<<" tries="<<i<<endl;
   // assign probabilitites to the generated rays
-  for (i=startIndex; i < rays.size(); i++)
-        rays[i].mProbability = 1.0f;
-          
+  float p = (box.GetVolume()*dirBox.GetVolume())/generated;
+  for (i=startIndex; i < rays.size(); i++) {
+        rays[i].mProbability = p;
+        rays.mSumProbabilities += p;
+  }
+  
+  
   if (exporter) {
         exporter->ExportRays(selectedRays, RgbColor(1, 0, 0));

trunk/VUT/GtpVisibilityPreprocessor/src/VssRay.h

@@ -73 +73 @@
                  Intersectable *originObject,
                  Intersectable *terminationObject,
-                 const int pass = 0
+                 const int pass = 0,
+                 const float probability = 1.0f
                  ):
         mMailbox(-1),
@@ -85 +86 @@
         mViewCells(0),
         mWeightedPvsContribution(0),
-        mProbability(1.0f)
+        mProbability(probability)
   {
     Precompute();