Changeset 694 for GTP/trunk/Lib/Vis/Preprocessing/src/ViewCellsManager.cpp

Timestamp:

03/15/06 08:59:33 (18 years ago)

Author:

mattausch

Message:

added means for rotating scene

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/ViewCellsManager.cpp (modified) (16 diffs)

GTP/trunk/Lib/Vis/Preprocessing/src/ViewCellsManager.cpp

@@ -17 +17 @@
 
 #define SAMPLE_AFTER_SUBDIVISION 1
-
+#define TEST_EMPTY_VIEW_CELLS 0
 
 ViewCellsManager::ViewCellsManager():
@@ -145 +145 @@
 
         cout << "collecting empty view cells" << endl;
-        int i = 0;
+        
         for (it = leaves.begin(); it != it_end; ++ it)
         {
                 if ((*it)->GetPvs().Empty())
                 {
-                        ++ i;
                         mEmptyViewCells.push_back(*it);
                 }
         }
-        cout << "view cells found: " << i << endl;
-}
-
-
-void ViewCellsManager::TestEmptyViewCells()
-{
-        mViewCellsTree->CollectLeaves(mViewCellsTree->GetRoot(), mEmptyViewCells);
-
+        Debug << "empty view cells found: " << (int)mEmptyViewCells.size() << endl;
+}
+
+
+void ViewCellsManager::TestEmptyViewCells(const ObjectContainer &obj)
+{
         ViewCellContainer::const_iterator it, it_end = mEmptyViewCells.end();
 
@@ -170 +167 @@
                 if (!(*it)->GetPvs().Empty())
                 {
-                        sprintf(buf, "empty-viewcells-%09d.x3d", (*it)->GetId());
+                        sprintf(buf, "empty-viewcells-%09d.x3d", i/*(*it)->GetId()*/);
                         Exporter *exporter = Exporter::GetExporter(buf);
                         
                         if (exporter && i < 20)
                         {
-                                Debug << "view cell " << (*it)->GetId() << " not empty, pvs: " << (*it)->GetPvs().GetSize() << endl;
+                                Ray *pray = (*it)->mPiercingRays[0];
+                                Debug << "view cell " << (*it)->GetId() << " not empty, pvs: " << (*it)->GetPvs().GetSize() << " " << pray->intersections.size() << endl;
+
+                                exporter->ExportRays((*it)->mPiercingRays);
+                                                        
+                                exporter->SetFilled();
+                                exporter->SetForcedMaterial(RgbColor(0,0,1));
+
+                                for (int j = 0; j < (int)pray->intersections.size(); ++ j)
+                                {
+                                        if (pray->intersections[j].mObject)
+                                                exporter->ExportIntersectable(pray->intersections[j].mObject);
+                                }
+
+                                //exporter->SetWireframe();
+                                exporter->SetForcedMaterial(RgbColor(0,1,0));
+                                exporter->ExportGeometry(obj);
+
+                                exporter->SetFilled();
+
+                                exporter->SetForcedMaterial(RgbColor(1,0,0));
                                 ExportViewCellGeometry(exporter, *it);
+
+                                delete exporter;                
                         }
 
+                
                         ++ i;
                 }
         }
-        Debug << "\nfound " << i << " new view cells (" << " of " << mEmptyViewCells.size() << ")" << endl << endl;
+        Debug << "\nSampled " << i << " new view cells (" << " of " << (int)mEmptyViewCells.size() << ")" << endl << endl;
 }
 
@@ -289 +309 @@
 
         // should we use directional samples?
-        bool dirSamples = mSamplingType == Preprocessor::DIRECTION_BASED_DISTRIBUTION;
+        bool dirSamples = (mSamplingType == Preprocessor::DIRECTION_BASED_DISTRIBUTION);
 
         while (numSamples < n)
@@ -296 +316 @@
                 VssRayContainer constructionSamples;
 
