Changeset 2662 for GTP/trunk/Lib/Vis/Preprocessing/src/GlRenderer.cpp

Timestamp:

04/28/08 18:59:58 (16 years ago)

Author:

mattausch

Message:

working on gvs pixel error evaluation bugfixing

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/GlRenderer.cpp (modified) (3 diffs)

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

@@ -125 +125 @@
 
 #endif
+
         mFrame = 0;
         mWireFrame = false;
@@ -1533 +1534 @@
                 mPvsErrorBuffer[i].mError = -1.0f;
         }
-        
-        
-        // atlanta problematic frames: 325 525 691 1543
-#if 0
-        if (mFrame != 325 &&
-                mFrame != 525 &&
-                mFrame != 691 &&
-                mFrame != 1543)
-          mPvsErrorBuffer[i] = -1;
-        else {
-          Debug<<"frame ="<<mFrame<<" vp="<<mViewPoint<<" vd="<<mViewDirection<<endl;
-        }
-#endif
-        
+
 
         if (mPvsErrorBuffer[i].mError > 0.0f) {
@@ -1615 +1603 @@
 void GlRenderer::EvalPvsStat(const SimpleRayContainer &viewPoints)
 {
-  mPvsStat.Reset();
-
-  SetupProjection(GetWidth(), GetHeight());
-  
-  cout << "mPvsStatFrames=" << viewPoints.size() << endl;
-  
-  SimpleRayContainer::const_iterator sit, sit_end = viewPoints.end();
-  int i = 0;
-  
-  for (sit = viewPoints.begin(); sit != sit_end; ++ sit, ++ i) 
-        {
-          //cout << "\n\nvp: " << (*sit) << endl;
-          SimpleRay sray = *sit;
-          
-          // set frame id for saving the error buffer
-          mFrame = i;
-          mViewPoint = sray.mOrigin;
-          mViewDirection = sray.mDirection;
-
-          // skip all frames which have already 0 pixel error
-          // $$ Reverted back by JB for efficiency
-          if (mPvsErrorBuffer[i].mError > 0.0f) 
-          {
-                  int pvsSize;
-
-                  // compute the pixel error
-                  float error = GetPixelError(pvsSize);
-                  
-                  mPvsErrorBuffer[i].mError = error;
-                  mPvsErrorBuffer[i].mPvsSize = pvsSize;
-
-                  cout << "(" << i << "," << mViewPoint << "," << mViewDirection << mPvsErrorBuffer[i].mError <<")";
-                  //              cout << "(vc: " << i << ", er: " << mPvsErrorBuffer[i].mError <<")" << endl;
-          }
-
-          const float err = mPvsErrorBuffer[i].mError;
-
-          // do not account for the case that no PVS is rendered - hack for 08 rebuttal GVS evaluation
-          // (correct would be >=0.0f)
-          if (err >= 0.0f && err < 0.99999f) 
-          {
-                  if (err > mPvsStat.maxError)
-                  {
-                          mPvsStat.maxError = err;
-                          cout << "new max error: " << mPvsStat.maxError << endl;
-                  }
-
-                  mPvsStat.sumError += err;
-                  mPvsStat.sumPvsSize += mPvsErrorBuffer[i].mPvsSize;
-
-                  if (err == 0.0f)
-                          ++ mPvsStat.errorFreeFrames;
-
-                  // $$ JB
-                  // moved it back here not to count frames with negative err (backfacing triangle)
-                  ++ mPvsStat.frames;
-          }
-          
-        }
-  
-  glFinish();
-
-  
-  cout << endl << flush;
+        mPvsStat.Reset();
+
+        SetupProjection(GetWidth(), GetHeight());
+
+        cout << "mPvsStatFrames=" << viewPoints.size() << endl;
+
+        SimpleRayContainer::const_iterator sit, sit_end = viewPoints.end();
+
+        int i = 0;
+
+        for (sit = viewPoints.begin(); sit != sit_end; ++ sit, ++ i) 
+        {
+                //cout << "\n\nvp: " << (*sit) << endl;
+                SimpleRay sray = *sit;
+                int pvsSize = 0;
+
+                // set frame id for saving the error buffer
+                mFrame = i;
+                mViewPoint = sray.mOrigin;
+                mViewDirection = sray.mDirection;
+
+                // skip all frames which have already 0 pixel error
+                // $$ Reverted back by JB for efficiency
+                if (mPvsErrorBuffer[i].mError > 0.0f) 
+                {
+                        // compute the pixel error
+                        float error = GetPixelError(pvsSize);
+
+                        mPvsErrorBuffer[i].mError = error;
+                        mPvsErrorBuffer[i].mPvsSize = pvsSize;
+
+                        int pixelError = (int)mPvsErrorBuffer[i].mError * GetWidth() * GetHeight();
+
+                        if (0 && (pixelError > 0) && (pvsSize > 0)) 
+                        {
+                                cout << "!err: " << i << "," << mViewPoint << "," << mViewDirection << " " << mPvsErrorBuffer[i].mError * GetWidth() * GetHeight() << endl;
+                        }
+                }
+
+                const float err = mPvsErrorBuffer[i].mError;
+
+                // hack:
+                // do not account for the case that no PVS is rendered - hack for 08 rebuttal GVS evaluation
+                // drop the first frame (for some reason, the first frame yields wrong pixel error)
+                
+                if ((mFrame > 0) && (err >= 0.0f) && (err < (1.0f - 1e-6f)) && (pvsSize > 0)) 
+                {
+                        if (err > mPvsStat.maxError)
+                        {
+                                mPvsStat.maxError = err;
+
+                                cout << "new max error: " << mPvsStat.maxError * GetWidth()*GetHeight()  << endl;
+                        }
+
+                        mPvsStat.sumError += err;
+                        mPvsStat.sumPvsSize += mPvsErrorBuffer[i].mPvsSize;
+
+                        if (err == 0.0f)
+                                ++ mPvsStat.errorFreeFrames;
+
+                        // $$ JB
+                        // moved it back here not to count frames with negative err (backfacing triangle)
+                        ++ mPvsStat.frames;
+                }
+
+        }
+
+        glFinish();
+
+
+        cout << endl << flush;
 }