Changeset 448 for trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellsManager.cpp

Timestamp:

12/05/05 04:42:54 (19 years ago)

Author:

mattausch

Message:

fixed bug in VspBspTree?
view cells in VssPreprocessor?
bounding rays for vspkdtree

File:

• trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellsManager.cpp (modified) (34 diffs)

trunk/VUT/GtpVisibilityPreprocessor/src/ViewCellsManager.cpp

@@ -68 +68 @@
 
 void ViewCellsManager::ComputeSampleContributions(const RayContainer &rays, 
-                                                                                                  const bool castRays,
                                                                                                   int &sampleContributions,
-                                                                                                  int &contributingSamples)
+                                                                                                  int &contributingSamples,
+                                                                                                  const bool castRays)
 {
         // view cells not yet constructed
@@ -168 +168 @@
 SimulationStatistics ViewCellsManager::SimulateRendering() const
 {
-        if (!ViewCellsConstructed())
+        if (!ViewCellsConstructed() || !mRenderSimulator)
                 return SimulationStatistics();
 
@@ -240 +240 @@
                 return 0;
 
-        Debug << "Constructing bsp view cells" << endl;
-
         int sampleContributions = 0;
         
@@ -247 +245 @@
 
         int limit = min (mConstructionSamples, (int)rays.size());
+
+        // construct view cells using the collected samples
+        Debug << "construcing bsp view cells from " 
+                  << limit << " samples " << endl;
 
     for (int i = 0; i < limit; ++ i)
@@ -332 +334 @@
         int pvsSize = 0;
 
-        BspViewCellsStatistics stat;
-        mBspTree->EvaluateViewCellsStats(stat);
-        Debug << "original view cell partition:\n" << stat << endl;
-                
-        if (1) // export view cells
+        BspViewCellsStatistics vcStats;
+        mBspTree->EvaluateViewCellsStats(vcStats);
+        Debug << "original view cell partition:\n" << vcStats << endl;
+                
+        if (1) // export view cells before merge
         {
                 cout << "exporting initial view cells (=leaves) ... ";
@@ -344 +346 @@
                 {
                         exporter->SetWireframe();
-                        exporter->ExportBspLeaves(*mBspTree, stat.maxPvs);
+                        exporter->ExportBspLeaves(*mBspTree, vcStats.maxPvs);
                         //exporter->ExportBspViewCellPartition(*mBspTree, 0);
                                 
@@ -360 +362 @@
                 }
                 cout << "finished" << endl;
-        }
+
+                //-- render simulation
+                cout << "\nevaluating bsp view cells render time before merge ... ";
+                 
+                const SimulationStatistics ss = SimulateRendering();
+                         
+                cout << " finished" << endl;
+                cout << ss << endl;
+                Debug << ss << endl;
+        }
+
 
         cout << "starting post processing using " << mPostProcessSamples << " samples ... ";
-                
+
         long startTime = GetTime();
-
 
         //-- merge or subdivide view cells
@@ -408 +419 @@
         cout << "merged " << merged << " view cells in "
                  << TimeDiff(startTime, GetTime()) *1e-3 << " secs" << endl;
+
+        // statistics after post process
+        vcStats.Reset();
+        mBspTree->EvaluateViewCellsStats(vcStats);
+        Debug << "post processed view cell partition:\n" << vcStats << endl;
 
         return merged;
@@ -956 +972 @@
 mVspKdTree(vspKdTree)
 {
-   mRenderSimulator = NULL; // TODO: new VspKdRenderSimulator(vspKdTree);
+   mRenderSimulator = NULL;//new VspKdRenderSimulator(vspKdTree);
    InitRenderSimulator();
 }
@@ -983 +999 @@
                 return 0;
 
-        //if (castRay) // TODO
+        //if (castRay)
+                //mVspKdTree->CastRay(ray);
 
         int sampleContributions = 0;
 
-/*
-    for (int i = 0; i < (int)rays.size(); ++ i)
-        {
-                Ray *ray = rays[i];
-
-                mBspTree->CastRay(*ray);
-                        
-                Intersectable *term = 
-                        !ray->intersections.empty() ? ray->intersections[0].mObject : NULL
-                        ;
-                sampleContributions += 
-                        AddSampleContributions(*ray, ray->sourceObject.mObject, term);
-                        
-        }
-*/
         return sampleContributions;
 }
@@ -1121 +1123 @@
 mVspBspTree(vspBspTree)
 {
-   mRenderSimulator = NULL;// TODO new VspBspRenderSimulator(bspTree);
-   //InitRenderSimulator();
+        mRenderSimulator = new VspBspRenderSimulator(vspBspTree);
+        InitRenderSimulator();
 }
 
