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

Timestamp:

01/21/06 18:32:30 (18 years ago)

Author:

bittner

Message:

rss sampling changes, preprocessor::GenerateRays?

File:

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

trunk/VUT/GtpVisibilityPreprocessor/src/RssPreprocessor.cpp

@@ -42 +42 @@
   environment->GetBoolValue("RssPreprocessor.loadInitialSamples", mLoadInitialSamples);
   environment->GetBoolValue("RssPreprocessor.storeInitialSamples", mStoreInitialSamples);
+  environment->GetBoolValue("RssPreprocessor.updateSubdivision", mUpdateSubdivision);
   
   mStats.open("stats.log");
-
-}
+  mRssTree = NULL;
+}
+
+
+bool
+RssPreprocessor::GenerateRays(
+                                                          const int number,
+                                                          const int sampleType,
+                                                          SimpleRayContainer &rays
+                                                          )
+{
+  bool result = false;
+
+  switch (sampleType) {
+  case RSS_BASED_DISTRIBUTION:
+  case RSS_SILHOUETTE_BASED_DISTRIBUTION:
+        if (mRssTree) {
+          GenerateImportanceRays(mRssTree, number, rays);
+          result = true;
+          rays.NormalizePdf();
+        }
+        break;
+  default:
+        result = Preprocessor::GenerateRays(number, sampleType, rays);
+  }
+
+  return result;
+}
+
+void
+RssPreprocessor::CastRays(
+                                                  SimpleRayContainer &rays,
+                                                  VssRayContainer &vssRays
+                                                  )
+{
+  for (int i=0; i < rays.size(); i++)
+        CastRay(rays[i].mOrigin, rays[i].mDirection, rays[i].mPdf, vssRays);
+}
+
 
 RssPreprocessor::~RssPreprocessor()
@@ -190 +228 @@
 }
 
-Vector3
-RssPreprocessor::GetDirection(const Vector3 &viewpoint,
-                                                          AxisAlignedBox3 *viewSpaceBox
-                                                          )
-{
-  Vector3 point;
-  if (!use2dSampling) {
-        if (mObjectBasedSampling) {
-          Vector3 normal;
-          int i = RandomValue(0, mObjects.size()-1);
-          Intersectable *object = mObjects[i];
-          object->GetRandomSurfacePoint(point, normal);
-        } else {
-          // select
-          if (mDirectionalSampling) {
-                point = viewpoint + UniformRandomVector();
-          } else {
-                // select the other point uniformly distruted in the whole viewspace
-                AxisAlignedBox3 box;
-                
-                if (viewSpaceBox)
-                  box =*viewSpaceBox;
-                else 
-                  box = mKdTree->GetBox();
-                
-                point = box.GetRandomPoint();
-          }
-        }
-  } else {
-        AxisAlignedBox3 box;
-                
-        if (viewSpaceBox)
-          box =*viewSpaceBox;
-        else 
-          box = mKdTree->GetBox();
-        
-        point = box.GetRandomPoint();
-        point.y = viewpoint.y;
-  }
-        
-  return point - viewpoint;
-}
-
-Vector3
-RssPreprocessor::InitialGetDirection(const Vector3 &viewpoint,
-                                                                         AxisAlignedBox3 *viewSpaceBox
-                                                                         )
-{
-  Vector3 point;
-  if (!use2dSampling) {
-        if (1 || mObjectBasedSampling) {
-          Vector3 normal;
-          int i = RandomValue(0, mObjects.size()-1);
-          Intersectable *object = mObjects[i];
-          object->GetRandomSurfacePoint(point, normal);
-        } else {
-          // select
-          if (1 || mDirectionalSampling) {
-                point = viewpoint + UniformRandomVector();
-          } else {
-                // select the other point uniformly distruted in the whole viewspace
-                AxisAlignedBox3 box;
-                
-                if (viewSpaceBox)
-                  box =*viewSpaceBox;
-                else 
-                  box = mKdTree->GetBox();
-                
-                point = box.GetRandomPoint();
-          }
-        }
-  } else {
-        AxisAlignedBox3 box;
-        
-        if (viewSpaceBox)
-          box =*viewSpaceBox;
-        else 
-          box = mKdTree->GetBox();
-        
-        point = box.GetRandomPoint();
-        point.y = viewpoint.y;
-  }
-  
-  return point - viewpoint;
-}
 
 int
