Changeset 2647

Timestamp:

03/18/08 16:29:14 (17 years ago)

Author:

bittner

Message:

 

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• Environment.cpp (modified) (1 diff)
• GlRenderer.cpp (modified) (3 diffs)
• Preprocessor.cpp (modified) (2 diffs)
• RandomViewCellsHandler.cpp (modified) (1 diff)
• default.env (modified) (1 diff)
• main.cpp (modified) (2 diffs)

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

@@ -1692 +1692 @@
         RegisterOption("ViewCells.importRandomViewCells",
                                    optBool, 
-                                   "view_cells_import_random_viewcells=", 
+                                   "view_cells_import_random_viewcells", 
                                    "false");
 
         RegisterOption("ViewCells.exportRandomViewCells",
                                    optBool, 
-                                   "view_cells_export_random_viewcells=", 
+                                   "view_cells_export_random_viewcells", 
                                    "false");
 

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

@@ -138 +138 @@
                                                                                                  mPvsStatFrames);
         
+        Debug<<"Info: will evaluate pixel error with "<<mPvsStatFrames<<" samples"<<endl;
         
         mPvsErrorBuffer.resize(mPvsStatFrames);
@@ -1571 +1572 @@
   
   glFinish();
+
+  static bool first = true;
+  if (first) {
+        
+
+        bool exportRandomViewCells;
+        Environment::GetSingleton()->GetBoolValue("ViewCells.exportRandomViewCells",
+                                                                                          exportRandomViewCells);
+        
+        if (0 && exportRandomViewCells)
+          {
+                char buff[512];
+                Environment::GetSingleton()->GetStringValue("Scene.filename", buff);
+                string filename(buff);
+
+                string viewCellPointsFile;
+                
+                if (strstr(filename.c_str(), ".obj"))
+                  viewCellPointsFile = ReplaceSuffix(filename, ".obj", ".vc");
+                else if (strstr(filename.c_str(), ".dat"))
+                  viewCellPointsFile = ReplaceSuffix(filename, ".dat", ".vc");
+                else if (strstr(filename.c_str(), ".x3d"))
+                  viewCellPointsFile = ReplaceSuffix(filename, ".x3d", ".vc");
+                
+                
+                cout << "exporting random view cells" << endl;
+                preprocessor->mViewCellsManager->ExportRandomViewCells(viewCellPointsFile);
+                cout << "finished" << endl;
+          }
+        first = false;
+  }
+
   cout<<endl<<flush;
 }
@@ -1630 +1663 @@
   
   glFinish();
+
+  
   cout << endl << flush;
 }

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

@@ -1554 +1554 @@
                   viewPoints.push_back(*rit);
           }
-
+          
           if (viewPoints.size() != renderer->mPvsErrorBuffer.size()) {
                 renderer->mPvsErrorBuffer.resize(viewPoints.size());
@@ -1563 +1563 @@
         } else
           renderer->EvalPvsStat();
-
+        
         mStats <<
           "#AvgPvsRenderError\n" <<renderer->mPvsStat.GetAvgError()<<endl<<

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

@@ -214 +214 @@
 {
         // export ten view cells with 100 random view points inside each
-        const int numViewCells = 100;
-        const int numViewPoints = 10;
+  const int numViewCells = 100;
+  //  const int numViewPoints = 10;
+  const int numViewPoints = 100;
 
         GenerateRandomViewCells(mViewCellPointsList, numViewCells, numViewPoints);

GTP/trunk/Lib/Vis/Preprocessing/src/default.env

@@ -554 +554 @@
 Preprocessor {
   # internal
-  #rayCastMethod 0
+  # rayCastMethod 0
   # Intel
-  #rayCastMethod 1
+  rayCastMethod 1
   # Havran - 2 - static scene
   # rayCastMethod 2

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

@@ -321 +321 @@
                                                                  preprocessor->mKdTree);
                 
+        }
+
+        bool exportRandomViewCells;
+        Environment::GetSingleton()->GetBoolValue("ViewCells.exportRandomViewCells",
+                                                                                          exportRandomViewCells);
+        
+        if (exportRandomViewCells)
+          {
+                cout << "exporting random view cells" << endl;
+                preprocessor->mViewCellsManager->ExportRandomViewCells(viewCellPointsFile);
+                cout << "finished" << endl;
           }
-        
+
         if (preprocessor->mUseGlRenderer || preprocessor->mUseGlDebugger)
         {
@@ -366 +377 @@
                 }
 
-                bool exportRandomViewCells;
-                Environment::GetSingleton()->GetBoolValue("ViewCells.exportRandomViewCells",
-                        exportRandomViewCells);
-
-                if (exportRandomViewCells)
-                {
-                        cout << "exporting random view cells" << endl;
-                        preprocessor->mViewCellsManager->ExportRandomViewCells(viewCellPointsFile);
-                        cout << "finished" << endl;
-                }
 
                 /*bool evaluatePixelError;