Changeset 574 for trunk/VUT/GtpVisibilityPreprocessor/src/VssPreprocessor.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/VssPreprocessor.cpp (modified) (7 diffs)

trunk/VUT/GtpVisibilityPreprocessor/src/VssPreprocessor.cpp

@@ -27 +27 @@
   environment->GetIntValue("VssPreprocessor.vssSamplesPerPass", mVssSamplesPerPass);
   environment->GetBoolValue("VssPreprocessor.useImportanceSampling", mUseImportanceSampling);
-  environment->GetBoolValue("ViewCells.delayedConstruction", mDelayedViewCellsConstruction);
-
+ 
   environment->GetBoolValue("VssPreprocessor.loadInitialSamples", mLoadInitialSamples);
   environment->GetBoolValue("VssPreprocessor.storeInitialSamples", mStoreInitialSamples);
@@ -54 +53 @@
   ray.Init(point, direction, Ray::LOCAL_RAY);
 }
+
+
+void
+VssPreprocessor::CastRays(
+                                                  SimpleRayContainer &rays,
+                                                  VssRayContainer &vssRays
+                                                  )
+{
+  for (int i=0; i < rays.size(); i++)
+        CastRay(rays[i].mOrigin, rays[i].mDirection, vssRays);
+}
+
 
 int
@@ -529 +540 @@
           mViewCellsManager->LoadViewCells(mViewCellsFilename, &mObjects);
   }
-
+  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);
+  }
+        
 
   VssTree *vssTree = NULL;
@@ -634 +654 @@
   }
 
-  /// compute view cell contribution of rays if view cells manager already constructed
-  mViewCellsManager->ComputeSampleContributions(mVssRays);
-
-  // construct view cells
-  if (!mDelayedViewCellsConstruction)
-        mViewCellsManager->Construct(mObjects, mVssRays);
- 
   vssTree = new VssTree;
   // viewcells = Construct(mVssRays);
@@ -712 +725 @@
         cout<<"Average PVS size = "<<avgPvs<<endl;
 
-        // construct view cells after vss
-        if (!mViewCellsManager->ViewCellsConstructed() && 
-                (samples + mInitialSamples >= mViewCellsManager->GetConstructionSamples()))
-        {
-                Debug << "samples " << samples << " initial " << mInitialSamples << " " << samples + mInitialSamples << endl;
-                VssRayContainer constructionRays;
-                vssTree->CollectRays(constructionRays, mViewCellsManager->GetConstructionSamples());
-
-                Debug << "collected rays: " << constructionRays.size() << endl;
-
-                // test if we really have enough rays
-                //if (constructionRays.size() >= nSamples) 
-                mViewCellsManager->Construct(mObjects, constructionRays);
-        }
-
         /// compute view cell contribution of rays
-        mViewCellsManager->ComputeSampleContributions(vssRays);
+        mViewCellsManager->ComputeSampleContributions(vssRays, true, false);
         
         if (numExportRays) {
@@ -750 +748 @@
   }
 
-
-  // at the latest create view cells here
-  if (!mViewCellsManager->ViewCellsConstructed())
-  {
-          VssRayContainer constructionRays;
-
-          vssTree->CollectRays(constructionRays, 
-                                                   mViewCellsManager->GetConstructionSamples());
-          Debug << "collected rays: " << constructionRays.size() << endl;
-
-          mViewCellsManager->Construct(mObjects, constructionRays);
-  }
-
-  Debug << vssTree->stat << endl;
-  VssRayContainer viewCellRays;
-  
-  // compute rays used for view cells construction
-  int numRays = Max(mViewCellsManager->GetPostProcessSamples(),
-                                        mViewCellsManager->GetVisualizationSamples());
-
-  vssTree->CollectRays(viewCellRays, numRays);
-  
-  //-- post process view cells
-  mViewCellsManager->PostProcess(mObjects, viewCellRays);
-
   if (mTestBeamSampling && mUseGlRenderer)
   {     
@@ -780 +753 @@
   }
 
-  //-- several visualizations and statistics
-  Debug << "\nview cells after post processing: " << endl;
-  mViewCellsManager->PrintStatistics(Debug);
-
-  mViewCellsManager->Visualize(mObjects, viewCellRays);
-  
+  Debug << vssTree->stat << endl;
+
+  if (0)
+  {
+        VssRayContainer viewCellRays;
+  
+        // compute rays used for view cells construction
+        const int numRays = mViewCellsManager->GetVisualizationSamples();
+
+        vssTree->CollectRays(viewCellRays, numRays);
+  }
+
   //-- render simulation after merge
-  cout << "\nevaluating bsp view cells render time after merge ... ";
+  cout << "\nevaluating bsp view cells render time after sampling ... ";
   mRenderSimulator->RenderScene();
   SimulationStatistics ss;