@@ -302 +255 @@
   }
         
-  cout<<"Generated "<<num<<" rays."<<endl;
         
   return num;
@@ -322 +274 @@
   exporter->SetFilled();
   // $$JB temporarily do not export the scene
-  if (1)
+  if (0)
         exporter->ExportScene(mSceneGraph->mRoot);
   exporter->SetWireframe();
@@ -474 +426 @@
 }
 
+
+
 bool
 RssPreprocessor::ComputeVisibility()
 {
 
-  if (renderer)
-        renderer->InitGL();
-  
   //  connect(this, SIGNAL(EvalPvsStat()), renderer, SLOT(EvalPvsStat()) );
   
@@ -493 +444 @@
   int totalSamples = 0;
 
-  AxisAlignedBox3 *box = new AxisAlignedBox3(mKdTree->GetBox());
-
-  if (fromBoxVisibility) {
-        float m = box->Min(1);
-        float bsize = box->Size(1);
-
-        float size = 0.02f;
-        float s = 0.5f - size;
-        float olds = Magnitude(box->Size());
-        box->Enlarge(box->Size()*Vector3(-s));
-        //      Vector3 translation = Vector3(-olds*0.2f, 0, 0);
-        Vector3 translation = Vector3(-0.05f*olds, 0, 0);
-        box->SetMin(box->Min() + translation);
-        box->SetMax(box->Max() + translation);
-
-        box->SetMin(1,  m + bsize*0.1f);
-        box->SetMax(1,  m + bsize*0.6f);
-
-        
-  } else {
-                
-        // sample city like heights
-        float m = box->Min(1);
-        float bsize = box->Size(1);
-        box->SetMin(1,  m + bsize*0.2f);
-        box->SetMax(1,  m + bsize*0.3f);
-  }
-
-  if (use2dSampling)
-        box->SetMax(1, box->Min(1));
-        
-  if (useViewSpaceBox)
-  {
-        mViewSpaceBox = box;
-        mViewCellsManager->SetViewSpaceBox(*box);
-  }
-  else
-  {
-        mViewSpaceBox = NULL;
-        mViewCellsManager->SetViewSpaceBox(mKdTree->GetBox());
-  }
+  mViewSpaceBox = NULL;
+  mViewCellsManager->SetViewSpaceBox(mKdTree->GetBox());
+  
   
   //-- load view cells from file if requested
-  if (mLoadViewCells)
-  {     
-          // load now because otherwise bounding box not correct
-          mViewCellsManager->LoadViewCells(mViewCellsFilename, &mObjects);
-  }
-
-  RssTree *rssTree = NULL;
+  if (mLoadViewCells) { 
+        // load now because otherwise bounding box not correct
+        mViewCellsManager->LoadViewCells(mViewCellsFilename, &mObjects);
+  }
+  
   int rssPass = 0;
   int rssSamples = 0;
-
-#if 0
+  
   if (mLoadInitialSamples) {
         cout << "Loading samples from file ... ";
@@ -552 +462 @@
         cout << "finished\n" << endl;
   } else {
-#endif
-        while (totalSamples < mInitialSamples) {
-          int passContributingSamples = 0;
-          int passSampleContributions = 0;
-          int passSamples = 0;
-          int index = 0;
-          
-          int sampleContributions;
-          
-          //int s = Min(mSamplesPerPass, mInitialSamples);
-          int s = mInitialSamples;
-
-          float probability = 1.0f/mInitialSamples;
-          for (int k=0; k < s; k++) {
-                
-                
-                //Vector3 viewpoint = GetViewpoint(mViewSpaceBox);
-                Vector3 viewpoint; 
-                mViewCellsManager->GetViewPoint(viewpoint);
-                //              viewpoint = GetViewpoint(mViewSpaceBox);
-                Vector3 direction = InitialGetDirection(viewpoint, mViewSpaceBox);
-                
-                sampleContributions = CastRay(viewpoint, direction, probability, mVssRays);
-                
-                
-                //-- CORR matt: put block inside loop
-                if (sampleContributions) {
-                  passContributingSamples ++;
-                  passSampleContributions += sampleContributions;
-                }
-                passSamples++;
-                totalSamples++;
-          }
-          
-          
-          float avgRayContrib = (passContributingSamples > 0) ? 
-                passSampleContributions/(float)passContributingSamples : 0;
-          
-          cout << "#Pass " << mPass << " : t = " << TimeDiff(startTime, GetTime())*1e-3 << "s" << endl;
-          cout << "#TotalSamples=" << totalSamples/1000 
-                   << "k   #SampleContributions=" << passSampleContributions << " (" 
-                   << 100*passContributingSamples/(float)passSamples<<"%)" 
-                   << "avgcontrib=" << avgRayContrib << endl;
-          
-          mPass++;
-        }
-          
-        cout << "#totalPvsSize=" << mKdTree->CollectLeafPvs() << endl;
-        cout << "#totalRayStackSize=" << (int)mVssRays.size() << endl <<flush;
-        
-        rssSamples += (int)mVssRays.size();
-        
-        
-        if (mExportRays) {
-          char filename[64];
-          sprintf(filename, "rss-rays-initial.x3d");
-          ExportRays(filename, mVssRays, mExportNumRays);
-        }
-        
-        if (mStoreInitialSamples)
-          {
-                cout << "Writing samples to file ... ";
-                ExportSamples(mVssRays);
-                cout << "finished\n" << endl;
-          }
-        
-        if (mUseViewcells) {
-          // construct view cells
-          if (!mLoadViewCells)
-                mViewCellsManager->Construct(mObjects, mVssRays);
-          // evaluate contributions of the intitial rays
-          mViewCellsManager->ComputeSampleContributions(mVssRays);
-          
-          
-          mStats <<
-                "#Pass\n" <<mPass<<endl<<
-                "#RssPass\n" <<rssPass<<endl<<
-                "#Time\n" << TimeDiff(startTime, GetTime())*1e-3<<endl<<
-                "#TotalSamples\n" <<totalSamples<<endl<<
-                "#RssSamples\n" <<rssSamples<<endl;
-          
-
-          mVssRays.PrintStatistics(mStats);
-          mViewCellsManager->PrintPvsStatistics(mStats);
-          
-          VssRayContainer selectedRays;
-          int desired = Max(
-                                                mViewCellsManager->GetPostProcessSamples(),
-                                                mViewCellsManager->GetVisualizationSamples());
-          
-          mVssRays.SelectRays(desired, selectedRays);
-          
-          //-- post process view cells
-          mViewCellsManager->PostProcess(mObjects, selectedRays);
-          
-          //-- several visualizations and statistics
-          Debug << "view cells after post processing: " << endl;
-          mViewCellsManager->PrintStatistics(Debug);
-          
-          if (1) 
-                mViewCellsManager->Visualize(mObjects, selectedRays);
-
-          ComputeRenderError();
-          
-        }
-
-
-  
-  rssPass++;
-  
-  rssTree = new RssTree;
-  rssTree->SetPass(mPass);
-  
-  /// compute view cell contribution of rays if view cells manager already constructed
-  mViewCellsManager->ComputeSampleContributions(mVssRays);
-
-  if (mUseImportanceSampling) {
-        
-        //      if (fromBoxVisibility)
-        //        rssTree->Construct(mObjects, mVssRays, mViewSpaceBox);
-        //      else
-        rssTree->Construct(mObjects, mVssRays);
-
-        rssTree->stat.Print(mStats);
-        cout<<"RssTree root PVS size = "<<rssTree->GetRootPvsSize()<<endl;
-        
-        if (mExportRssTree) {
-          ExportRssTree("rss-tree-100.x3d", rssTree, Vector3(1,0,0));
-          ExportRssTree("rss-tree-001.x3d", rssTree, Vector3(0,0,1));
-          ExportRssTree("rss-tree-101.x3d", rssTree, Vector3(1,0,1));
-          ExportRssTree("rss-tree-101m.x3d", rssTree, Vector3(-1,0,-1));
-          ExportRssTreeLeaves(rssTree, 10);
-        }
-        
-        if (mExportPvs) {
-          ExportPvs("rss-pvs-initial.x3d", rssTree);
-        }
-  }
-  
-  // viewcells->UpdatePVS(newVssRays);
-  
-
-  while (1) {
-        int num = mRssSamplesPerPass;
         SimpleRayContainer rays;
-        VssRayContainer vssRays;
-
-
-        if (!mUseImportanceSampling) {
-          for (int j=0; j < num; j++) {
-            //changed by matt
-                //Vector3 viewpoint = GetViewpoint(mViewSpaceBox); 
-                Vector3 viewpoint; 
-                mViewCellsManager->GetViewPoint(viewpoint);
-                Vector3 direction = GetDirection(viewpoint, mViewSpaceBox);
-                rays.push_back(SimpleRay(viewpoint, direction, 1.0f));
-                rays.mSumPdf += 1.0f;
-          }
-        } else {
-          num = GenerateImportanceRays(rssTree, num, rays);
-        }
-
-        rays.NormalizePdf();
-        
-        for (int i=0; i < rays.size(); i++)
-          CastRay(rays[i].mOrigin, rays[i].mDirection, rays[i].mPdf, vssRays);
-
-        
-        totalSamples += (int)rays.size();
-        rssSamples += (int)vssRays.size();
-
+
+        GenerateRays(mInitialSamples, SPATIAL_BOX_BASED_DISTRIBUTION, rays);
+        
+        CastRays(rays, mVssRays);
+  }
+  
+  cout << "#totalRayStackSize=" << (int)mVssRays.size() << endl <<flush;
+  
+  rssSamples += (int)mVssRays.size();
+  totalSamples += mInitialSamples;
+  mPass++;
+  
+  if (mExportRays) {
+        char filename[64];
+        sprintf(filename, "rss-rays-initial.x3d");
+        ExportRays(filename, mVssRays, mExportNumRays);
+  }
+  
+  if (mStoreInitialSamples) {
+        cout << "Writing samples to file ... ";
+        ExportSamples(mVssRays);
+        cout << "finished\n" << endl;
+  }
+        
+  if (mUseViewcells) {
+        // construct view cells
+        if (!mLoadViewCells)
+          mViewCellsManager->Construct(mObjects, mVssRays);
+
+        
+
+        // evaluate contributions of the intitial rays
+        mViewCellsManager->ComputeSampleContributions(mVssRays);
         
         
@@ -731 +504 @@
           "#TotalSamples\n" <<totalSamples<<endl<<
           "#RssSamples\n" <<rssSamples<<endl;
+        
+
+        mVssRays.PrintStatistics(mStats);
+        mViewCellsManager->PrintPvsStatistics(mStats);
+          
+        VssRayContainer selectedRays;
+        int desired = Max(
+                                          mViewCellsManager->GetPostProcessSamples(),
+                                          mViewCellsManager->GetVisualizationSamples());
+        
+        mVssRays.SelectRays(desired, selectedRays);
+          
+        //-- post process view cells
+        mViewCellsManager->PostProcess(mObjects, selectedRays);
+          
+        //-- several visualizations and statistics
+        Debug << "view cells after post processing: " << endl;
+        mViewCellsManager->PrintStatistics(Debug);
+        
+        if (1) 
+          mViewCellsManager->Visualize(mObjects, selectedRays);
+        
+        ComputeRenderError();
+  }
+  
+  rssPass++;
+  
+  mRssTree = new RssTree;
+  mRssTree->SetPass(mPass);
+  
+  /// compute view cell contribution of rays if view cells manager already constructed
+  mViewCellsManager->ComputeSampleContributions(mVssRays);
+
+  if (mUseImportanceSampling) {
+        
+        mRssTree->Construct(mObjects, mVssRays);
+        
+        mRssTree->stat.Print(mStats);
+        cout<<"RssTree root PVS size = "<<mRssTree->GetRootPvsSize()<<endl;
+        
+        if (mExportRssTree) {
+          ExportRssTree("rss-tree-100.x3d", mRssTree, Vector3(1,0,0));
+          ExportRssTree("rss-tree-001.x3d", mRssTree, Vector3(0,0,1));
+          ExportRssTree("rss-tree-101.x3d", mRssTree, Vector3(1,0,1));
+          ExportRssTree("rss-tree-101m.x3d", mRssTree, Vector3(-1,0,-1));
+          ExportRssTreeLeaves(mRssTree, 10);
+        }
+        
+        if (mExportPvs) {
+          ExportPvs("rss-pvs-initial.x3d", mRssTree);
+        }
+  }
+  
+  // viewcells->UpdatePVS(newVssRays);
+  
+
+  while (1) {
+        SimpleRayContainer rays;
+        VssRayContainer vssRays;
+        int castRays = 0;
+        if (mUseImportanceSampling) {
+          VssRayContainer tmpVssRays;
+          
+          GenerateRays(mRssSamplesPerPass/2, RSS_BASED_DISTRIBUTION, rays);
+          CastRays(rays, tmpVssRays);
+          castRays += rays.size();
+          float c1 = mViewCellsManager->ComputeSampleContributions(tmpVssRays, false);
+          mStats<<"#RssRelContrib"<<endl<<c1/rays.size()<<endl;
+
+          vssRays.insert(vssRays.end(), tmpVssRays.begin(), tmpVssRays.end() );
+          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();
+          
+          // add contributions of all rays at once...
+          mViewCellsManager->AddSampleContributions(vssRays);
+          
+        }
+        else {
+          int rayType = SPATIAL_BOX_BASED_DISTRIBUTION;
+          if (mObjectBasedSampling)
+                rayType = OBJECT_BASED_DISTRIBUTION;
+          else
+                if (mDirectionalSampling)
+                  rayType = DIRECTION_BASED_DISTRIBUTION;
+          
+          GenerateRays(mRssSamplesPerPass, rayType, rays);
+          CastRays(rays, vssRays);
+          castRays += rays.size();
+          if (mUseViewcells) {
+                /// compute view cell contribution of rays
+                mViewCellsManager->ComputeSampleContributions(vssRays);
+          }
+                
+          
+        }
+        totalSamples += castRays;
+        rssSamples += (int)vssRays.size();
+
+        cout<<"Generated "<<castRays<<" rays, progress "<<totalSamples/((float) mRssSamples +
+                                                                                                                                        mInitialSamples)<<"%\n";
+        
+        
+        mStats <<
+          "#Pass\n" <<mPass<<endl<<
+          "#RssPass\n" <<rssPass<<endl<<
+          "#Time\n" << TimeDiff(startTime, GetTime())*1e-3<<endl<<
+          "#TotalSamples\n" <<totalSamples<<endl<<
+          "#RssSamples\n" <<rssSamples<<endl;
 
 
         if (mUseViewcells) {
-          
-          /// compute view cell contribution of rays
-          mViewCellsManager->ComputeSampleContributions(vssRays);
-          
           vssRays.PrintStatistics(mStats);
           mViewCellsManager->PrintPvsStatistics(mStats);
@@ -770 +670 @@
         
         if (mUseImportanceSampling) {
-          rssTree->AddRays(vssRays);
-          
-          if (0) {
-                cout<<"############# Rss PVS STAT ##################\n";
-                cout<<"#AVG_RSS_PVS\n"<<rssTree->GetAvgPvsSize()<<endl;
-                cout<<"#RSS_ROOT_PVS\n"<<rssTree->GetRootPvsSize()<<endl;
-          }
-          
+          mRssTree->AddRays(vssRays);
           
           if (mUpdateSubdivision) {
                 int updatePasses = 1;
                 if (mPass % updatePasses == 0) {
-                  int subdivided = rssTree->UpdateSubdivision();
+                  int subdivided = mRssTree->UpdateSubdivision();
                   cout<<"subdivided leafs = "<<subdivided<<endl;
-                  cout<<"#total leaves = "<<rssTree->stat.Leaves()<<endl;
+                  cout<<"#total leaves = "<<mRssTree->stat.Leaves()<<endl;
                 }
           }
         }
-        
-
         
         if (mExportPvs) {
           char filename[64];
           sprintf(filename, "rss-pvs-%04d.x3d", rssPass);
-          ExportPvs(filename, rssTree);
-        }
-
+          ExportPvs(filename, mRssTree);
+        }
+        
         
         if (!mUseImportanceSampling) 
           CLEAR_CONTAINER(vssRays);
+        // otherwise the rays get deleted by the rss tree update according to RssTree.maxRays ....
 
         if (totalSamples >= mRssSamples + mInitialSamples)
@@ -807 +699 @@
         rssPass++;
         mPass++;
-        rssTree->SetPass(mPass);
+        mRssTree->SetPass(mPass);
   }
   
@@ -825 +717 @@
         
   }
-
-  cerr<<"Deleting RSS tree...\n";
-  delete rssTree;
-  cerr<<"Done.\n";
+  
+  Debug<<"Deleting RSS tree...\n";
+  delete mRssTree;
+  Debug<<"Done.\n";