Changeset 2612 for GTP

Timestamp:

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

Author:

bittner

Message:

occlusion query bugfix

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• GlRenderer.cpp (modified) (6 diffs)
• Makefile (modified) (2 diffs)
• OcclusionQuery.cpp (modified) (1 diff)
• QtInterface/QtGlRenderer.cpp (modified) (6 diffs)
• SG08/run_test_pixel (modified) (1 diff)
• preprocessor.pro (modified) (1 diff)

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

@@ -1350 +1350 @@
 
         glTexImage2D(GL_TEXTURE_2D, 0, GL_DEPTH_COMPONENT, depthMapSize, 
-                depthMapSize, 0, GL_DEPTH_COMPONENT, GL_UNSIGNED_BYTE, NULL);
+                                 depthMapSize, 0, GL_DEPTH_COMPONENT, GL_UNSIGNED_BYTE, NULL);
         glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
         glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
@@ -1393 +1393 @@
 
 #endif
-
 #endif
         DoneCurrent();
@@ -1414 +1413 @@
 
         bool result = GlRenderer::ValidViewPoint();
-
+        
         DoneCurrent();
         
@@ -1443 +1442 @@
           if (!ValidViewPoint())
                 mPvsErrorBuffer[i].mError = -1.0f;
-
+          
           // manualy corrected view point
           if (mFrame == 5105)
@@ -1594 +1593 @@
         glEnable( GL_CULL_FACE );
 
-        //  int wait = 0;
-        //  while (!query.ResultAvailable()) {
-        //      wait++;
-        //  }
+        //      int wait = 0;
+        //      while (!query->ResultAvailable()) {
+        //        wait++;
+        //      }
 
         // reenable other state
@@ -1603 +1602 @@
         //  cout<<"VV4 ";
 
-        //cout<<"count: " << pixelCount<<endl;
 
         if (pixelCount > 0)

GTP/trunk/Lib/Vis/Preprocessing/src/Makefile

@@ -1 +1 @@
 #############################################################################
 # Makefile for building: preprocessor
-# Generated by qmake (2.00a) (Qt 4.1.2) on: ?t 17. I 22:17:44 2008
+# Generated by qmake (2.00a) (Qt 4.1.2) on: ?t 17. I 23:22:18 2008
 # Project:  preprocessor.pro
 # Template: app
@@ -63 +63 @@
         $(MAKE) -f $(MAKEFILE).Debug uninstall
 
-Makefile: preprocessor.pro  C:/Qt/4.1.2/mkspecs/win32-msvc2005\qmake.conf C:/Qt/4.1.2/mkspecs/qconfig.pri \
+Makefile: preprocessor.pro  C:/Qt/4.1.2/mkspecs/win32-msvc.net\qmake.conf C:/Qt/4.1.2/mkspecs/qconfig.pri \
                 C:\Qt\4.1.2\mkspecs\features\qt_config.prf \
                 C:\Qt\4.1.2\mkspecs\features\exclusive_builds.prf \

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

@@ -11 +11 @@
 #include <SDL/SDL_opengl.h>
 #endif
+
+#define _ARBGL
 
 using namespace std;

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

GTP/trunk/Lib/Vis/Preprocessing/src/SG08/run_test_pixel

@@ -4 +4 @@
 #COMMAND="./release/preprocessor.exe -preprocessor_quit_on_finish+"
 #COMMAND="../scripts/preprocessor.sh -preprocessor_quit_on_finish+ -preprocessor_use_gl_renderer- -preprocessor_evaluate_filter- -samples_per_pass=500000 -samples_per_evaluation=10000000 -total_samples=500000000 -preprocessor_pvs_rendererror_samples=10000 -preprocessor_evaluatePixelError+"
-COMMAND="../scripts/preprocessor.sh -preprocessor_quit_on_finish+ -preprocessor_use_gl_renderer- -preprocessor_evaluate_filter- -samples_per_pass=1000000 -samples_per_evaluation=500000 -total_samples=500000000 -preprocessor_pvs_rendererror_samples=10000 -preprocessor_evaluatePixelError+"
+COMMAND="../scripts/preprocessor.sh -preprocessor_quit_on_finish+ -preprocessor_use_gl_renderer- -preprocessor_evaluate_filter- -samples_per_pass=1000000 -samples_per_evaluation=500000 -total_samples=500000000 -preprocessor_pvs_rendererror_samples=10000 -preprocessor_evaluatePixelError+ -preprocessor_detect_empty_viewspace+"
 
 #SCENE="../data/vienna/vienna-buildings.x3d;../data/vienna/vienna-roofs.x3d;../data/vienna/vienna-roads.x3d"

GTP/trunk/Lib/Vis/Preprocessing/src/preprocessor.pro

@@ -28 +28 @@
 unix:INCLUDEPATH += ../support/src/xerces-c-src_2_7_0/include
 
-#XERCES = $$NONGTP/Xerces/xerces
-XERCES = $$NONGTP/Xerces/xerces-c_2_8_0
+XERCES = $$NONGTP/Xerces/xerces
+#XERCES = $$NONGTP/Xerces/xerces-c_2_8_0
   
 INCLUDEPATH += ../src ../src/Timer ../src/QtInterface $$XERCES/include  $$NONGTP/Zlib/include $$NONGTP/Boost $$NONGTP/Devil/include