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

trunk/VUT/GtpVisibilityPreprocessor/src/RssPreprocessor.cpp

@@ -525 +525 @@
 
   // viewcells->UpdatePVS(newVssRays);
-  // get viewcells as kd tree boxes
-  vector<AxisAlignedBox3> kdViewcells;
-
-  if (0) {
-        vector<KdLeaf *> leaves;
-        mKdTree->CollectLeaves(leaves);
-        vector<KdLeaf *>::const_iterator it;
-        int targetLeaves = 50;
-        float prob = targetLeaves/(float)leaves.size();
-        for (it = leaves.begin(); it != leaves.end(); ++it)
-          if (RandomValue(0.0f,1.0f) < prob)
-                kdViewcells.push_back(mKdTree->GetBox(*it));
-                
-        float avgPvs = GetAvgPvsSize(rssTree, kdViewcells);
-        cout<<"Initial average PVS size = "<<avgPvs<<endl;
-  }
-
-        
+  
   int samples = 0;
   int pass = 0;
@@ -563 +546 @@
         for (int i=0; i < rays.size(); i++)
           CastRay(rays[i].mOrigin, rays[i].mDirection, vssRays);
-                
+        
+        if (mUseViewcells) {
+          
+          
+          /// compute view cell contribution of rays
+          mViewCellsManager->ComputeSampleContributions(vssRays
+                                                                                                        );
+          
+          
+          float pvs = rssTree->GetAvgPvsSize();
+          cout<<"*****************************\n";
+          cout<<samples<<" avgPVS ="<<pvs<<endl;
+          cout<<"RssTree root PVS size = "<<rssTree->GetRootPvsSize()<<endl;
+          cout<<"*****************************\n";
+        }
+
+
+
         rssTree->AddRays(vssRays);
-                
+        
         if (mUpdateSubdivision) {
           int subdivided = rssTree->UpdateSubdivision();
           cout<<"subdivided leafs = "<<subdivided<<endl;
           cout<<"#total leaves = "<<rssTree->stat.Leaves()<<endl;
-
         }
 
         if (mUseViewcells) {
-          float avgPvs = GetAvgPvsSize(rssTree, kdViewcells);
-          cout<<"Average PVS size = "<<avgPvs<<endl;
+          //      float avgPvs = GetAvgPvsSize(rssTree, kdViewcells);
+          //      cout<<"Average PVS size = "<<avgPvs<<endl;
         }
 
@@ -590 +589 @@
         samples+=num;
 
-        if (mUseViewcells) {
-          
-          //-- 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);
-                }
-          
-          float pvs = rssTree->GetAvgPvsSize();
-          cout<<"*****************************\n";
-          cout<<samples<<" avgPVS ="<<pvs<<endl;
-          cout<<"sample contributions ="<<sampleContributions<<endl;
-          cout<<"contributing sample ="<<contributingSamples<<endl;
-          cout<<"RssTree root PVS size = "<<rssTree->GetRootPvsSize()<<endl;
-          cout<<"*****************************\n";
-        }
         
         if (mExportPvs) {
@@ -645 +604 @@
   
   if (mUseViewcells) {
+
+        VssRayContainer storedRays;
+        rssTree->CollectRays(storedRays, Max(
+                                                                                 mViewCellsManager->GetPostProcessSamples(),
+                                                                                 mViewCellsManager->GetVisualizationSamples()));
         
         //-- post process view cells
@@ -651 +615 @@
         //-- several visualizations and statistics
         mViewCellsManager->PrintStatistics(Debug);
-        
-        //-- render simulation after merge
-        cout << "\nevaluating render time of final view cells ... ";
-        
-        const SimulationStatistics ss = mViewCellsManager->SimulateRendering();
-        
-        cout << " finished" << endl;
-        
-        cout << ss << endl;
-        Debug << ss << endl;
-        
+
         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;
+
+  }
+
   delete rssTree;