Changeset 2611 for GTP/trunk/Lib/Vis/Preprocessing

Timestamp:

01/17/08 23:12:07 (17 years ago)

Author:

bittner

Message:

pvs error debug

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• GlRenderer.cpp (modified) (4 diffs)
• QtInterface/QtGlRenderer.cpp (modified) (1 diff)
• SG08/run_test_pixel (modified) (1 diff)
• default.env (modified) (2 diffs)
• main.cpp (modified) (2 diffs)

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

@@ -107 +107 @@
                 mPvsStatFrames = (int)mViewCellsManager->GetViewCellPointsList()->size();
         else
-                Environment::GetSingleton()->GetIntValue("Preprocessor.pvsRenderErrorSamples", mPvsStatFrames);
-
-
+                Environment::GetSingleton()->GetIntValue("Preprocessor.pvsRenderErrorSamples",
+                                                                                                 mPvsStatFrames);
+        
+        
         mPvsErrorBuffer.resize(mPvsStatFrames);
         ClearErrorBuffer();
@@ -1428 +1429 @@
   SetupProjection(GetWidth(), GetHeight());
 
-  cout<<"mPvsStatFrames="<<mPvsStatFrames<<endl;
+  cout<<"Random Pvs STATS, mPvsStatFrames="<<mPvsStatFrames<<endl;
   
   for (int i=0; i < mPvsStatFrames; i++) {
@@ -1434 +1435 @@
         // set frame id for saving the error buffer
         mFrame = i;
+        //      cerr<<"RV"<<endl;
         RandomViewPoint();
+        //      cerr<<"RV2"<<endl;
 
         if (mPvsErrorBuffer[i].mError == 1.0f) {
@@ -1461 +1464 @@
         if (mPvsErrorBuffer[i].mError > 0.0f) {
           int pvsSize;
-          
+
+          cerr<<"GPE"<<endl;
+
           float error = GetPixelError(pvsSize);
+          cerr<<"GPEd"<<endl;
+
           mPvsErrorBuffer[i].mError = error;
           mPvsErrorBuffer[i].mPvsSize = pvsSize;

GTP/trunk/Lib/Vis/Preprocessing/src/QtInterface/QtGlRenderer.cpp

@@ -109 +109 @@
 
         ViewCell *viewcell = mViewCellsManager->GetViewCell(mViewPoint);
-        //  cout<<"View cell"<<viewcell<<endl;
         if (viewcell == NULL)
                 return 0.0f;

GTP/trunk/Lib/Vis/Preprocessing/src/SG08/run_test_pixel

@@ -4 +4 @@
 #COMMAND="./release/preprocessor.exe -preprocessor_quit_on_finish+"
 #COMMAND="../scripts/preprocessor.sh -preprocessor_quit_on_finish+ -preprocessor_use_gl_renderer- -preprocessor_evaluate_filter- -samples_per_pass=500000 -samples_per_evaluation=10000000 -total_samples=500000000 -preprocessor_pvs_rendererror_samples=10000 -preprocessor_evaluatePixelError+"
-COMMAND="../scripts/preprocessor.sh -preprocessor_quit_on_finish+ -preprocessor_use_gl_renderer+ -preprocessor_evaluate_filter- -samples_per_pass=1000000 -samples_per_evaluation=2000000 -total_samples=500000000 -preprocessor_pvs_rendererror_samples=10000 -preprocessor_evaluatePixelError+"
+COMMAND="../scripts/preprocessor.sh -preprocessor_quit_on_finish+ -preprocessor_use_gl_renderer- -preprocessor_evaluate_filter- -samples_per_pass=1000000 -samples_per_evaluation=500000 -total_samples=500000000 -preprocessor_pvs_rendererror_samples=10000 -preprocessor_evaluatePixelError+"
 
 #SCENE="../data/vienna/vienna-buildings.x3d;../data/vienna/vienna-roofs.x3d;../data/vienna/vienna-roads.x3d"

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

@@ -518 +518 @@
 BSP {
   termCrit        auto
+  # auto2 allows to set the number of primitives per leaf       
   #termCrit       auto2
+  #adhoc allows to set maxdepth + number of primitives per leaf 
   #termCrit       adhoc
   # For Arena
@@ -526 +528 @@
   #maxDepthAllowed 22
   #maxListLength    6
+  # For PowerPlant
+  maxDepthAllowed 18
+  maxListLength    8
   # For Power plant
   #maxDepthAllowed 8

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

@@ -293 +293 @@
         Environment::GetSingleton()->GetIntValue("Preprocessor.pvsRenderErrorSamples", frames);
 
+        bool evalPixelError;
+        Environment::GetSingleton()->GetBoolValue("Preprocessor.evaluatePixelError", evalPixelError);
+
 #ifdef USE_QT
 
@@ -299 +302 @@
         pt = new QtPreprocessorThread(preprocessor);    
         
-        if (preprocessor->mUseGlRenderer && (importRandomViewCells || frames))
-
+        //      if (preprocessor->mUseGlRenderer && (importRandomViewCells || frames))
+
+        if (evalPixelError && (importRandomViewCells || frames))
           {
                 QGLFormat f;