Changeset 466 for trunk/VUT/GtpVisibilityPreprocessor/src/VssPreprocessor.cpp

Timestamp:

12/14/05 19:38:39 (19 years ago)

Author:

bittner

Message:

changed the viewcellsmanager interface to use vssrays - some functionality like the bsp merging is now restricted

File:

• trunk/VUT/GtpVisibilityPreprocessor/src/VssPreprocessor.cpp (modified) (5 diffs)

trunk/VUT/GtpVisibilityPreprocessor/src/VssPreprocessor.cpp

@@ -42 +42 @@
                                                   )
 {
-  ray.intersections.clear();
+  ray.Clear();
   // do not store anything else then intersections at the ray
   ray.Init(point, direction, Ray::LOCAL_RAY);
@@ -450 +450 @@
   }
         
-  ObjectContainer objects;
-  mSceneGraph->CollectObjects(&objects);
+  mSceneGraph->CollectObjects(&mObjects);
 
   // construct view cells
-  mViewCellsManager->Construct(objects, mVssRays, mViewSpaceBox);
+  mViewCellsManager->Construct(mObjects, mVssRays, mViewSpaceBox);
 
   vssTree = new VssTree;
@@ -509 +508 @@
           num = GenerateImportanceRays(vssTree, num, rays);
         }
-                        
+        
         for (int i=0; i < rays.size(); i++)
           CastRay(rays[i].mOrigin, rays[i].mDirection, vssRays);
@@ -534 +533 @@
 
         //-- prepare traversal rays for view cell intersections
-        RayContainer passRays;
-
-        VssRayContainer::const_iterator it, it_end = vssRays.end();
-        
-        for (it = vssRays.begin(); it != it_end; ++ it)
-                passRays.push_back(new Ray(*(*it)));
-        
-        int sampleContributions = 0;
-        int contributingSamples = 0;
-
         /// compute view cell contribution of rays
-/*      mViewCellsManager->ComputeSampleContributions(passRays,
-                                                                                                  sampleContributions, 
-                                                                                                  contributingSamples);
-        
-        //-- save rays for post processing
-        if (((int)storedRays.size() < mViewCellsManager->GetPostProcessSamples()) ||
-                ((int)storedRays.size() < mViewCellsManager->GetVisualizationSamples()))
-        {
-                RayContainer::const_iterator it, it_end = passRays.end();
-
-                for (it = passRays.begin(); it != it_end; ++ it)
-                        storedRays.push_back(new Ray(*(*it)));
-        }
-        else
-        {
-                CLEAR_CONTAINER(passRays);
-        }
-*/
+        mViewCellsManager->ComputeSampleContributions(vssRays);
+
         samples+=num;
         float pvs = vssTree->GetAvgPvsSize();
         cout<<"*****************************\n";
         cout<<samples<<" avgPVS ="<<pvs<<endl;
-        cout<<"sample contributions ="<<sampleContributions<<endl;
-        cout<<"contributing sample ="<<contributingSamples<<endl;
         cout<<"VssTree root PVS size = "<<vssTree->GetRootPvsSize()<<endl;
         cout<<"*****************************\n";
@@ -576 +547 @@
   }
 
-  cout << "here" << endl;
-  //-- post process view cells
-  mViewCellsManager->PostProcess(objects, storedRays);
-
-  //-- several visualizations and statistics
-  mViewCellsManager->PrintStatistics(Debug);
+  {
+        VssRayContainer storedRays;
+        vssTree->CollectRays(storedRays, Max(
+                                                                                 mViewCellsManager->GetPostProcessSamples(),
+                                                                                 mViewCellsManager->GetVisualizationSamples()));
+        
+        //-- post process view cells
+        mViewCellsManager->PostProcess(mObjects, storedRays);
+        
+        //-- several visualizations and statistics
+        mViewCellsManager->PrintStatistics(Debug);
+
+        mViewCellsManager->Visualize(mObjects, storedRays);
+
+        CLEAR_CONTAINER(storedRays);
+  }
 
   //-- render simulation after merge
   cout << "\nevaluating bsp view cells render time after merge ... ";
-                 
+  
   const SimulationStatistics ss = mViewCellsManager->SimulateRendering();
-                 
+  
   cout << " finished" << endl;
   cout << ss << endl;
   Debug << ss << endl;
-
-  mViewCellsManager->Visualize(objects, storedRays);
-
-  CLEAR_CONTAINER(storedRays);
+  
   
   delete vssTree;
-
+  
   return true;
 }