]> SALOME platform Git repositories - modules/shaper.git/commitdiff
Salome HOME
Debug toolbar background painting (Issue #33)
authorvsv <vsv@coldrex.nnov.opencascade.com>
Mon, 21 Apr 2014 11:45:22 +0000 (15:45 +0400)
committervsv <vsv@coldrex.nnov.opencascade.com>
Mon, 21 Apr 2014 11:45:22 +0000 (15:45 +0400)
src/XGUI/XGUI_ViewPort.cpp
src/XGUI/XGUI_ViewWindow.cpp

index c71796465e8178b970dbf4341009cf4ab83dec1b..8efbfc0c820a953abefae0050556bc9daf0051ed 100644 (file)
@@ -1,7 +1,3 @@
-#ifdef WIN32
-# include <windows.h>
-# include <wingdi.h>
-#endif
 
 #include "XGUI_ViewPort.h"
 #include "XGUI_ViewWindow.h"
 #endif
 
 #include <GL/gl.h>
-//qmetatype.h must be included before any header file that defines Bool
-//see /QtCore/qmetatype.h:53 for more info
-#ifndef WIN32
-# ifndef GLX_GLXEXT_LEGACY
-#  define GLX_GLXEXT_LEGACY
-# endif
-# include <GL/glx.h>
-# include <dlfcn.h>
-#endif
 
 static double rx = 0.;
 static double ry = 0.;
@@ -41,6 +28,7 @@ static int sx = 0;
 static int sy = 0;
 static Standard_Boolean zRotation = Standard_False;
 
+
 /*!
  Create native view window for CasCade view [ static ]
  */
@@ -56,202 +44,6 @@ Handle(Aspect_Window) CreateCasWindow(const Handle(V3d_View)& view, WId winId)
   return viewWindow;
 }
 
