Changeset 1112 for GTP/trunk/Lib/Vis/Preprocessing/src/RssPreprocessor.cpp

Timestamp:

07/10/06 19:21:19 (18 years ago)

Author:

bittner

Message:

Merge with Olivers code

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/RssPreprocessor.cpp (modified) (20 diffs)

GTP/trunk/Lib/Vis/Preprocessing/src/RssPreprocessor.cpp

@@ -23 +23 @@
 static bool fromBoxVisibility = false;
 
-
+#define ADD_RAYS_IN_PLACE 0
+  
 RssPreprocessor::RssPreprocessor():
   mPass(0),
@@ -67 +68 @@
           GenerateImportanceRays(mRssTree, number, rays);
           result = true;
-          //      rays.NormalizePdf();
         }
         break;
@@ -75 +75 @@
   }
 
+  //  rays.NormalizePdf();
+  
   return result;
 }
@@ -120 +122 @@
   int hits = 0;
   static Ray ray;
-  AxisAlignedBox3 box = mKdTree->GetBox();
+  //  AxisAlignedBox3 box = Union(mKdTree->GetBox(), mViewCellsManager->GetViewSpaceBox());
+
+  AxisAlignedBox3 box = mViewCellsManager->GetViewSpaceBox();
 
   AxisAlignedBox3 sbox = box;
@@ -284 +288 @@
   } else {
         int leaves = rssTree->stat.Leaves()/1;
+        
         num = rssTree->GenerateRays(desiredSamples, leaves, rays);
   }
@@ -302 +307 @@
   Exporter *exporter = NULL;
   exporter = Exporter::GetExporter(filename);
-  //    exporter->SetWireframe();
-  //    exporter->ExportKdTree(*mKdTree);
+  if (0) {
+        exporter->SetWireframe();
+        exporter->ExportKdTree(*mKdTree);
+  }
   exporter->SetFilled();
   // $$JB temporarily do not export the scene
@@ -310 +317 @@
   exporter->SetWireframe();
 
-  if (mViewSpaceBox) {
+  if (1 || mViewSpaceBox) {
         exporter->SetForcedMaterial(RgbColor(1,0,1));
-        exporter->ExportBox(*mViewSpaceBox);
+        exporter->ExportBox(mViewCellsManager->GetViewSpaceBox());
         exporter->ResetForcedMaterial();
   }
-        
+  
   VssRayContainer rays;
   
-  vssRays.SelectRays( number, rays);
+  vssRays.SelectRays(number, rays);
 
   exporter->ExportRays(rays, RgbColor(1, 0, 0));
+        
+  delete exporter;
+
+  cout<<"done."<<endl<<flush;
+
+  return true;
+}
+
+bool
+RssPreprocessor::ExportRayAnimation(const char *filename,
+                                                                        const vector<VssRayContainer> &vssRays
+                                                                        )
+{
+  cout<<"Exporting vss rays..."<<endl<<flush;
+        
+  Exporter *exporter = NULL;
+  exporter = Exporter::GetExporter(filename);
+  if (0) {
+        exporter->SetWireframe();
+        exporter->ExportKdTree(*mKdTree);
+  }
+  exporter->SetFilled();
+  // $$JB temporarily do not export the scene
+  if (1)
+        exporter->ExportScene(mSceneGraph->mRoot);
+  exporter->SetWireframe();
+
+  if (1 || mViewSpaceBox) {
+        exporter->SetForcedMaterial(RgbColor(1,0,1));
+        exporter->ExportBox(mViewCellsManager->GetViewSpaceBox());
+        exporter->ResetForcedMaterial();
+  }
+  
+  exporter->ExportRaySets(vssRays, RgbColor(1, 0, 0));
         
   delete exporter;
@@ -459 +500 @@
 }
 
-
+void
+NormalizeRatios(float ratios[3])
+{
+  int i;
+  float sumRatios;
+  sumRatios = ratios[0] + ratios[1] + ratios[2];
+  if (sumRatios == 0.0f) {
+        ratios[0] = ratios[1] = ratios[2] = 1.0f;
+        sumRatios = 3.0f;
+  }
+  
+  for (i=0 ; i < 3; i++)
+        ratios[i]/=sumRatios;
+#define MIN_RATIO 0.03f
+  for (i=0 ; i < 3; i++)
+        if (ratios[i] < MIN_RATIO)
+          ratios[i] = MIN_RATIO;
+
+  sumRatios = ratios[0] + ratios[1] + ratios[2];
+  for (i=0 ; i < 3; i++)
+        ratios[i]/=sumRatios;
+  
+}
 
 bool
@@ -472 +535 @@
   Randomize(0);
   
-        
+  vector<VssRayContainer> rayBuffer(50);
+  
   long startTime = GetTime();
   
