Add QSurfaceFormat to QtGLBuffer

Author: Gary Huang

src/PGlobal/pglobal.h

@@ -43,10 +43,24 @@
     PB(keyReleased) \
     PB(keyTyped)
 
-#ifndef DETECTCXX0X
-#define OVERRIDE
+#ifndef __has_feature      // Optional of course.
+#define __has_feature(x) 0 // Compatibility with non-clang compilers.
+#endif
+
+#if __cplusplus >= 201103L || defined(__GXX_EXPERIMENTAL_CXX0X__)
+# define P_COMPILER_EXPLICIT_OVERRIDES
+#endif
+
+#ifdef P_COMPILER_EXPLICIT_OVERRIDES
+# define OVERRIDE override
+# define FINAL final
 #else
-#define OVERRIDE override
+# ifndef OVERRIDE
+#  define OVERRIDE
+# endif
+# ifndef FINAL
+#  define FINAL
+# endif
 #endif
 
 PROCESSING_BEGIN_NAMESPACE 

src/QtEngine/qtglcanvas.cpp

@@ -23,12 +23,13 @@ class QtGLBuffer : public IQtBuffer
     QRect rect() const OVERRIDE;
 
 private:
-    QRect drawRect;
+    QSurfaceFormat format;
     QWindow window;
     QOpenGLContext context;
     QOpenGLFramebufferObjectFormat fbo_format;
     QOpenGLFramebufferObject *fbo;
     QOpenGLPaintDevice *device;
+    QRect drawRect;
     QPainter painter;
     QImage image;
     bool painting;
@@ -37,11 +38,16 @@ class QtGLBuffer : public IQtBuffer
 QtGLBuffer::QtGLBuffer(int width, int height)
     : painting(false)
 {
+    // format.setMajorVersion(3);
+    // format.setMinorVersion(2);
+
     window.setSurfaceType(QWindow::OpenGLSurface);
+    window.setFormat(format);
     window.create();
 
+    context.setFormat(format);
     if (!context.create())
-        qFatal("Cannot create the requested OpenGL context!");
+        qFatal("Error: cannot create the requested OpenGL context!");
     context.makeCurrent(&window);
 
     drawRect = QRect(0, 0, width, height);
@@ -79,7 +85,7 @@ QPainter & QtGLBuffer::getPainter()
 
 QImage & QtGLBuffer::getImage()
 {
-    if (fbo->isBound())
+    if (painting)
     {
         painter.end();
         fbo->release();
@@ -117,7 +123,7 @@ void QtGLWidget::paintEvent(QPaintEvent *event)
     QPainter painter;
     QRect dirtyRect = event->rect();
     painter.begin(this);
-    painter.setRenderHint(QPainter::Antialiasing);
+    painter.setRenderHints(QPainter::Antialiasing | QPainter::HighQualityAntialiasing);
     QImage & image = helper->getBuffer()->getImage();
     painter.drawImage(dirtyRect, image, dirtyRect);
     painter.end();