-                const int samplingType =
-                        dirSamples ? 
+                const int samplingType = mSamplingType;
+                        /*dirSamples ? 
                                                 Preprocessor::DIRECTION_BASED_DISTRIBUTION :
-                                                Preprocessor::SPATIAL_BOX_BASED_DISTRIBUTION;
+                                                Preprocessor::SPATIAL_BOX_BASED_DISTRIBUTION;*/
 
                 if (0)
@@ -327 +347 @@
         VssRayContainer postProcessSamples;
 
-        //-- construction rays => we use uniform samples for this
+        //-- construction rays 
         CastPassSamples(mPostProcessSamples,
-                                    Preprocessor::DIRECTION_BASED_DISTRIBUTION, 
+                                        mSamplingType, 
                                         postProcessSamples);
 
@@ -359 +379 @@
 
         // only for testing
-        CollectEmptyViewCells();
+        if (TEST_EMPTY_VIEW_CELLS)
+                CollectEmptyViewCells();
 
 
@@ -495 +516 @@
 
         // find empty view cells bug
-        TestEmptyViewCells();
+        if (TEST_EMPTY_VIEW_CELLS)
+                TestEmptyViewCells(preprocessor->mObjects);
 }
 
@@ -1083 +1105 @@
         {
                 ViewCell *viewcell = *it;
+
                 if (viewcell->GetValid()) 
                 {
+                        // HACK
+                        if (TEST_EMPTY_VIEW_CELLS)
+                                for (int i = 0; i < mEmptyViewCells.size(); ++i)
+                                {
+                                        if (viewcell == mEmptyViewCells[i])
+                                        {
+                                                viewcell->mPiercingRays.push_back(new Ray(ray));
+                                                Debug << "empty view cell ray found: " << ray.mOriginObject << ", " << ray.mTerminationObject << endl;
+                                        }
+                                }
+
                         // if ray not outside of view space
                         float contribution;
@@ -1773 +1807 @@
                 newVol += lVol;
                 subdivVol += (*it)->GetVolume();
+
+                float thres = 0.9;
+                if ((lVol < ((*it)->GetVolume() * thres)) ||
+                        (lVol * thres > ((*it)->GetVolume())))
+                        Debug << "warning: " << lVol << " " << (*it)->GetVolume() << endl;
         }
         
@@ -3032 +3071 @@
         MergeViewCells(postProcessRays, objects);
         
-
-        Debug << "here4" << endl;
         // only for testing
         TestSubdivision();
@@ -3341 +3378 @@
         Debug << "\nOutput view cells: " << endl;
 
+        const bool sortViewCells = true;
+
         // sort view cells to visualize the largest view cells
-        if (0)
+        if (sortViewCells)
                 stable_sort(mViewCells.begin(), mViewCells.end(), vc_gt);
         
@@ -3354 +3393 @@
                 cout << "creating output for view cell " << i << " ... ";
 
-        
                 ViewCell *vc;
         
-                if (0) // largest view cell pvs first
+                if (sortViewCells) // largest view cell pvs first
                         vc = mViewCells[i];
                 else
@@ -3370 +3408 @@
                 if (1 || mExportRays)
                 {
+                        // output rays stored with the view cells during subdivision
                         if (0)
                         {
@@ -3408 +3447 @@
                         }
                 
-
+                        // associate new rays with output view cell
                         if (1)
                         {
@@ -3598 +3637 @@
                                                                    0.00000001f);
         
-                                //Debug << "here geo size: " << geom.Size() << endl;
-                                //Debug << "here size b: " << back.Size() << " f: " << front.Size() << endl;
+                                //Debug << "geo size: " << geom.Size() << endl;
+                                //Debug << "size b: " << back.Size() << " f: " << front.Size() << endl;
                                 if (back.Valid())
                                 {
                                         exporter->ExportPolygons(back.GetPolys());
                                 }
-                                //else Debug << "here2 size: " << back.Size() << endl;
+                        
                         }
                 }