Changeset 496 for trunk/VUT/GtpVisibilityPreprocessor/src/GlRenderer.cpp

Timestamp:

01/04/06 15:07:05 (18 years ago)

Author:

bittner

Message:

glrenderer split into widget and buffer, buffer moved to the same thread as the preprocessor

File:

• trunk/VUT/GtpVisibilityPreprocessor/src/GlRenderer.cpp (modified) (10 diffs)

trunk/VUT/GtpVisibilityPreprocessor/src/GlRenderer.cpp

@@ -8 +8 @@
 #include <GL/glext.h>
 
-GlRenderer *renderer = NULL;
+GlRendererWidget *rendererWidget = NULL;
 
 #ifdef _WIN32
@@ -18 +18 @@
 
 GlRenderer::GlRenderer(SceneGraph *sceneGraph,
-                                   ViewCellsManager *viewCellsManager):
-  QGLWidget(),
+                                           ViewCellsManager *viewCellsManager):
   mSceneGraph(sceneGraph),
   mViewCellsManager(viewCellsManager)
@@ -26 +25 @@
   mViewPoint = mSceneGraph->GetBox().Center();
   mViewDirection = Vector3(0,0,1);
-  mRender = true;
-
   //  timerId = startTimer(10);
   mFrame = 0;
-  mPvsStatFrames = 10000;
-  mPvsErrorBuffer.resize(mPvsStatFrames);
-  ClearErrorBuffer();
-  pbuffer = NULL;
 }
 
 GlRenderer::~GlRenderer()
 {
-  if (pbuffer)
-        delete pbuffer;
 }
 
@@ -101 +92 @@
         
 void
-GlRenderer::initializeGL()
+GlRenderer::InitGL()
 {
   glMatrixMode(GL_PROJECTION);
@@ -124 +115 @@
 }
 
-void
-GlRenderer::resizeGL(int w, int h)
-{
-  SetupProjection(w, h);
-
-  if (pbuffer == NULL || pbuffer->size().width() != w || pbuffer->size().height() != h) {
-        if (pbuffer)
-          delete pbuffer;
-        pbuffer = new QGLPixelBuffer(QSize(w,h));
-  }
-  
-  updateGL();
-}
 
 
@@ -182 +160 @@
 }
 
-void
-GlRenderer::paintGL()
-{
-  if (mRender) {
-        Render();
-        mFrame++;
-  }
-}
-
-void
-GlRenderer::ClearErrorBuffer()
-{
-  for (int i=0; i < mPvsStatFrames; i++) {
-        mPvsErrorBuffer[i] = 1.0f;
-  }
-}
-
-void
-GlRenderer::EvalPvsStat()
-{
-  mPvsStat.Reset();
-  halton.Reset();
-
-  pbuffer->makeCurrent();
-  initializeGL();
-  SetupProjection(pbuffer->size().width(), pbuffer->size().height());
-  
-  for (int i=0; i < mPvsStatFrames; i++) {
-        float err;
-        RandomViewPoint();
-        if (mPvsErrorBuffer[i] > 0.0f) {
-          mPvsErrorBuffer[i] = GetPixelError();
-          cout<<"("<<i<<","<<mPvsErrorBuffer[i]<<")";
-          //      swapBuffers();
+
+float
+GlRenderer::GetPixelError()
+{
+  float pErrorPixels = -1.0f;
+
+  glReadBuffer(GL_BACK);
+  
+  mUseFalseColors = true;
+
+  SetupCamera();
+  glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+  glEnable( GL_CULL_FACE );
+  
+  RenderScene();
+
+  // now check whether any backfacing polygon would pass the depth test
+  static int query = -1;
+  if (query == -1)
+        glGenOcclusionQueriesNV(1, (unsigned int *)&query);
+  
+  glColorMask(GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE);
+  glDepthMask(GL_FALSE);
+  glDisable( GL_CULL_FACE );
+  
+  glBeginOcclusionQueryNV(query);
+  
+  RenderScene();
+  
+  glEndOcclusionQueryNV();
+
+  // 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 );
+  
+  unsigned int pixelCount;
+  // reenable other state
+  glGetOcclusionQueryuivNV(query,
+                                                   GL_PIXEL_COUNT_NV,
+                                                   &pixelCount);
+
+  if (pixelCount > 0)
+        return -1.0f; // backfacing polygon found -> not a valid viewspace sample
+
+  ViewCell *viewcell = mViewCellsManager->GetViewCell(mViewPoint);
+  
+  if (viewcell) {
+        SetupCamera();
+        glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+
+        // Render PVS
+        std::map<Intersectable *,
+          PvsData<Intersectable *>,
+          LtSample<Intersectable *> >::const_iterator it = viewcell->GetPvs().mEntries.begin();
+        
+        for (; it != viewcell->GetPvs().mEntries.end(); ++ it) {
+          Intersectable *object = (*it).first;
+          RenderIntersectable(object);
         }
-        
-        err = mPvsErrorBuffer[i];
-        
-        if (err >= 0.0f) {
-          if (err > mPvsStat.maxError)
-                mPvsStat.maxError = err;
-          mPvsStat.sumError += err;
-          if (err == 0.0f)
-                mPvsStat.errorFreeFrames++;
-          mPvsStat.frames++;
-        }
-  }
-  
-  pbuffer->doneCurrent();
-
-  cout<<endl<<flush;
-  mRenderingFinished.wakeAll();
-}
+
+        glBeginOcclusionQueryNV(query);
+
+        SetupCamera();
+
+        RenderScene();
+        
+        glEndOcclusionQueryNV();
+        
+
+        unsigned int pixelCount;
+        // reenable other state
+        glGetOcclusionQueryuivNV(query,
+                                                         GL_PIXEL_COUNT_NV,
+                                                         &pixelCount);
+        
+        pErrorPixels = (100.f*pixelCount)/(GetWidth()*GetHeight());
+  }
+  
+  return pErrorPixels;
+}
+
 
 float
-GlRenderer::Render()
+GlRendererWidget::RenderErrors()
 {
   float pErrorPixels = -1.0f;
@@ -346 +353 @@
   return pErrorPixels;
 }
+
 
 void
@@ -363 +371 @@
 }
 