-class OpenGLUtils_FrameBuffer
-{
-public:
-  OpenGLUtils_FrameBuffer();
-  ~OpenGLUtils_FrameBuffer();
-
-  bool init(const GLsizei&, const GLsizei&);
-  void release();
-
-  void bind();
-  void unbind();
-
-private:
-  GLuint textureId;
-  GLuint fboId;
-  GLuint rboId;
-};
-
-#ifndef APIENTRY
-#define APIENTRY
-#endif
-#ifndef APIENTRYP
-#define APIENTRYP APIENTRY *
-#endif
-
-#ifndef GL_FRAMEBUFFER_EXT
-#define GL_FRAMEBUFFER_EXT                0x8D40
-#endif
-
-#ifndef GL_RENDERBUFFER_EXT
-#define GL_RENDERBUFFER_EXT               0x8D41
-#endif
-
-#ifndef GL_COLOR_ATTACHMENT0_EXT
-#define GL_COLOR_ATTACHMENT0_EXT          0x8CE0
-#endif
-
-#ifndef GL_DEPTH_ATTACHMENT_EXT
-#define GL_DEPTH_ATTACHMENT_EXT           0x8D00
-#endif
-
-#ifndef GL_FRAMEBUFFER_COMPLETE_EXT
-#define GL_FRAMEBUFFER_COMPLETE_EXT       0x8CD5
-#endif
-
-typedef void (APIENTRYP PFNGLGENFRAMEBUFFERSEXTPROC)(GLsizei n, GLuint *framebuffers);
-typedef void (APIENTRYP PFNGLBINDFRAMEBUFFEREXTPROC)(GLenum target, GLuint framebuffer);
-typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURE2DEXTPROC)(GLenum target, GLenum attachment,
-                                                          GLenum textarget, GLuint texture,
-                                                          GLint level);
-typedef GLenum (APIENTRYP PFNGLCHECKFRAMEBUFFERSTATUSEXTPROC)(GLenum target);
-typedef void (APIENTRYP PFNGLDELETEFRAMEBUFFERSEXTPROC)(GLsizei n, const GLuint *framebuffers);
-typedef void (APIENTRYP PFNGLGENRENDERBUFFERSEXTPROC)(GLsizei n, GLuint *renderbuffers);
-typedef void (APIENTRYP PFNGLBINDRENDERBUFFEREXTPROC)(GLenum target, GLuint renderbuffer);
-typedef void (APIENTRYP PFNGLRENDERBUFFERSTORAGEEXTPROC)(GLenum target, GLenum internalformat,
-                                                         GLsizei width, GLsizei height);
-typedef void (APIENTRYP PFNGLFRAMEBUFFERRENDERBUFFEREXTPROC)(GLenum target, GLenum attachment,
-                                                             GLenum renderbuffertarget,
-                                                             GLuint renderbuffer);
-typedef void (APIENTRYP PFNGLDELETERENDERBUFFERSEXTPROC)(GLsizei n, const GLuint *renderbuffers);
-
-static PFNGLGENFRAMEBUFFERSEXTPROC vglGenFramebuffersEXT = NULL;
-static PFNGLBINDFRAMEBUFFEREXTPROC vglBindFramebufferEXT = NULL;
-static PFNGLFRAMEBUFFERTEXTURE2DEXTPROC vglFramebufferTexture2DEXT = NULL;
-static PFNGLCHECKFRAMEBUFFERSTATUSEXTPROC vglCheckFramebufferStatusEXT = NULL;
-static PFNGLDELETEFRAMEBUFFERSEXTPROC vglDeleteFramebuffersEXT = NULL;
-static PFNGLGENRENDERBUFFERSEXTPROC vglGenRenderbuffersEXT = NULL;
-static PFNGLBINDRENDERBUFFEREXTPROC vglBindRenderbufferEXT = NULL;
-static PFNGLRENDERBUFFERSTORAGEEXTPROC vglRenderbufferStorageEXT = NULL;
-static PFNGLFRAMEBUFFERRENDERBUFFEREXTPROC vglFramebufferRenderbufferEXT = NULL;
-static PFNGLDELETERENDERBUFFERSEXTPROC vglDeleteRenderbuffersEXT = NULL;
-
-#ifndef WIN32
-#define GL_GetProcAddress( x ) glXGetProcAddressARB( (const GLubyte*)x )
-#else
-#define GL_GetProcAddress( x ) wglGetProcAddress( (const LPCSTR)x )
-#endif
-
-bool InitializeEXT()
-{
-  vglGenFramebuffersEXT = (PFNGLGENFRAMEBUFFERSEXTPROC) GL_GetProcAddress("glGenFramebuffersEXT");
-  vglBindFramebufferEXT = (PFNGLBINDFRAMEBUFFEREXTPROC) GL_GetProcAddress("glBindFramebufferEXT");
-  vglFramebufferTexture2DEXT = (PFNGLFRAMEBUFFERTEXTURE2DEXTPROC) GL_GetProcAddress(
-      "glFramebufferTexture2DEXT");
-  vglCheckFramebufferStatusEXT = (PFNGLCHECKFRAMEBUFFERSTATUSEXTPROC) GL_GetProcAddress(
-      "glCheckFramebufferStatusEXT");
-  vglDeleteFramebuffersEXT = (PFNGLDELETEFRAMEBUFFERSEXTPROC) GL_GetProcAddress(
-      "glDeleteFramebuffersEXT");
-  vglGenRenderbuffersEXT = (PFNGLGENRENDERBUFFERSEXTPROC) GL_GetProcAddress(
-      "glGenRenderbuffersEXT");
-  vglBindRenderbufferEXT = (PFNGLBINDRENDERBUFFEREXTPROC) GL_GetProcAddress(
-      "glBindRenderbufferEXT");
-  vglRenderbufferStorageEXT = (PFNGLRENDERBUFFERSTORAGEEXTPROC) GL_GetProcAddress(
-      "glRenderbufferStorageEXT");
-  vglFramebufferRenderbufferEXT = (PFNGLFRAMEBUFFERRENDERBUFFEREXTPROC) GL_GetProcAddress(
-      "glFramebufferRenderbufferEXT");
-  vglDeleteRenderbuffersEXT = (PFNGLDELETERENDERBUFFERSEXTPROC) GL_GetProcAddress(
-      "glDeleteRenderbuffersEXT");
-
-  bool ok = vglGenFramebuffersEXT && vglBindFramebufferEXT && vglFramebufferTexture2DEXT
-      && vglCheckFramebufferStatusEXT && vglDeleteFramebuffersEXT && vglGenRenderbuffersEXT
-      && vglBindRenderbufferEXT && vglRenderbufferStorageEXT && vglFramebufferRenderbufferEXT
-      && vglDeleteRenderbuffersEXT;
-
-  return ok;
-}
-
-static bool IsEXTInitialized = InitializeEXT();
-
-OpenGLUtils_FrameBuffer::OpenGLUtils_FrameBuffer()
-    : textureId(0), fboId(0), rboId(0)
-{
-}
-
-OpenGLUtils_FrameBuffer::~OpenGLUtils_FrameBuffer()
-{
-  release();
-}
-
-bool OpenGLUtils_FrameBuffer::init(const GLsizei& xSize, const GLsizei& ySize)
-{
-  char* ext = (char*) glGetString(GL_EXTENSIONS);
-  if (!ext)
-    return false;
-  if (!IsEXTInitialized || strstr(ext, "GL_EXT_framebuffer_object") == NULL) {
-    //qDebug( "Initializing OpenGL FrameBuffer extension failed");
-    return false;
-  }
-
-  // create a texture object
-  glEnable (GL_TEXTURE_2D);
-  glGenTextures(1, &textureId);
-  glBindTexture(GL_TEXTURE_2D, textureId);
-  glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-  glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-  glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, xSize, ySize, 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL);
-  glBindTexture(GL_TEXTURE_2D, 0);
-
-  // create a renderbuffer object to store depth info
-  vglGenRenderbuffersEXT(1, &rboId);
-  vglBindRenderbufferEXT( GL_RENDERBUFFER_EXT, rboId);
-  vglRenderbufferStorageEXT( GL_RENDERBUFFER_EXT, GL_DEPTH_COMPONENT, xSize, ySize);
-  vglBindRenderbufferEXT( GL_RENDERBUFFER_EXT, 0);
-
-  // create a framebuffer object
-  vglGenFramebuffersEXT(1, &fboId);
-  vglBindFramebufferEXT( GL_FRAMEBUFFER_EXT, fboId);
-
-  // attach the texture to FBO color attachment point
-  vglFramebufferTexture2DEXT( GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT, GL_TEXTURE_2D,
-                             textureId, 0);
-
-  // attach the renderbuffer to depth attachment point
-  vglFramebufferRenderbufferEXT( GL_FRAMEBUFFER_EXT, GL_DEPTH_ATTACHMENT_EXT,
-  GL_RENDERBUFFER_EXT,
-                                rboId);
-
-  // check FBO status
-  GLenum status = vglCheckFramebufferStatusEXT( GL_FRAMEBUFFER_EXT);
-
-  // Unbind FBO
-  vglBindFramebufferEXT( GL_FRAMEBUFFER_EXT, 0);
-
-  return status == GL_FRAMEBUFFER_COMPLETE_EXT;
-}
-
-void OpenGLUtils_FrameBuffer::release()
-{
-  if (!IsEXTInitialized)
-    return;
-
-  glDeleteTextures(1, &textureId);
-  textureId = 0;
-
-  vglDeleteFramebuffersEXT(1, &fboId);
-  fboId = 0;
-
-  vglDeleteRenderbuffersEXT(1, &rboId);
-  rboId = 0;
-}
-
-void OpenGLUtils_FrameBuffer::bind()
-{
-  if (!IsEXTInitialized)
-    return;
-
-  vglBindFramebufferEXT( GL_FRAMEBUFFER_EXT, fboId);
-}
-
-void OpenGLUtils_FrameBuffer::unbind()
-{
-  if (!IsEXTInitialized)
-    return;
-
-  vglBindFramebufferEXT( GL_FRAMEBUFFER_EXT, 0);
-}
 
 //************************************************************************
 //************************************************************************