@@ -1182 +1184 @@
                 for (int j = 0; j < (int)ray.bspIntersections.size(); ++ j)
                 {       
-                        VspBspLeaf *leaf = NULL;  //TODO ray.bspIntersections[j].mLeaf;
+                        BspLeaf *leaf = ray.bspIntersections[j].mLeaf;
                 
                         // if ray not in unbounded space
@@ -1206 +1208 @@
                 for (int j = 1; j < ((int)ray.bspIntersections.size() - 1); ++ j) 
                 {
-                        VspBspLeaf *leaf = NULL;// TODO = ray.bspIntersections[j].mLeaf;
+                        BspLeaf *leaf = ray.bspIntersections[j].mLeaf;
 
                         if (leaf->GetViewCell() != mVspBspTree->GetRootCell())
@@ -1219 +1221 @@
                                                                                 const RayContainer &rays)
 {
-        return 0;// TODO
         if (!ViewCellsConstructed())
         {
@@ -1231 +1232 @@
         int pvsSize = 0;
 
-        VspBspViewCellsStatistics vcStats;
+        BspViewCellsStatistics vcStats;
         mVspBspTree->EvaluateViewCellsStats(vcStats);
         Debug << "original view cell partition:\n" << vcStats << endl;
@@ -1243 +1244 @@
                 {
                         exporter->SetWireframe();
-                        //exporter->ExportBspLeaves(*mVspBspTree, stat.maxPvs);
+                        exporter->ExportBspViewCellPartition(*mVspBspTree, vcStats.maxPvs);
                                 
                         if (0)
@@ -1284 +1285 @@
                 iit = ray->bspIntersections.begin();
 
-                VspBspLeaf *previousLeaf = NULL;//TODO(*iit).mLeaf;
+                BspLeaf *previousLeaf = (*iit).mLeaf;
                 ++ iit;
                 
                 for (; iit != ray->bspIntersections.end(); ++ iit)
                 {
-                        VspBspLeaf *leaf = NULL;//TODO(*iit).mLeaf;
+                        BspLeaf *leaf = (*iit).mLeaf;
 
                         if (ShouldMerge(leaf, previousLeaf))
@@ -1307 +1308 @@
                  << TimeDiff(startTime, GetTime()) *1e-3 << " secs" << endl;
 
+        // statistics after post process
+        vcStats.Reset();
+        mVspBspTree->EvaluateViewCellsStats(vcStats);
+        Debug << "post processed view cell partition:\n" << vcStats << endl;
+
         return merged;
 }
@@ -1319 +1325 @@
                                                                            const RayContainer &sampleRays)
 {
-        return; // TODO
         if (!ViewCellsConstructed())
                 return;
 
         //-- recount pvs
-        VspBspViewCellsStatistics vcStats;
+        BspViewCellsStatistics vcStats;
         mVspBspTree->EvaluateViewCellsStats(vcStats);
 
@@ -1330 +1335 @@
         {
                 cout << "exporting view cells after merge ... ";
-                /*Exporter *exporter = Exporter::GetExporter("merged_view_cells.x3d");
+                Exporter *exporter = Exporter::GetExporter("merged_view_cells.x3d");
 
                 if (exporter)
@@ -1337 +1342 @@
                         delete exporter;
                 }
-                */
+                
                 cout << "finished" << endl;
         }       
@@ -1343 +1348 @@
         //-- visualization of the BSP splits
         bool exportSplits = false;
-                environment->GetBoolValue("BspTree.Visualization.exportSplits", exportSplits);
+        environment->GetBoolValue("BspTree.Visualization.exportSplits", exportSplits);
         
         if (exportSplits)
@@ -1352 +1357 @@
         }
 
-//TODO  ExportVspBspPvs(objects, sampleRays);
+        ExportBspPvs(objects, sampleRays);
 }
 
@@ -1367 +1372 @@
                 exporter->SetForcedMaterial(m);
                 exporter->SetWireframe();
-                // TODO
-                //exporter->ExportBspSplits(*mVspBspTree, true);
+                
+                exporter->ExportBspSplits(*mVspBspTree, true);
 
                 // take forced material, else big scenes cannot be viewed
@@ -1412 +1417 @@
         const int raysOut = min((int)sampleRays.size(), mVisualizationSamples);
         cout << "visualization using " << mVisualizationSamples << " samples" << endl;
-        vector<Ray *> vcRays[leafOut];
-
-        if (0)
+        
+        if (1)
         {
                 //-- some random view cells and rays for output
-                vector<VspBspLeaf *> vspBspLeaves;
+                vector<BspLeaf *> vspBspLeaves;
 
                 for (int i = 0; i < leafOut; ++ i)
@@ -1424 +1428 @@
                 for (int i = 0; i < (int)vspBspLeaves.size(); ++ i)
                 {
+                        RayContainer vcRays;
                         cout << "creating output for view cell " << i << " ... ";
                         // check whether we can add the current ray to the output rays
-                        for (int k = 0; k < raysOut; ++ k) 
+                        /*for (int k = 0; k < raysOut; ++ k) 
                         {
                                 Ray *ray = sampleRays[k];
@@ -1436 +1441 @@
                                         if (vspBspLeaves[i]->GetViewCell() == leaf->GetViewCell()) 
                                         {
-                                                vcRays[i].push_back(ray);
+                                                vcRays.push_back(ray);
                                         }
                                 }
                         }
+                        */
 
                         Intersectable::NewMail();
@@ -1474 +1480 @@
 
                         Debug << i << ": pvs size=" << (int)vc->GetPvs().GetSize() 
-                                        << ", piercing rays=" << (int)vcRays[i].size() << endl;
+                                        << ", piercing rays=" << (int)vcRays.size() << endl;
 
                         // export rays piercing this view cell
-                        exporter->ExportRays(vcRays[i], 1000, RgbColor(0, 1, 0));
-
-                        m.mDiffuseColor = RgbColor(1, 0, 0);
+                        exporter->ExportRays(vcRays, 1000, RgbColor(1, 0, 0));
+                        exporter->ExportRays(vspBspLeaves[i]->mVssRays, RgbColor(1, 1, 1));
+                        
+                        m.mDiffuseColor = RgbColor(0, 1, 1);
                         exporter->SetForcedMaterial(m);
 
-                        // exporter->SetWireframe();
-                        exporter->SetFilled();
+                        exporter->SetWireframe();
+                        //exporter->SetFilled();
 
                         // output PVS of view cell
@@ -1527 +1534 @@
                 {
                         cout << "creating output for view cell " << i << " ... ";
-                        
+                        RayContainer vcRays;
             Intersectable::NewMail();
                         BspViewCell *vc = dynamic_cast<BspViewCell *>(viewCells[i]);
@@ -1539 +1546 @@
                                 for     (int j = 0; j < (int)ray->bspIntersections.size(); ++ j)
                                 {
-                                        VspBspLeaf *leaf = NULL; // TODO = ray->bspIntersections[j].mLeaf;
+                                        BspLeaf *leaf = ray->bspIntersections[j].mLeaf;
 
                                         if (vc == leaf->GetViewCell()) 
                                         {
-                                                vcRays[i].push_back(ray);
+                                                vcRays.push_back(ray);
                                         }
                                 }
@@ -1572 +1579 @@
                         
                         Debug << i << ": pvs size=" << (int)vc->GetPvs().GetSize() 
-                                        << ", piercing rays=" << (int)vcRays[i].size() << endl;
+                                        << ", piercing rays=" << (int)vcRays.size() << endl;
 
                         
                         // export rays piercing this view cell
-                        exporter->ExportRays(vcRays[i], 1000, RgbColor(0, 1, 0));
+                        exporter->ExportRays(vcRays, 1000, RgbColor(0, 1, 0));
         
                         m.mDiffuseColor = RgbColor(1, 0, 0);
@@ -1607 +1614 @@
 
 
-bool VspBspViewCellsManager::MergeVspBspLeafViewCells(VspBspLeaf *front, 
-                                                                                                          VspBspLeaf *back) const
+bool VspBspViewCellsManager::MergeVspBspLeafViewCells(BspLeaf *front, 
+                                                                                                          BspLeaf *back) const
 {
         BspViewCell *viewCell = 
@@ -1623 +1630 @@
         BspViewCell *bVc = back->GetViewCell();
 
-        // TODO
-        /*vector<VspBspLeaf *> fLeaves = fVc->mBspLeaves;
-        vector<VspBspLeaf *> bLeaves = bVc->mBspLeaves;
-
-        vector<VspBspLeaf *>::const_iterator it;
+        vector<BspLeaf *> fLeaves = fVc->mBspLeaves;
+        vector<BspLeaf *> bLeaves = bVc->mBspLeaves;
+
+        vector<BspLeaf *>::const_iterator it;
         
         for (it = fLeaves.begin(); it != fLeaves.end(); ++ it)
@@ -1642 +1648 @@
         DEL_PTR(fVc);
         DEL_PTR(bVc);
-*/
+
         return true;
 }
 
-bool VspBspViewCellsManager::ShouldMerge(VspBspLeaf *front, VspBspLeaf *back) const
+bool VspBspViewCellsManager::ShouldMerge(BspLeaf *front, BspLeaf *back) const
 {
         ViewCell *fvc = front->GetViewCell();