@@ -480 +544 @@
 
   // if not already loaded, construct view cells from file
-  if (!mLoadViewCells) {        
-
-        if (0) 
+  if (!mLoadViewCells)
+  {
+        if (1) 
           mViewCellsManager->SetViewSpaceBox(mKdTree->GetBox());
         else {
           AxisAlignedBox3 box = mKdTree->GetBox();
-          float s = box.Size(0);
-          box.Scale(0.1f);
-          box.SetMin(0, box.Min(0) + s);
-          box.SetMax(0, box.Max(0) + s);
+          
+          if (1) {
+                // use a small box outside of the scene
+                box.Scale(Vector3(0.1f,0.5f,0.5f));
+                box.Translate(Vector3(Magnitude(mKdTree->GetBox().Size())*0.5, 0, 0));
+          } else {
+                float s = box.Size(0);
+                box.Scale(0.1f);
+                box.SetMin(0, box.Min(0) + s);
+                box.SetMax(0, box.Max(0) + s);
+          }
          
           mViewCellsManager->SetViewSpaceBox(box);
         }
-
-          // construct view cells using it's own set of samples
-          mViewCellsManager->Construct(this);
-
-          //-- several visualizations and statistics
-          Debug << "view cells construction finished: " << endl;
-          mViewCellsManager->PrintStatistics(Debug);
-  }
-
-
+        
+        // construct view cells using it's own set of samples
+        mViewCellsManager->Construct(this);
+        
+        //-- several visualizations and statistics
+        Debug << "view cells construction finished: " << endl;
+        mViewCellsManager->PrintStatistics(Debug);
+  }
+  
+  
   int rssPass = 0;
   int rssSamples = 0;
@@ -515 +586 @@
         cout<<"Generating initial rays..."<<endl<<flush;
 
-        GenerateRays(mInitialSamples/4, SPATIAL_BOX_BASED_DISTRIBUTION, rays);
-        GenerateRays(mInitialSamples/4, OBJECT_BASED_DISTRIBUTION, rays);
-        GenerateRays(mInitialSamples/4, DIRECTION_BASED_DISTRIBUTION, rays);
-        GenerateRays(mInitialSamples/4, OBJECT_DIRECTION_BASED_DISTRIBUTION, rays);
-        
+        GenerateRays(mInitialSamples/3, SPATIAL_BOX_BASED_DISTRIBUTION, rays);
+        GenerateRays(mInitialSamples/3, OBJECT_BASED_DISTRIBUTION, rays);
+        GenerateRays(mInitialSamples/3, DIRECTION_BASED_DISTRIBUTION, rays);
+        //      GenerateRays(mInitialSamples/4, OBJECT_DIRECTION_BASED_DISTRIBUTION, rays);
+
         cout<<"Casting initial rays..."<<endl<<flush;
         CastRays(rays, mVssRays);
@@ -537 +608 @@
         sprintf(filename, "rss-rays-initial.x3d");
         ExportRays(filename, mVssRays, mExportNumRays);
+
+        mVssRays.SelectRays(mExportNumRays, rayBuffer[0], true);
         
   }
@@ -562 +635 @@
         {
           VssRayContainer contributingRays;
-          mVssRays.GetContributingRays(contributingRays, mPass);
+          mVssRays.GetContributingRays(contributingRays, 0);
           mStats<<"#NUM_CONTRIBUTING_RAYS\n"<<(int)contributingRays.size()<<endl;
+          if (mExportRays) {
+                char filename[64];
+                sprintf(filename, "rss-crays-%04d.x3d", 0);
+                ExportRays(filename, contributingRays, mExportNumRays);
+          }
         }
         
@@ -615 +693 @@
           VssRayContainer tmpVssRays;
 
-          float ratios[] = {0.8f,0.1f,0.1f};
-
+          static float ratios[] = {0.9f,0.05f,0.05f};
+          //float ratios[] = {1.0f,0.0f,0.0f};
+          
+          int nrays[3];
+          float contributions[3];
+          float times[3];
+          
+          long t1, t2;
+
+          t1 = GetTime();
+          
           GenerateRays(mRssSamplesPerPass*ratios[0], RSS_BASED_DISTRIBUTION, rays);
+
+          rays.NormalizePdf(rays.size());
+          
           CastRays(rays, tmpVssRays);
           castRays += rays.size();
-          float c1 = mViewCellsManager->ComputeSampleContributions(tmpVssRays, false, true);
-          mStats<<"#RssRelContrib"<<endl<<c1/rays.size()<<endl;
-
+#if ADD_RAYS_IN_PLACE 
+          contributions[0] = mViewCellsManager->ComputeSampleContributions(tmpVssRays, true, false);
+#else
+          contributions[0] = mViewCellsManager->ComputeSampleContributions(tmpVssRays, false, true);
+#endif
+          times[0] = TimeDiff(t1, GetTime());
+          nrays[0] = rays.size();
+          
+          mStats<<"#RssRelContrib"<<endl<<contributions[0]/nrays[0]<<endl;
+          
           vssRays.insert(vssRays.end(), tmpVssRays.begin(), tmpVssRays.end() );
           rays.clear();
           tmpVssRays.clear();