@@ -531,37 +323,6 @@ QImage XGUI_ViewPort::dumpView(QRect theRect, bool toUpdate)
   }
   QApplication::syncX();
 
-  OpenGLUtils_FrameBuffer aFrameBuffer;
-  if (aFrameBuffer.init(aWidth, aHeight)) {
-    QImage anImage(aWidth, aHeight, QImage::Format_RGB32);
-
-    glPushAttrib (GL_VIEWPORT_BIT);
-    glViewport(0, 0, aWidth, aHeight);
-    aFrameBuffer.bind();
-
-    // draw scene
-    if (toUpdate) {
-      if (theRect.isNull())
-        view->Redraw();
-      else
-        view->Redraw(theRect.x(), theRect.y(), theRect.width(), theRect.height());
-    }
-    aFrameBuffer.unbind();
-    glPopAttrib();
-
-    aFrameBuffer.bind();
-    if (theRect.isNull())
-      glReadPixels(0, 0, aWidth, aHeight, GL_RGBA, GL_UNSIGNED_BYTE, anImage.bits());
-    else
-      glReadPixels(theRect.x(), theRect.y(), aWidth, aHeight, GL_RGBA, GL_UNSIGNED_BYTE,
-                   anImage.bits());
-    aFrameBuffer.unbind();
-
-    anImage = anImage.rgbSwapped();
-    anImage = anImage.mirrored();
-    return anImage;
-  }
-  // if frame buffers are unsupported, use old functionality
   unsigned char* data = new unsigned char[aWidth * aHeight * 4];
 
   QPoint p;
index 5e56d61db4ab26be2d6fa7ce00a552289d461d94..48e22dc19f407fb0c341ddc90ec4d7e512e96abb 100644 (file)
@@ -79,9 +79,9 @@ const char* imageCrossCursor[] = { "32 32 3 1", ". c None", "a c #000000", "# c
     "................................", "................................" };
 
 
+static int aAA = 0;
 void ViewerToolbar::paintEvent(QPaintEvent* theEvent)
 {
-  //qDebug("### ViewerToolbar::paintEvent  %i\n", AA++);
   // Paint background
   QPainter aPainter(this);
   QRect aRect = rect();