Changeset 2050 for GTP/trunk

Timestamp:

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

Author:

bittner

Message:

render error

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• GlRenderer.cpp (modified) (3 diffs)
• GlRenderer.h (modified) (1 diff)
• Mutation.cpp (modified) (1 diff)
• Preprocessor.cpp (modified) (2 diffs)
• QtInterface/QtGlRenderer.cpp (modified) (5 diffs)
• default.env (modified) (1 diff)

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;
 }
 

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

@@ -199 +199 @@
 friend class ViewCellsManager;
 
+  vector<PvsErrorEntry> mPvsErrorBuffer;
+
 protected:
 
   
-  vector<PvsErrorEntry> mPvsErrorBuffer;
 
   PvsCache mPvsCache;

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

@@ -20 +20 @@
 #define USE_SILHOUETTE_MUTATIONS 0
 
-#define SIL_TERMINATION_MUTATION_PROB 0.9f
+
+#define SIL_TERMINATION_MUTATION_PROB 0.8f
 
 #define EVALUATE_MUTATION_STATS 1

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

@@ -1461 +1461 @@
           vector<ViewCellPoints *> *vcPoints = mViewCellsManager->GetViewCellPoints();
           
-          vector<ViewCellPoints *>::const_iterator vit, vit_end = vcPoints->end();
+          vector<ViewCellPoints *>::const_iterator
+                vit = vcPoints->begin(),
+                vit_end = vcPoints->end();
+
           SimpleRayContainer viewPoints;
           
-          for (vit = vcPoints->begin(); vit != vit_end; ++ vit) {
+          for (; vit != vit_end; ++ vit) {
                 ViewCellPoints *vp = *vit;
 
@@ -1471 +1474 @@
                   viewPoints.push_back(*rit);
           }
-          
+
+          if (viewPoints.size() != renderer->mPvsErrorBuffer.size()) {
+                renderer->mPvsErrorBuffer.resize(viewPoints.size());
+                renderer->ClearErrorBuffer();
+          }
+
           renderer->EvalPvsStat(viewPoints);
         } else
           renderer->EvalPvsStat();
-        
+
         mStats <<
           "#AvgPvsRenderError\n" <<renderer->mPvsStat.GetAvgError()<<endl<<

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

@@ -89 +89 @@
   float pErrorPixels = -1.0f;
   
-  glReadBuffer(GL_BACK);
-  
-  //  mUseFalseColors = true;
   
   mUseFalseColors = false;
   unsigned int pixelCount;
-
+  
   
   ViewCell *viewcell = mViewCellsManager->GetViewCell(mViewPoint);
-  
+  //  cout<<"View cell"<<viewcell<<endl;
   if (viewcell == NULL)
         return 0.0f;
@@ -119 +116 @@
                                                                         pvs);
   }
-  
+
+  //  cout<<"pvs size"<<pvs.GetSize()<<endl<<flush;
+
   SetupCamera();
   glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
@@ -138 +137 @@
         RenderIntersectable(object);
   }
-  
+
+
   //    glColorMask(GL_TRUE, GL_FALSE, GL_FALSE, GL_FALSE);
   glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
@@ -162 +162 @@
   //  }
 
+
   pixelCount = query->GetQueryResult();
   
@@ -167 +168 @@
   
   
-  if (0 && mSnapErrorFrames && pErrorPixels >= 0.01f) {
-        
+  if (mSnapErrorFrames && pErrorPixels >= 0.01f) {
+        glReadBuffer(GL_BACK);
+
         char filename[256];
         sprintf(filename, "error-frame-%04d-%0.5f.png", mFrame, pErrorPixels);

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

@@ -61 +61 @@
 #       type render
         detectEmptyViewSpace true
-        pvsRenderErrorSamples 0
+        pvsRenderErrorSamples 20
 #       pvsRenderErrorSamples 10000
         quitOnFinish false