Changeset 2542 for GTP/trunk/Lib/Vis/Preprocessing/src/VssPreprocessor.cpp

Timestamp:

08/20/07 12:51:12 (17 years ago)

Author:

mattausch

Message:

 

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/VssPreprocessor.cpp (modified) (10 diffs)

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

@@ -254 +254 @@
 {
         //debuggerWidget = new GlDebuggerWidget(renderer);
-        //  renderer->resize(640, 480);
+        //renderer->resize(640, 480);
         //debuggerWidget->resize(640, 480);
 
@@ -265 +265 @@
         exporter->ExportGeometry(objects);
         exporter->SetFilled();
+        
         //Randomize();
-// §§matt
-//      debuggerWidget = new GlDebuggerWidget(renderer);
-
-        /*debuggerWidget->mBeam = beam;
+        //§§matt
+        //debuggerWidget = new GlDebuggerWidget(renderer);
+
+        /*
+        debuggerWidget->mBeam = beam;
         debuggerWidget->mSourceObject = sourceObj;
         debuggerWidget->mSamples = 10000;
@@ -276 +278 @@
         debuggerWidget->show();
         
-        renderer->makeCurrent();*/
+        renderer->makeCurrent();
+        */
 
         for (int i = 0; i < 10; ++ i)
@@ -299 +302 @@
 
                 BeamSampleStatistics stats;
-// §§matt
-/*              renderer->SampleBeamContributions(sourceObj,
+
+                // §§matt
+                /*      
+                renderer->SampleBeamContributions(sourceObj,
                                                                                   beam,
                                                                                   200000,
@@ -310 +315 @@
                 image.save(s, "PNG");
                 Debug << "beam statistics: " << stats << endl << endl;
-*/
+                */
+
                 if (1)
                 {
@@ -321 +327 @@
                 }
 
-                bool exportViewCells = false;
+                const bool exportViewCells = false;
+
                 if (exportViewCells)
                 {
@@ -338 +345 @@
                                 exporter->ExportViewCell(*it);
                         }
-
-                        /*vector<KdNode *>::const_iterator it, it_end = beam.mKdNodes.end();
-                        
-                        for (it = beam.mKdNodes.begin(); it != beam.mKdNodes.end(); ++ it)
-                        {
-                                exporter->ExportBox(mKdTree->GetBox((*it)));
-                        }*/
                 }
         }
-        /*while (1)
-        { debuggerWidget->repaint();
-        };*/
+        
         delete exporter;
 }
@@ -376 +374 @@
         int totalSamples = 0;
 
-        //mSceneGraph->CollectObjects(&mObjects);
-
         if (!mLoadViewCells)
         {
-                //-- generate new view cells from the scratch
-                //-- for construction the manager uses it's own set of samples
+                // generate new view cells from the scratch using coarse sampling
                 ConstructViewCells();
         }
@@ -387 +382 @@
         else 
         {        
-                //-- load view cells from file
-                //-- test successful view cells loading by exporting them again
-                VssRayContainer dummies;
-                mViewCellsManager->Visualize(mObjects, dummies);
+                // load view cells from file
+                // we test success by exporting view cells again
+                VssRayContainer dummyContainer;
+                mViewCellsManager->Visualize(mObjects, dummyContainer);
+                
                 mViewCellsManager->ExportViewCells("test.xml.zip", mViewCellsManager->GetExportPvs(), mObjects);
         }
@@ -401 +397 @@
         {
                 cout << "Loading samples from file ... ";
+                
                 LoadSamples(mVssRays, mObjects);
+                
                 cout << "finished\n" << endl;
                 totalSamples = (int)mVssRays.size();