-float
-GlRenderer::GetPixelError()
-{
-  float pErrorPixels = -1.0f;
-
-  glReadBuffer(GL_BACK);
-  
-  mUseFalseColors = true;
-
-  SetupCamera();
-  glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-  glEnable( GL_CULL_FACE );
-  
-  RenderScene();
-
-  // now check whether any backfacing polygon would pass the depth test
-  static int query = -1;
-  if (query == -1)
-        glGenOcclusionQueriesNV(1, (unsigned int *)&query);
-  
-  glColorMask(GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE);
-  glDepthMask(GL_FALSE);
-  glDisable( GL_CULL_FACE );
-  
-  glBeginOcclusionQueryNV(query);
-  
-  RenderScene();
-  
-  glEndOcclusionQueryNV();
-
-  // 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 );
-  
-  unsigned int pixelCount;
-  // reenable other state
-  glGetOcclusionQueryuivNV(query,
-                                                   GL_PIXEL_COUNT_NV,
-                                                   &pixelCount);
-
-  if (pixelCount > 0)
-        return -1.0f; // backfacing polygon found -> not a valid viewspace sample
-
-  ViewCell *viewcell = mViewCellsManager->GetViewCell(mViewPoint);
-  
-  if (viewcell) {
-        SetupCamera();
-        glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-
-        // Render PVS
-        std::map<Intersectable *,
-          PvsData<Intersectable *>,
-          LtSample<Intersectable *> >::const_iterator it = viewcell->GetPvs().mEntries.begin();
-        
-        for (; it != viewcell->GetPvs().mEntries.end(); ++ it) {
-          Intersectable *object = (*it).first;
-          RenderIntersectable(object);
+
+void
+GlRendererBuffer::ClearErrorBuffer()
+{
+  for (int i=0; i < mPvsStatFrames; i++) {
+        mPvsErrorBuffer[i] = 1.0f;
+  }
+}
+
+
+void
+GlRendererBuffer::EvalPvsStat()
+{
+  mPvsStat.Reset();
+  halton.Reset();
+
+  makeCurrent();
+
+  SetupProjection(GetWidth(), GetHeight());
+  
+  for (int i=0; i < mPvsStatFrames; i++) {
+        float err;
+        RandomViewPoint();
+        if (mPvsErrorBuffer[i] > 0.0f) {
+          mPvsErrorBuffer[i] = GetPixelError();
+          cout<<"("<<i<<","<<mPvsErrorBuffer[i]<<")";
+          //      swapBuffers();
         }
-
-        glBeginOcclusionQueryNV(query);
-
-        SetupCamera();
-
-        RenderScene();
-        
-        glEndOcclusionQueryNV();
-        
-
-        unsigned int pixelCount;
-        // reenable other state
-        glGetOcclusionQueryuivNV(query,
-                                                         GL_PIXEL_COUNT_NV,
-                                                         &pixelCount);
-        
-        pErrorPixels = (100.f*pixelCount)/(height()*width());
-  }
-  
-  return pErrorPixels;
-}
-
-
-void
-GlRenderer::mousePressEvent(QMouseEvent *e)
+        
+        err = mPvsErrorBuffer[i];
+        
+        if (err >= 0.0f) {
+          if (err > mPvsStat.maxError)
+                mPvsStat.maxError = err;
+          mPvsStat.sumError += err;
+          if (err == 0.0f)
+                mPvsStat.errorFreeFrames++;
+          mPvsStat.frames++;
+        }
+  }
+  
+  doneCurrent();
+
+  cout<<endl<<flush;
+  mRenderingFinished.wakeAll();
+}
+
+
+
+
+
+void
+GlRendererWidget::mousePressEvent(QMouseEvent *e)
 {
   int x = e->pos().x();
@@ -457 +434 @@
 
 void
-GlRenderer::mouseMoveEvent(QMouseEvent *e)
+GlRendererWidget::mouseMoveEvent(QMouseEvent *e)
 {
   float MOVE_SENSITIVITY = Magnitude(mSceneGraph->GetBox().Diagonal())*1e-3;
@@ -485 +462 @@
 
 void
-GlRenderer::mouseReleaseEvent(QMouseEvent *)
-{
-
-
-}
+GlRendererWidget::mouseReleaseEvent(QMouseEvent *)
+{
+
+
+}
+
+void
+GlRendererWidget::resizeGL(int w, int h)
+{
+  SetupProjection(w, h);
+  updateGL();
+}
+
+void
+GlRendererWidget::paintGL()
+{
+  RenderErrors();
+  mFrame++;
+}