-
           if (ratios[1]!=0.0f) {
+                t1 = GetTime();
                 GenerateRays(mRssSamplesPerPass*ratios[1], SPATIAL_BOX_BASED_DISTRIBUTION, rays);
                 CastRays(rays, tmpVssRays);
                 castRays += rays.size();
-                float c2 = mViewCellsManager->ComputeSampleContributions(tmpVssRays, false, true);
-                mStats<<"#SpatialRelContrib"<<endl<<c2/rays.size()<<endl;
+#if ADD_RAYS_IN_PLACE 
+                contributions[1] = mViewCellsManager->ComputeSampleContributions(tmpVssRays, true, false);
+#else
+                contributions[1] = mViewCellsManager->ComputeSampleContributions(tmpVssRays, false, true);
+#endif
+          times[1] = TimeDiff(t1, GetTime());
+          nrays[1] = rays.size();
+
+          mStats<<"#SpatialRelContrib"<<endl<<contributions[1]/nrays[1]<<endl;
                 
                 vssRays.insert(vssRays.end(), tmpVssRays.begin(), tmpVssRays.end() );
@@ -642 +746 @@
           
           if (ratios[2]!=0.0f) {
+                t1 = GetTime();
                 GenerateRays(mRssSamplesPerPass*ratios[2], DIRECTION_BASED_DISTRIBUTION, rays);
                 CastRays(rays, tmpVssRays);
                 castRays += rays.size();
-                float c3 = mViewCellsManager->ComputeSampleContributions(tmpVssRays, false, true);
-                mStats<<"#DirectionalRelContrib"<<endl<<c3/rays.size()<<endl;
+#if ADD_RAYS_IN_PLACE 
+                contributions[2] = mViewCellsManager->ComputeSampleContributions(tmpVssRays, true, false);
+#else
+                contributions[2] = mViewCellsManager->ComputeSampleContributions(tmpVssRays, false, true);
+#endif
+                times[2] = TimeDiff(t1, GetTime());
+                nrays[2] = rays.size();
+                
+                mStats<<"#DirectionalRelContrib"<<endl<<contributions[2]/nrays[2]<<endl;
                 
                 vssRays.insert(vssRays.end(), tmpVssRays.begin(), tmpVssRays.end() );
@@ -654 +766 @@
           }
           
+          
+          // now evaluate the ratios for the next pass
+#define TIMES 0
+
+#if TIMES
+          ratios[0] = sqr(contributions[0]/times[0]);
+          ratios[1] = sqr(contributions[1]/times[1]);
+          ratios[2] = sqr(contributions[2]/times[2]);
+#else
+          ratios[0] = sqr(contributions[0]/nrays[0]);
+          ratios[1] = sqr(contributions[1]/nrays[1]);
+          ratios[2] = sqr(contributions[2]/nrays[2]);
+#endif
+          NormalizeRatios(ratios);
+
+          cout<<"New ratios: "<<ratios[0]<<" "<<ratios[1]<<" "<<ratios[2]<<endl;
+          
           // add contributions of all rays at once...
+#if !ADD_RAYS_IN_PLACE 
           mViewCellsManager->AddSampleContributions(vssRays);
-          
+#endif    
         }
         else {
@@ -723 +853 @@
                 sprintf(filename, "rss-rays-%04d.x3d", rssPass);
           
+          
+
+          vssRays.SelectRays(mExportNumRays, rayBuffer[mPass], true);
+          
           ExportRays(filename, vssRays, mExportNumRays);
-
+          
           // now export all contributing rays
           VssRayContainer contributingRays;
@@ -731 +865 @@
           sprintf(filename, "rss-crays-%04d.x3d", rssPass);
           ExportRays(filename, contributingRays, mExportNumRays);
+          
         }
 
@@ -798 +933 @@
         
   }
-  
+
+
+  if (mExportRays && mUseImportanceSampling) {
+        char filename[64];
+        sprintf(filename, "rss-rays-i.x3d");
+        
+        rayBuffer.resize(mPass);
+        ExportRayAnimation(filename, rayBuffer);
+  }
+          
   Debug<<"Deleting RSS tree...\n";
   delete mRssTree;
@@ -804 +948 @@
 
 
-  //  mViewCellsManager->ExportViewCells("visibility.xml",
+  // mViewCellsManager->ExportViewCells("visibility.xml",
   //                                                                     true);