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

Timestamp:

04/29/08 16:20:37 (17 years ago)

Author:

mattausch

Message:

 

Location:

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

Files:

• QtGlRenderer.cpp (modified) (16 diffs)
• QtGlRenderer.h (modified) (1 diff)
• QtGlViewer.cpp (modified) (2 diffs)

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

@@ -74 +74 @@
 QtGlRendererBuffer::MakeCurrent()
 {
-  makeCurrent();
+        makeCurrent();
 }
 
@@ -80 +80 @@
 QtGlRendererBuffer::DoneCurrent()
 {
-  doneCurrent();
+        doneCurrent();
 }
   
 
-QtGlRendererBuffer::QtGlRendererBuffer(const int w,
-                                                                           const int h,
+QtGlRendererBuffer::QtGlRendererBuffer(int w, int h,
                                                                            SceneGraph *sceneGraph,
                                                                            ViewCellsManager *viewcells,
                                                                            KdTree *tree):
-  QGLPixelBuffer(QSize(w, h)),
-  GlRendererBuffer(sceneGraph, viewcells, tree)
-{
-  mUseVbos = true;
-  MakeCurrent();
-  InitGL();
-  DoneCurrent();
-}
-
-void
-QtGlRendererBuffer::RenderPvs(const ObjectPvs &pvs)
+QGLPixelBuffer(QSize(w, h), QGLFormat(QGL::SampleBuffers)),
+GlRendererBuffer(sceneGraph, viewcells, tree)
+{
+        mUseVbos = true;
+        //mUseVbos = false;
+        
+        MakeCurrent();
+        glViewport(0, 0, w, h);
+    glMatrixMode(GL_PROJECTION);
+    glLoadIdentity();
+    glOrtho(-1, 1, -1, 1, -99, 99);
+    //glTranslatef(-0.5f, -0.5f, 0.0f);
+    glMatrixMode(GL_MODELVIEW);
+    glLoadIdentity();
+
+        InitGL();
+        DoneCurrent();
+}
+
+
+void QtGlRendererBuffer::RenderPvs(const ObjectPvs &pvs)
 {
         PreparePvs(pvs);
@@ -112 +121 @@
 
 // reimplemented here so that we can snap the error windows
-float
-QtGlRendererBuffer::GetPixelError(int &pvsSize)
-{
-
+float QtGlRendererBuffer::GetPixelError(int &pvsSize)
+{
         MakeCurrent();
-
+        
+/*
+SetupCamera();
+RenderScene();
+*/
         float pErrorPixels = -1.0f;
 
@@ -127 +138 @@
 
         if (viewcell == NULL)
-                return 0.0f;
+                return -1.0f;
 
         ObjectPvs pvs;
@@ -143 +154 @@
 
         SetupCamera();
+
         glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
         glColorMask(GL_FALSE, GL_TRUE, GL_FALSE, GL_FALSE);
@@ -156 +168 @@
         pvsSize = pvs.GetSize();
         
+        if (pvsSize == 0)
+                return 0.0f;
+
         RenderPvs(pvs);
 
@@ -178 +193 @@
         // reenable other state
         int wait = 0;
-        
         while (0 && !query->ResultAvailable()) 
-        {
                 wait ++;
-        }
-
-
+        
         pixelCount = query->GetQueryResult();
 
-        if ((pixelCount > 0) && (pvsSize > 0))
+        if (pixelCount > 0) 
         {
                 cout << "vc id: " << viewcell->GetId() << " pvs: " << pvsSize << " pc: " << pixelCount << endl;
@@ -195 +206 @@
 
 
-        if (mSnapErrorFrames && (pixelCount > 0)) {
+        if (mSnapErrorFrames && (pixelCount > 0)) 
+        {
                 glReadBuffer(GL_BACK);
                 //glReadBuffer(GL_FRONT);
@@ -226 +238 @@
                 glColor3f(0,1,0);
                 glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
-                glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+                //glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+                glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
 
                 RenderPvs(pvs);
@@ -412 +425 @@
         glNormalPointer(GL_FLOAT, 0, (char *)arrayPtr + offset * sizeof(Vector3));
         glDrawElements(GL_TRIANGLES, mIndexBufferSize, GL_UNSIGNED_INT, mIndices);
+
 #if DYNAMIC_OBJECTS_HACK
         // handle dynamic objects
         DynamicObjectsContainer::const_iterator dit, dit_end = mDynamicObjects.end();
-
 
         for (dit = mDynamicObjects.begin(); dit != dit_end; ++ dit)
@@ -541 +554 @@
                 if (mUseSpatialFilter && mRenderBoxes) 
                 {
-                        for (int i=0; i < mPvsCache.filteredBoxes.size(); ++ i)
+                        for (size_t i=0; i < mPvsCache.filteredBoxes.size(); ++ i)
                         {
                                 RenderBox(mPvsCache.filteredBoxes[i]);
@@ -559 +572 @@
                         RenderIntersectable(viewcell);
                         
-                        /*glPushMatrix();
-                        glTranslatef(mViewPoint.x, mViewPoint.y, mViewPoint.z);
-                        glScalef(5.0f,5.0f,5.0f);
-                        glPushAttrib(GL_CURRENT_BIT);
-                        glColor3f(1.0f, 0.0f, 0.0f);
-                        //        gluSphere((::GLUquadric *)mSphere,
-                        //                              1e-3*Magnitude(mViewCellsManager->GetViewSpaceBox().Size()), 6, 6);
-                        glPopAttrib();
-                        glPopMatrix();
-                        */
                         mWireFrame = false;
                 }
@@ -575 +578 @@
         else 
         {
-                //ObjectContainer::const_iterator oi = mObjects.begin();
-                //for (; oi != mObjects.end(); oi++)
-                //      RenderIntersectable(*oi);
+                //OcclusionQuery *query = mOcclusionQueries[0];
+                //query->BeginQuery();
+                
                 RenderScene();
+
+                //query->EndQuery();
+                //int pixels = query->GetQueryResult();
+                //cout << " pixels: " << pixels;
         }
 
@@ -611 +618 @@
 
         glColor3f(1.0f, 0.0f, 0.0f);
-
 
         OcclusionQuery *query = mOcclusionQueries[0];
@@ -634 +640 @@
 
         int pixelCount = query->GetQueryResult();
-        pErrorPixels = ((float)pixelCount)/(GetWidth()*GetHeight());
-        if (0) cout<<"error pixels="<<pixelCount<<endl;
+        pErrorPixels = ((float)pixelCount) / (GetWidth() * GetHeight());
+        if (0) cout << "error pixels=" << pixelCount << endl;
 
         mRenderError = pErrorPixels;
@@ -2335 +2341 @@
         // set up the pbuffer context
         mRenderBuffer->makeCurrent();
-        /*mRenderBuffer->InitGL();
-
-        glViewport(0, 0, mRenderBuffer->size().width(), mRenderBuffer->size().height());
-        glMatrixMode(GL_PROJECTION);
-        glLoadIdentity();
-        glOrtho(-1, 1, -1, 1, -99, 99);
-        glTranslatef(-0.5f, -0.5f, 0.0f);
-        glMatrixMode(GL_MODELVIEW);
-        glLoadIdentity();
-
-        glClear(GL_DEPTH_BUFFER_BIT | GL_COLOR_BUFFER_BIT);*/
-
+        
         // generate a texture that has the same size/format as the pbuffer
         dynamicTexture = mRenderBuffer->generateDynamicTexture();

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

@@ -54 +54 @@
         Q_OBJECT
 public:
-        QtGlRendererBuffer(const int w,
-                const int h,
-                SceneGraph *sceneGraph,
-                ViewCellsManager *viewcells,
-                KdTree *tree);
-
-  ~QtGlRendererBuffer() {}
-
-  virtual void MakeCurrent();
-  virtual void DoneCurrent();
-
-  virtual int GetWidth() const { return width(); }
-  virtual int GetHeight() const { return height(); }
-
-  int ComputePvs() const { return 0; }
-
-  void
-  RenderPvs(const ObjectPvs &pvs);
-
-  float
-  GetPixelError(int &pvsSize);
-  
-  int ComputePvs(ObjectContainer &objects, ObjectContainer &pvs) const;
-     
-  
-  
-  
+        QtGlRendererBuffer(int w, int h,
+                                           SceneGraph *sceneGraph,
+                                           ViewCellsManager *viewcells,
+                                           KdTree *tree);
+
+        ~QtGlRendererBuffer() {}
+
+        virtual void MakeCurrent();
+        virtual void DoneCurrent();
+
+        virtual int GetWidth() const { return width(); }
+        virtual int GetHeight() const { return height(); }
+
+        int ComputePvs() const { return 0; }
+
+        void RenderPvs(const ObjectPvs &pvs);
+
+        float GetPixelError(int &pvsSize);
+
+        int ComputePvs(ObjectContainer &objects, ObjectContainer &pvs) const;
+
 public:
-  signals:
-  void UpdatePvsErrorItem(int i, GlRendererBuffer::PvsErrorEntry &);
+
+signals:
+        void UpdatePvsErrorItem(int i, GlRendererBuffer::PvsErrorEntry &);
 };
 

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

@@ -24 +24 @@
 
 QtGlViewer::QtGlViewer(QWidget *parent,
-                                           QtGlRendererWidget *renderer):
-  QGLWidget(parent), mRenderer(renderer)
+                                           QtGlRendererWidget *renderer)
+: QGLWidget(parent), mRenderer(renderer)
 {
         scale = 1.0f;
@@ -42 +42 @@
 }
   
+
 QSize QtGlViewer::minimumSizeHint() const
 {