Changeset 2002 for GTP/trunk/Lib/Vis/Preprocessing/src/QtInterface

Timestamp:

01/21/07 00:14:50 (17 years ago)

Author:

bittner

Message:

renderer code updates for pixel error measurements

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/QtInterface/QtGlRenderer.cpp (modified) (4 diffs)

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

@@ -83 +83 @@
 
 
-
+// reimplemented here so that we can snap the error windows
 float
 QtGlRendererBuffer::GetPixelError(int &pvsSize)
@@ -96 +96 @@
   unsigned int pixelCount;
 
-  //static int query = -1;
-  //if (query == -1)
-  //      glGenOcclusionQueriesNV(1, (unsigned int *)&query);
-
-  OcclusionQuery query;
 
   ViewCell *viewcell = mViewCellsManager->GetViewCell(mViewPoint);
   if (viewcell == NULL)
         return 0.0f;
-
-  if (mDetectEmptyViewSpace) {
-        // now check whether any backfacing polygon would pass the depth test
-        SetupCamera();
-        glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-        glEnable( GL_CULL_FACE );
-        glCullFace(GL_BACK);
-
-        cout<<"RS ";
-        RenderScene();
-        
-        glColorMask(GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE);
-        glDepthMask(GL_FALSE);
-        glDisable( GL_CULL_FACE );
-
-        query.BeginQuery();
-        
-        cout<<"RS ";
-        RenderScene();
-        cout<<"RS3 ";
-        
-        query.EndQuery();
-        
-        // at this point, if possible, go and do some other computation
-        glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
-        glDepthMask(GL_TRUE);
-        glEnable( GL_CULL_FACE );
-        
-        // reenable other state
-        pixelCount = query.GetQueryResult();
-        cout<<"RS4 ";
-        
-        if (pixelCount > 0)
-          return -1.0f; // backfacing polygon found -> not a valid viewspace sample
-
-  } else
-        glDisable( GL_CULL_FACE );
-        
-
+  
   //  ViewCell *viewcell = NULL;
   
@@ -182 +139 @@
   
   mUseFalseColors = true;
-  
-  query.BeginQuery();
+
+  OcclusionQuery *query = mOcclusionQueries[0];
+
+  query->BeginQuery();
   
   SetupCamera();
@@ -189 +148 @@
   RenderScene();
   
-  query.EndQuery();
-  
+  query->EndQuery();
   
   // reenable other state
-  pixelCount = query.GetQueryResult();
-  
+  //  int wait=0;
+  //  while (!query.ResultAvailable()) {
+  //    wait++;
+  //  }
+
+  pixelCount = query->GetQueryResult();
   
   pErrorPixels = ((float)pixelCount)/(GetWidth()*GetHeight());
-
-  
-  if (mSnapErrorFrames && pErrorPixels > 0.001f) {
+  
+  
+  if (mSnapErrorFrames && pErrorPixels > 0.01f) {
         
         char filename[256];