Changeset 567 for trunk/VUT/GtpVisibilityPreprocessor/src/RssPreprocessor.cpp

Timestamp:

01/23/06 10:10:34 (18 years ago)

Author:

bittner

Message:

rss preprocessor simplification - mixed sampling strategies

File:

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

trunk/VUT/GtpVisibilityPreprocessor/src/RssPreprocessor.cpp

@@ -64 +64 @@
           GenerateImportanceRays(mRssTree, number, rays);
           result = true;
-          rays.NormalizePdf();
+          //      rays.NormalizePdf();
         }
         break;
@@ -214 +214 @@
 
 
-Vector3
-RssPreprocessor::GetViewpoint(AxisAlignedBox3 *viewSpaceBox)
-{
-  AxisAlignedBox3 box;
-        
-  if (viewSpaceBox)
-        box =*viewSpaceBox;
-  else 
-        box = mKdTree->GetBox();
-        
-  // shrink the box in the y direction
-  return box.GetRandomPoint();
-}
 
 
@@ -432 +419 @@
 {
 
-  //  connect(this, SIGNAL(EvalPvsStat()), renderer, SLOT(EvalPvsStat()) );
-  
   cout<<"Rss Preprocessor started\n"<<flush;
-  cout<<"Memory/ray "<<sizeof(VssRay)+sizeof(RssTreeNode::RayInfo)<<endl;
+  //  cout<<"Memory/ray "<<sizeof(VssRay)+sizeof(RssTreeNode::RayInfo)<<endl;
 
   Randomize(0);
@@ -566 +551 @@
         if (mUseImportanceSampling) {
           VssRayContainer tmpVssRays;
-          
-          GenerateRays(mRssSamplesPerPass/2, RSS_BASED_DISTRIBUTION, rays);
+
+          float ratios[] = {1.0f,0,0};
+
+          
+          
+          GenerateRays(mRssSamplesPerPass*ratios[0], RSS_BASED_DISTRIBUTION, rays);
           CastRays(rays, tmpVssRays);
           castRays += rays.size();
@@ -576 +565 @@
           rays.clear();
           tmpVssRays.clear();
-          
-          GenerateRays(mRssSamplesPerPass/4, SPATIAL_BOX_BASED_DISTRIBUTION, rays);
-          CastRays(rays, tmpVssRays);
-          castRays += rays.size();
-          float c2 = mViewCellsManager->ComputeSampleContributions(tmpVssRays, false);
-          mStats<<"#SpatialRelContrib"<<endl<<c2/rays.size()<<endl;
-
-          vssRays.insert(vssRays.end(), tmpVssRays.begin(), tmpVssRays.end() );
-          
-          rays.clear();
-          tmpVssRays.clear();
-          
-          
-          GenerateRays(mRssSamplesPerPass/4, DIRECTION_BASED_DISTRIBUTION, rays);
-          CastRays(rays, tmpVssRays);
-          castRays += rays.size();
-          float c3 = mViewCellsManager->ComputeSampleContributions(tmpVssRays, false);
-          mStats<<"#DirectionalRelContrib"<<endl<<c3/rays.size()<<endl;
-          
-          vssRays.insert(vssRays.end(), tmpVssRays.begin(), tmpVssRays.end() );
-          
-          rays.clear();
-          tmpVssRays.clear();
+
+          if (ratios[1]!=0.0f) {
+                GenerateRays(mRssSamplesPerPass*ratios[1], SPATIAL_BOX_BASED_DISTRIBUTION, rays);
+                CastRays(rays, tmpVssRays);
+                castRays += rays.size();
+                float c2 = mViewCellsManager->ComputeSampleContributions(tmpVssRays, false);
+                mStats<<"#SpatialRelContrib"<<endl<<c2/rays.size()<<endl;
+                
+                vssRays.insert(vssRays.end(), tmpVssRays.begin(), tmpVssRays.end() );
+                
+                rays.clear();
+                tmpVssRays.clear();
+          }
+          
+          
+          if (ratios[2]!=0.0f) {
+                GenerateRays(mRssSamplesPerPass*ratios[2], DIRECTION_BASED_DISTRIBUTION, rays);
+                CastRays(rays, tmpVssRays);
+                castRays += rays.size();
+                float c3 = mViewCellsManager->ComputeSampleContributions(tmpVssRays, false);
+                mStats<<"#DirectionalRelContrib"<<endl<<c3/rays.size()<<endl;
+                
+                vssRays.insert(vssRays.end(), tmpVssRays.begin(), tmpVssRays.end() );
+                
+                rays.clear();
+                tmpVssRays.clear();
+          }
           
           // add contributions of all rays at once...