Changeset 366 for trunk/VUT/GtpVisibilityPreprocessor/src/SamplingPreprocessor.cpp

Timestamp:

11/01/05 20:02:22 (19 years ago)

Author:

mattausch

Message:

some ideas abou saving bspleaves with the ray and t

File:

• trunk/VUT/GtpVisibilityPreprocessor/src/SamplingPreprocessor.cpp (modified) (18 diffs)

trunk/VUT/GtpVisibilityPreprocessor/src/SamplingPreprocessor.cpp

@@ -121 +121 @@
                 for (j=1; j < ((int)ray.bspLeaves.size() - 1); ++ j) 
                 {
-                        if (ray.bspLeaves[j]->GetViewCell() != &mUnbounded)
-                                ray.bspLeaves[j]->GetViewCell()->
+                        BspLeaf *leaf = ray.bspIntersections.leaf;
+
+                        if (leaf->GetViewCell() != &mUnbounded)
+                                leaf->GetViewCell()->
                                         AddPassingRay(ray, contributingSamples ? 1 : 0);
                 }
@@ -162 +164 @@
         }
 
-        if (mViewCellsType == BSP_VIEW_CELLS)
+        if (ViewCell::sHierarchy == ViewCell::BSP)
         {
                 // cast ray to BSP tree to get intersection with view cells
@@ -376 +378 @@
                 int passSamples = 0;
                 int index = 0;
-                Real maxTime = 0;
-                int maxTimeIdx = 0;
+                
                 int reverseSamples = 0;
                 bool collectSamplesForBsp = 
-                        (mViewCellsType == BSP_VIEW_CELLS) &&
+                        (ViewCell::sHierarchy == ViewCell::BSP) &&
                         (BspTree::sConstructionMethod == BspTree::FROM_RAYS) &&
                         (totalSamples < mBspConstructionSamples);
                         
-                cout << "totalSamples: "  << totalSamples << endl;
+                //cout << "totalSamples: "  << totalSamples << endl;
 
                 for (i = 0; i < objects.size(); i++) {
@@ -392 +393 @@
                 
                         int pvsSize = 0;
-                        if (mViewCellsType == KD_VIEW_CELLS)
+                        if (ViewCell::sHierarchy == ViewCell::KD)
                                 pvsSize = object->mKdPvs.GetSize();
                                                 
@@ -402 +403 @@
                         int faceIndex = object->GetRandomSurfacePoint(point, normal);
                         
-                        long samplesPerObjStart = GetTime();
-
                         bool viewcellSample = true;
                         int sampleContributions;
@@ -456 +455 @@
                                         }
                                         //-------------------
-                                        if (mViewCellsType == BSP_VIEW_CELLS) 
+                                        if (ViewCell::sHierarchy == ViewCell::BSP) 
                                         {
                                                 ProcessBspViewCells(collectSamplesForBsp,
@@ -471 +470 @@
                                 //                              object->GetRandomVisibleMesh(Plane3(normal, point));
                         }
-                                
-                        // measure maximal time for samples per object
-                        Real t = TimeDiff(samplesPerObjStart, GetTime());
-
-                        if (t > maxTime)
-                        {
-                                maxTime = t;
-                                maxTimeIdx = i;
-                        }
         
                         // CORR matt: must add all samples
@@ -494 +484 @@
                 int pvsSize = 0;
         
-                if (mViewCellsType == BSP_VIEW_CELLS) {
+                if (ViewCell::sHierarchy == ViewCell::BSP) {
                         for (i=0; i < mViewCells.size(); i++) {
                                 ViewCell *vc = mViewCells[i];
@@ -506 +496 @@
                 }
 
-                Debug << "maximal time needed for pass: " << maxTime << " (object " << maxTimeIdx << ")" << endl;
-
                 float avgRayContrib = (passContributingSamples > 0) ? 
                         passSampleContributions/(float)passContributingSamples : 0;
@@ -529 +517 @@
         }
         
-        if (mViewCellsType == KD_VIEW_CELLS)    
+        if (ViewCell::sHierarchy == ViewCell::KD)       
                 cout << "#totalPvsSize=" << mKdTree->CollectLeafPvs() << endl;
   
@@ -535 +523 @@
         if (mBspTree)
         {
+                cout << "starting post processing ... ";
+
+                Debug << "original pvs size: " << mBspTree->CountViewCellPvs() << endl;
+
+                long startTime = GetTime();
                 int merged = PostprocessViewCells(mSampleRays);
-                Debug << "merged " << merged << " view cells" << endl;
-
-                ViewCellContainer vc;
-                mBspTree->CollectViewCells(vc);
-
-                ViewCellContainer::const_iterator it, it_end = vc.end();
-
-                int mergedPvs = 0;
-                for (it = vc.begin(); it != it_end; ++ it)
-                        mergedPvs += (*it)->GetPvs().GetSize();
-
-                Debug << "merged pvs size: " << mergedPvs << endl;
+                
+                cout << "finished" << endl;
+                cout << "merged " << merged << " view cells in "
+                         << TimeDiff(startTime, GetTime()) *1e-3 << " secs" << endl;
+
+                //-- recount pvs
+                Debug << "merged pvs size: " << mBspTree->CountViewCellPvs() << endl;
 
         }
@@ -557 +545 @@
                 exporter->ExportKdTree(*mKdTree);
 
-                if (mBspTree && (mViewCellsType == BSP_VIEW_CELLS))
+                if (mBspTree && (ViewCell::sHierarchy == ViewCell::BSP))
                         exporter->ExportBspTree(*mBspTree);
 
@@ -580 +568 @@
         //-- several visualizations and statistics
         if (1) {
-        if (mBspTree && (mViewCellsType == BSP_VIEW_CELLS))
+                if (mBspTree && (ViewCell::sHierarchy == ViewCell::BSP))
         {
                 bool exportSplits = false;
@@ -672 +660 @@
         RayContainer::const_iterator rit, rit_end = rays.end();
         vector<BspLeaf *>::const_iterator lit;
-if (0)
+
         for (rit = rays.begin(); rit != rays.end(); ++ rit)
         {  
                 // traverse leaves stored in the rays and compare and merge consecutive
                 // leaves (i.e., the neighbors in the tree)
+                if ((*rit)->bspLeaves.empty())
+                        continue;
+
                 lit = (*rit)->bspLeaves.begin();
 
@@ -693 +684 @@
                 }
         }
+
         return merged;
 }
@@ -775 +767 @@
                         for (int i = 0; i < (int)bspLeaves.size(); ++ i)
                         {
-                                if (bspLeaves[i] == ray->bspLeaves[j]) 
+                                if (bspLeaves[i]->GetViewCell() == ray->bspLeaves[j]->GetViewCell()) 
                                 {
                                         vcRays[i].push_back(*ray);
@@ -799 +791 @@
                 ViewCellPvsMap::iterator it = vc->GetPvs().mEntries.begin();
 
+                exporter->SetWireframe();
+
                 Material m;//= RandomMaterial();
                 m.mDiffuseColor = RgbColor(0, 1, 0);
                 exporter->SetForcedMaterial(m);
 
-                exporter->SetWireframe();
-
                 if (vc->GetMesh())
                         exporter->ExportViewCell(vc);
@@ -810 +802 @@
                 {
             PolygonContainer cell;
-
-                        mBspTree->ConstructGeometry(bspLeaves[i], cell);
+                        // export view cell
+                        mBspTree->ConstructGeometry(bspLeaves[i]->GetViewCell(), cell);
                         exporter->ExportPolygons(cell);
                         CLEAR_CONTAINER(cell);
-
-                        /*vector<BspLeaf *> neighbors;
-                        mBspTree->FindNeighbors(bspLeaves[j], neighbors);
-                        for (int j = 0; j < (int)neighbors.size(); ++ j)
-                        {       if (neighbors[j]->mViewCell == bspLeaves[j]->mViewCell)
-                                {}}*/
                 }