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

Timestamp:

05/14/08 19:06:06 (16 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/Preprocessing/src/QtInterface

Files:

• QtGlRenderer.cpp (modified) (11 diffs)
• QtGlRenderer.h (modified) (4 diffs)

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

@@ -70 +70 @@
 
 
-void QtGlRendererBuffer::MakeCurrent()
+void QtGlRendererBuffer::MakeLive()
 {
         QGLPixelBuffer::makeCurrent();
@@ -77 +77 @@
 
 
-void QtGlRendererBuffer::DoneCurrent()
+void QtGlRendererBuffer::DoneLive()
 {
         QGLPixelBuffer::doneCurrent();
@@ -92 +92 @@
                                                  QGL::DepthBuffer | 
                                                  QGL::DoubleBuffer |
-                                                 QGL::Rgba
-                                                 )),
+                                                 QGL::Rgba)
+                                                 ),
 GlRendererBuffer(sceneGraph, viewcells, tree)
 {
@@ -99 +99 @@
         //mUseVbos = false;
         
-        MakeCurrent();
+        MakeLive();
         glViewport(0, 0, w, h);
     glMatrixMode(GL_PROJECTION);
@@ -109 +109 @@
 
         InitGL();
-        DoneCurrent();
+        
+        //mydynamicTexture = generateDynamicTexture();
+    // bind the dynamic texture to the pbuffer - this is a no-op under X11
+        //bindToDynamicTexture(mydynamicTexture);
+
+        DoneLive();
 }
 
@@ -133 +138 @@
 float QtGlRendererBuffer::GetPixelError(int &pvsSize)
 {
-        MakeCurrent();
+        MakeLive();
 
         if (0)
@@ -141 +146 @@
                 cout << "rgba: " << format().rgba() << endl;
                 cout << "double: " << format().doubleBuffer() << endl;
+                cout << "depth: " << format().depth() << endl;
+                cout << "gl:" << format().hasOpenGL() << endl;
+                cout << "dir:" << format().directRendering() << endl;
         }
 
@@ -249 +257 @@
         pixelCount = query->GetQueryResult();
 
-        pErrorPixels = ((float)pixelCount) / (GetWidth() * GetHeight());
-
+        pErrorPixels = (float)pixelCount / (GetWidth() * GetHeight());
+
+        // some error happened
         if (pixelCount > 0) 
         {
@@ -265 +274 @@
 
                         char filename[256];
-                        sprintf(filename, "error-frame-%04d-%0.5f.png", mFrame, pErrorPixels);
+                        //sprintf(filename, "error-frame-%04d-%0.5f.png", mFrame, pErrorPixels);
+                        sprintf(filename, "error-frame-%04d-%04d.png", mFrame, pixelCount);
                         QImage im = toImage();
                         string str = mSnapPrefix + filename;
@@ -306 +316 @@
         glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
 
-        DoneCurrent();
+        DoneLive();
 
         return pErrorPixels;
@@ -2399 +2409 @@
         // bind the dynamic texture to the pbuffer - this is a no-op under X11
         mRenderBuffer->bindToDynamicTexture(dynamicTexture);
-        makeCurrent();
+        //makeCurrent();
 }
 

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

@@ -61 +61 @@
         ~QtGlRendererBuffer() {}
 
-        virtual void MakeCurrent();
-        virtual void DoneCurrent();
+        virtual void MakeLive();
+        virtual void DoneLive();
 
         virtual int GetWidth() const { return width(); }
@@ -75 +75 @@
         int ComputePvs(ObjectContainer &objects, ObjectContainer &pvs) const;
 
+        unsigned int mydynamicTexture;
 
 public:
@@ -311 +312 @@
 
 public slots:
-void UpdateDynamicObjects();
+        
+        void UpdateDynamicObjects();
         void UpdateAllPvs();
         void ComputeVisibility();
@@ -516 +518 @@
                         mShowDistribution ^= 1;
 
-                std::cout << "b: " << (mShowDistribution & 1) << " " << (mShowDistribution & 2) << " " << (mShowDistribution & 4) << " " << (mShowDistribution & 8) << std::endl; 
+                std::cout << "b: " 
+                                  << (mShowDistribution & 1) << " " 
+                                  << (mShowDistribution & 2) << " " 
+                                  << (mShowDistribution & 4) << " " 
+                                  << (mShowDistribution & 8) << std::endl; 
         }