Changeset 2035 for GTP/trunk/Lib/Vis/Preprocessing/src/SamplingPreprocessor.cpp

Timestamp:

01/23/07 14:13:43 (17 years ago)

Author:

bittner

Message:

merge

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/SamplingPreprocessor.cpp (modified) (8 diffs)

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

@@ -11 +11 @@
 #include "VssRay.h"
 #include "SamplingStrategy.h"
+#include "RayCaster.h"
 
 
@@ -25 +26 @@
 SamplingPreprocessor::~SamplingPreprocessor()
 {
-  CLEAR_CONTAINER(mSampleRays);
-  CLEAR_CONTAINER(mVssSampleRays);
 }
 
@@ -91 +90 @@
 
   map<ViewCell *, HaltonSequence> dirHalton;
-  
+  int lastEvaluation = 0;
+  SimpleRayContainer rays;
+  VssRayContainer vssRays;
+
   while (samples < mTotalSamples) {
-        for (int i=0; i < mSamplesPerEvaluation;) {
-          SimpleRayContainer rays;
-          VssRayContainer vssRays;
-          //      vector<ViewCell *> viewcells;
+        for (int i=0; i < mSamplesPerPass;) {
+          
+          mRayCaster->InitPass();
           
           float r[5];
@@ -107 +108 @@
           if (!viewcell || !viewcell->GetValid())
                 continue;
-          
+
+          rays.clear();
+          vssRays.clear();
+
           for (; rays.size() < 16; ) {
-                if (i%100000 == 0)
-                  cout<<"+";
+                if (i%100000 == 0) {
+                  cout<<samples/1e6f<<"M rays, progress: "<<samples*100/mTotalSamples<<" %   \r";
+                }
                 
-                //              dirHalton.GetNext(2, r);
                 dirHalton[viewcell].GetNext(2, r);
                 direction = UniformRandomVector(r[0],r[1]);
                 //direction = UniformRandomVector();
                 
-                //              viewcells.push_back(viewcell);
                 // cast rays in both directions to make the number of samples comparable
                 // with the global sampling method which also casts a "double" ray per sample
@@ -133 +136 @@
                            true);
           
-          //      if (vssRays.size()!=32) {
-          //            cerr<<"wrong number of rays "<<(int)vssRays.size()<<endl;
-          //            exit(1);
-          //      }
 
           rssSamples += vssRays.size();
@@ -147 +146 @@
                         float pdf = 1.0f;
                         //                      ViewCell *viewcell = viewcells[j/2];
-
+                        
                         ObjectPvs &pvs = viewcell->GetPvs();
                         pvs.AddSampleDirtyCheck(obj, pdf);
@@ -157 +156 @@
                 }
           
-          CLEAR_CONTAINER(vssRays);
-          
           if (samples > mTotalSamples)
                 break;
         }
 
-#if 0
-        Debug<<"Valid viewcells before set validity: "<<mViewCellsManager->CountValidViewcells()<<endl;
-        mViewCellsManager->SetValidity(0, intersectables/2);
-        Debug<<"Valid viewcells after set validity: "<<mViewCellsManager->CountValidViewcells()<<endl;
-#endif
-        
-        //      mVssRays.PrintStatistics(mStats);
-        mStats <<
-          "#Time\n" << TimeDiff(startTime, GetTime())*1e-3<<endl<<
-          "#TotalSamples\n" <<samples<<endl<<
-          "#RssSamples\n" <<rssSamples<<endl;
-                  
-        mViewCellsManager->PrintPvsStatistics(mStats);
-        // ComputeRenderError();
-  }
-  
+
+        if (samples - lastEvaluation >= mSamplesPerEvaluation) {
+          mViewCellsManager->PrintPvsStatistics(mStats);
+          mStats <<
+                "#Pass\n" <<mPass<<endl<<
+                "#Time\n" << TimeDiff(startTime, GetTime())<<endl<<
+                "#TotalSamples\n" <<samples<<endl<<
+                "#RssSamples\n" <<rssSamples<<endl;
+          lastEvaluation = samples;
+
+          if (renderer) {
+                ComputeRenderError();
+          }
+          
+        }
+  }
   if (0) {
         Exporter *exporter = Exporter::GetExporter("ray-density.x3d"); 
@@ -185 +182 @@
         delete exporter;
   }
-  
-  
-  // $$JB temporary removed
+        
+        
+        // $$JB temporary removed
   //    mViewCellsManager->PostProcess(objects, mSampleRays);