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

Timestamp:

01/17/08 23:56:46 (17 years ago)

Author:

bittner

Message:

occlusion query bugfix

File:

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

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

@@ -101 +101 @@
 QtGlRendererBuffer::GetPixelError(int &pvsSize)
 {
-        float pErrorPixels = -1.0f;
+
+  float pErrorPixels = -1.0f;
 
 
@@ -135 +136 @@
         Intersectable::NewMail();
         while (it.HasMoreEntries()) 
-        {
+          {
                 RenderIntersectable(it.Next());
-        }
+          }
 
 
@@ -147 +148 @@
 
         OcclusionQuery *query = mOcclusionQueries[0];
-
-
+        
         query->BeginQuery();
 
@@ -157 +157 @@
         query->EndQuery();
         glDisable(GL_STENCIL_TEST); 
+
         // reenable other state
         //  int wait=0;
@@ -162 +163 @@
         //      wait++;
         //  }
-
+        
 
         pixelCount = query->GetQueryResult();
@@ -170 +171 @@
 
         if (mSnapErrorFrames && pErrorPixels >= 0.01f) {
-                glReadBuffer(GL_BACK);
-
-                char filename[256];
-                sprintf(filename, "error-frame-%04d-%0.5f.png", mFrame, pErrorPixels);
-                QImage im = toImage();
-                string str = mSnapPrefix + filename;
-                QString qstr(str.c_str());
-
-                im.save(qstr, "PNG");
-                if (1) { //0 && mFrame == 1543) {
-                        int x,y;
-                        int lastIndex = -1;
-                        for (y=0; y < im.height(); y++)
-                                for (x=0; x < im.width(); x++) {
-                                        QRgb p = im.pixel(x,y);
-                                        int index = qRed(p) + (qGreen(p)<<8) + (qBlue(p)<<16);
-                                        if (qGreen(p) != 255 && index!=0) {
-                                                if (index != lastIndex) {
-                                                        //                              Debug<<"ei="<<index<<" ";
-                                                        lastIndex = index;
-                                                }
-                                        }
-                                }
-                }
-
-
-                mUseFalseColors = false;
-                glPushAttrib(GL_CURRENT_BIT);
-                glColor3f(0,1,0);
-                glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
-                SetupCamera();
-                glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-
-                // Render PVS
-                Intersectable::NewMail();
-
-                ObjectPvsIterator it = pvs.GetIterator();
-                for (; it.HasMoreEntries(); ) 
-                {
-                        RenderIntersectable(it.Next());
-                }
-
-                im = toImage();
-                sprintf(filename, "error-frame-%04d-%0.5f-pvs.png", mFrame, pErrorPixels);
-                str = mSnapPrefix + filename;
-                qstr = str.c_str();
-                im.save(qstr, "PNG");
-                glPopAttrib();
-        }
-
+          glReadBuffer(GL_BACK);
+          
+          char filename[256];
+          sprintf(filename, "error-frame-%04d-%0.5f.png", mFrame, pErrorPixels);
+          QImage im = toImage();
+          string str = mSnapPrefix + filename;
+          QString qstr(str.c_str());
+          
+          im.save(qstr, "PNG");
+          if (1) { //0 && mFrame == 1543) {
+                int x,y;
+                int lastIndex = -1;
+                for (y=0; y < im.height(); y++)
+                  for (x=0; x < im.width(); x++) {
+                        QRgb p = im.pixel(x,y);
+                        int index = qRed(p) + (qGreen(p)<<8) + (qBlue(p)<<16);
+                        if (qGreen(p) != 255 && index!=0) {
+                          if (index != lastIndex) {
+                                //                              Debug<<"ei="<<index<<" ";
+                                lastIndex = index;
+                          }
+                        }
+                  }
+          }
+          
+          
+          mUseFalseColors = false;
+          glPushAttrib(GL_CURRENT_BIT);
+          glColor3f(0,1,0);
+          glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
+          SetupCamera();
+          glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+          
+          // Render PVS
+          Intersectable::NewMail();
+          
+          ObjectPvsIterator it = pvs.GetIterator();
+          for (; it.HasMoreEntries(); ) 
+                {
+                  RenderIntersectable(it.Next());
+                }
+          
+          im = toImage();
+          sprintf(filename, "error-frame-%04d-%0.5f-pvs.png", mFrame, pErrorPixels);
+          str = mSnapPrefix + filename;
+          qstr = str.c_str();
+          im.save(qstr, "PNG");
+          glPopAttrib();
+        }
+        
         glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
-
+        
         return pErrorPixels;
 }