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

Timestamp:

01/25/06 01:44:46 (18 years ago)

Author:

mattausch

Message:

finished function for view cell construction
removed bsp rays from vspbspmanager

File:

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

trunk/VUT/GtpVisibilityPreprocessor/src/RssPreprocessor.cpp

@@ -441 +441 @@
 
   }
+  else
+  {
+          // construct view cells using it's own set of samples
+          mViewCellsManager->Construct(this);
+
+          //-- several visualizations and statistics
+          Debug << "view cells after construction: " << endl;
+          mViewCellsManager->PrintStatistics(Debug);
+  }
   
   int rssPass = 0;
@@ -476 +485 @@
         
   if (mUseViewcells) {
-        // construct view cells
-        if (!mLoadViewCells)
-          mViewCellsManager->Construct(mObjects, mVssRays);
-
-        
 
         // evaluate contributions of the intitial rays
-        mViewCellsManager->ComputeSampleContributions(mVssRays);
+        mViewCellsManager->ComputeSampleContributions(mVssRays, true, false);
         
         
@@ -502 +506 @@
         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);
-
         // viewcells->UpdatePVS(newVssRays);
         Debug<<"Valid viewcells before set validity: "<<mViewCellsManager->CountValidViewcells()<<endl;
@@ -534 +521 @@
   
   /// compute view cell contribution of rays if view cells manager already constructed
-  mViewCellsManager->ComputeSampleContributions(mVssRays);
+  mViewCellsManager->ComputeSampleContributions(mVssRays, true, false);
 
   if (mUseImportanceSampling) {
@@ -571 +558 @@
           CastRays(rays, tmpVssRays);
           castRays += rays.size();
-          float c1 = mViewCellsManager->ComputeSampleContributions(tmpVssRays, false);
+          float c1 = mViewCellsManager->ComputeSampleContributions(tmpVssRays, false, true);
           mStats<<"#RssRelContrib"<<endl<<c1/rays.size()<<endl;
 
@@ -582 +569 @@
                 CastRays(rays, tmpVssRays);
                 castRays += rays.size();
-                float c2 = mViewCellsManager->ComputeSampleContributions(tmpVssRays, false);
+                float c2 = mViewCellsManager->ComputeSampleContributions(tmpVssRays, false, true);
                 mStats<<"#SpatialRelContrib"<<endl<<c2/rays.size()<<endl;
                 
@@ -596 +583 @@
                 CastRays(rays, tmpVssRays);
                 castRays += rays.size();
-                float c3 = mViewCellsManager->ComputeSampleContributions(tmpVssRays, false);
+                float c3 = mViewCellsManager->ComputeSampleContributions(tmpVssRays, false, true);
                 mStats<<"#DirectionalRelContrib"<<endl<<c3/rays.size()<<endl;
                 
@@ -622 +609 @@
           if (mUseViewcells) {
                 /// compute view cell contribution of rays
-                mViewCellsManager->ComputeSampleContributions(vssRays);
+                mViewCellsManager->ComputeSampleContributions(vssRays, true, false);
           }
                 
@@ -646 +633 @@
           mViewCellsManager->PrintPvsStatistics(mStats);
         }
-
-
+        
         ComputeRenderError();
         
@@ -709 +695 @@
   if (mUseViewcells) {
 
-        
-        //-- render simulation after merge
-        cout << "\nevaluating bsp view cells render time after merge ... ";
-        
-        mRenderSimulator->RenderScene();
-        SimulationStatistics ss;
-        mRenderSimulator->GetStatistics(ss);
-        
-        cout << " finished" << endl;
-        cout << ss << endl;
-        Debug << ss << endl;
+          if(0)
+          {
+                  VssRayContainer selectedRays;
+                  int desired = mViewCellsManager->GetVisualizationSamples();
+
+                  mVssRays.SelectRays(desired, selectedRays);
+
+                  mViewCellsManager->Visualize(mObjects, selectedRays);
+          }
+          
+          // view cells after sampling
+          mViewCellsManager->PrintStatistics(Debug);
+      
+          //-- render simulation after merge
+          cout << "\nevaluating bsp view cells render time after sampling ... ";
+          
+          mRenderSimulator->RenderScene();
+          SimulationStatistics ss;
+          mRenderSimulator->GetStatistics(ss);
+          
+          cout << " finished" << endl;
+          cout << ss << endl;
+          Debug << ss << endl;
         
   }