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

Timestamp:

01/24/07 06:53:09 (17 years ago)

Author:

bittner

Message:

render error

File:

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

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

@@ -117 +117 @@
 {
   Triangle3 &t = object->GetItem();
-  
+
   glBegin(GL_TRIANGLES);
   Vector3 normal = t.GetNormal();
@@ -130 +130 @@
 GlRenderer::RenderIntersectable(Intersectable *object)
 {
+  if (!object)
+        return;
+  
   if (object->Mailed())
         return;
+
   object->Mail();
   
@@ -1389 +1393 @@
 void GlRenderer::EvalPvsStat(const SimpleRayContainer &viewPoints)
 {
-        ClearErrorBuffer();
-
-        mPvsStat.Reset();
-        halton.Reset();
-
-        SetupProjection(GetWidth(), GetHeight());
-
-        cout << "mPvsStatFrames=" << mPvsStatFrames << endl;
-
-        SimpleRayContainer::const_iterator sit, sit_end = viewPoints.end();
-        int i = 0;
-
-        for (sit = viewPoints.begin(); sit != sit_end; ++ sit, ++ i) 
-        {
-                //cout << "view point: " << (*sit) << endl;;
-                SimpleRay sray = *sit;
-
-                float err;
-
-                // set frame id for saving the error buffer
-                mFrame = i;
-                mViewPoint = sray.mOrigin;
-                mViewDirection = sray.mDirection;
-
-                if (0 && (mPvsErrorBuffer[i].mError == 1.0f))
+  mPvsStat.Reset();
+
+  SetupProjection(GetWidth(), GetHeight());
+  
+  cout << "mPvsStatFrames=" << mPvsStatFrames << endl;
+  
+  SimpleRayContainer::const_iterator sit, sit_end = viewPoints.end();
+  int i = 0;
+  
+  for (sit = viewPoints.begin(); sit != sit_end; ++ sit, ++ i) 
+        {
+          
+          //cout << "view point: " << (*sit) << endl;;
+          SimpleRay sray = *sit;
+          
+          float err;
+          
+          // set frame id for saving the error buffer
+          mFrame = i;
+          mViewPoint = sray.mOrigin;
+          mViewDirection = sray.mDirection;
+          
+          if (mPvsErrorBuffer[i].mError > 0.0f) 
                 {
-                        // check if the view point is valid
-                        if (!ValidViewPoint())
-                        {
-                                cout << "error: " << " view point invalid" << endl;
-                                mPvsErrorBuffer[i].mError = -1.0f;
-                        }
-                        else
-                        {
-                                cout << "view point valid" << endl;
-                        }
+                  int pvsSize;
+                  
+                  // compute the pixel error
+                  float error = GetPixelError(pvsSize);
+                  
+                  mPvsErrorBuffer[i].mError = error;
+                  mPvsErrorBuffer[i].mPvsSize = pvsSize;
+                  
+                  cout << "(" << i << "," << mPvsErrorBuffer[i].mError <<")";
                 }
-
-                if (mPvsErrorBuffer[i].mError > 0.0f) 
+          
+          err = mPvsErrorBuffer[i].mError;
+          
+          if (err >= 0.0f) 
                 {
-                        int pvsSize;
-
-                        // compute the pixel error
-                        float error = GetPixelError(pvsSize);
-
-                        mPvsErrorBuffer[i].mError = error;
-                        mPvsErrorBuffer[i].mPvsSize = pvsSize;
-
-                        cout << "(" << i << "," << mPvsErrorBuffer[i].mError <<")";
-                }
-
-                err = mPvsErrorBuffer[i].mError;
-
-                if (err >= 0.0f) 
-                {
-                        if (err > mPvsStat.maxError)
-                                mPvsStat.maxError = err;
-
-                        mPvsStat.sumError += err;
+                  if (err > mPvsStat.maxError)
+                        mPvsStat.maxError = err;
+                  
+                  mPvsStat.sumError += err;
                         mPvsStat.sumPvsSize += mPvsErrorBuffer[i].mPvsSize;
-
+                        
                         if (err == 0.0f)
-                                ++ mPvsStat.errorFreeFrames;
-
+                          ++ mPvsStat.errorFreeFrames;
+                        
                         ++ mPvsStat.frames;
                 }
         }
-
-        glFinish();
-        cout << endl << flush;
+  
+  glFinish();
+  cout << endl << flush;
 }