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

Timestamp:

01/10/07 21:32:50 (18 years ago)

Author:

bittner

Message:

samplign preprocessor updates, merge

File:

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

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

@@ -20 +20 @@
 {
   // this should increase coherence of the samples
-  Environment::GetSingleton()->GetIntValue("SamplingPreprocessor.samplesPerPass", mSamplesPerPass);
-  Environment::GetSingleton()->GetIntValue("SamplingPreprocessor.totalSamples", mTotalSamples);
   
 }
@@ -87 +85 @@
   int intersectables, faces;
   mSceneGraph->GetStatistics(intersectables, faces);
-  HaltonSequence halton;
+  HaltonSequence posHalton;
   
   int samples = 0;
-  int i=0;
+  int rssSamples = 0;
+
+  map<ViewCell *, HaltonSequence> dirHalton;
+  
   while (samples < mTotalSamples) {
-        for (i=0; i < mSamplesPerPass;) {
+        for (int i=0; i < mSamplesPerEvaluation;) {
           SimpleRayContainer rays;
           VssRayContainer vssRays;
-          vector<ViewCell *> viewcells;
+          //      vector<ViewCell *> viewcells;
+          
+          float r[5];
+          Vector3 origin, direction;
+          posHalton.GetNext(3, r);
+
+          mViewCellsManager->GetViewPoint(origin, Vector3(r[0], r[1], r[2]));
+          ViewCell *viewcell = mViewCellsManager->GetViewCell(origin);
+          
+          if (!viewcell || !viewcell->GetValid())
+                continue;
+          
           for (; rays.size() < 16; ) {
-                if (i%10000 == 0)
+                if (i%100000 == 0)
                   cout<<"+";
-
-                float r[5];
-                halton.GetNext(5, r);
-                Vector3 origin, direction;
-                mViewCellsManager->GetViewPoint(origin, Vector3(r[0], r[1], r[2]));
                 
-                direction = UniformRandomVector(r[3],r[4]);
-                ViewCell *viewcell = mViewCellsManager->GetViewCell(origin);
+                //              dirHalton.GetNext(2, r);
+                dirHalton[viewcell].GetNext(2, r);
+                direction = UniformRandomVector(r[0],r[1]);
+                //direction = UniformRandomVector();
                 
-                if (viewcell && viewcell->GetValid()) {
-                  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
-                  rays.push_back(SimpleRay(origin,
-                                                                   direction,
-                                                                   SamplingStrategy::DIRECTION_BASED_DISTRIBUTION,
-                                                                   1.0f));
-                  i++;
-                  samples++;
-                }
+                //              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
+                rays.push_back(SimpleRay(origin,
+                                                                 direction,
+                                                                 SamplingStrategy::DIRECTION_BASED_DISTRIBUTION,
+                                                                 1.0f));
+                i++;
+                samples++;
           }
           
@@ -124 +131 @@
                            vssRays,
                            true,
-                           false);
-
-          if (vssRays.size()!=32) {
-                cerr<<"wrong number of rays "<<(int)vssRays.size()<<endl;
-                exit(1);
-          }
-                
+                           true);
+          
+          //      if (vssRays.size()!=32) {
+          //            cerr<<"wrong number of rays "<<(int)vssRays.size()<<endl;
+          //            exit(1);
+          //      }
+
+          rssSamples+=vssRays.size();
           for (int j=0; j < vssRays.size(); j++)
                 if (vssRays[j]->mFlags & VssRay::Valid) {
@@ -137 +145 @@
                   if (obj) {
                         // if ray not outside of view space
-                        float contribution;
-                        int pvsContribution = 0;
-                        float relativePvsContribution = 0;
                         float pdf = 1.0f;
-                        ViewCell *viewcell = viewcells[j/2];
-                        if (viewcell->GetPvs().GetSampleContribution(obj,
-                                                                                                                 pdf,
-                                                                                                                 contribution)) 
-                          ++pvsContribution;
-                        relativePvsContribution += contribution;
-                        viewcell->GetPvs().AddSample(obj, pdf);
+                        //                      ViewCell *viewcell = viewcells[j/2];
+
+                        ObjectPvs &pvs = viewcell->GetPvs();
+                        pvs.AddSampleDirtyCheck(obj, pdf);
+                        
+                        if (pvs.RequiresResort())  {
+                          pvs.SimpleSort();
+                        }
                   }
                 }
           
           CLEAR_CONTAINER(vssRays);
-
+          
           if (samples > mTotalSamples)
                 break;
@@ -166 +172 @@
         mStats <<
           "#Time\n" << TimeDiff(startTime, GetTime())*1e-3<<endl<<
-          "#TotalSamples\n" <<samples<<endl;
-
+          "#TotalSamples\n" <<samples<<endl<<
+          "#RssSamples\n" <<rssSamples<<endl;
+                  
         mViewCellsManager->PrintPvsStatistics(mStats);
         // ComputeRenderError();