diff options
| author | Laszlo Agocs <laszlo.agocs@digia.com> | 2014-08-02 19:42:15 +0200 |
|---|---|---|
| committer | Laszlo Agocs <laszlo.agocs@digia.com> | 2014-08-12 07:47:23 +0200 |
| commit | 611558d877a9ee4448b30e5443e3025c6235daaf (patch) | |
| tree | 2a5d5a6da4a9994ccef4a49dec235f661a1e57f1 /examples/opengl/qopenglwidget/glwidget.h | |
| parent | 338f9c4f7c42d2a7bcd2c5b37137b3cc7cd9775d (diff) | |
Modernize the OpenGL examples
Change them to use QOpenGLWidget and QOpenGLTexture.
Advocate also the usage of VBOs.
Hopeless examples, that rely on the fixed pipeline and will
not compile or work in ES and dynamic builds, are moved to
a "legacy" directory. The documentation pages for these are
removed. This long due change avoids the confusion newcomers
experience when trying to get started with Qt 5 and OpenGL.
hellowindow's behavior is changed to open a single window only
by default. The old default behavior, that opened three windows
on platforms that supported both MultipleWindows & ThreadedOpenGL,
can be requested by passing --multiple. --single is removed since it
is the default now. This plays much nicer with drivers that have
issues with threading.
In addition, say hello to hellogl2.
This is the old hellogl example updated to use QOpenGLWidget and
OpenGL 2. It also has a mainwindow with multiple (un)dockable widgets
containing the OpenGL widgets. This helps testing the behavior when
the top-level of the QOpenGLWidget changes and provides a very
important example of how to do proper resource management in this case.
(must use aboutToBeDestroyed() of the context, since the context goes
away and is replaced by a new one on every dock/undock)
As a bonus, the logo is now real 3D, no more orthographic nonsense.
Launch with --multisample to request 4x MSAA.
Launch with --coreprofile to request 3.2 Core. In this particular example
the shaders are present in both versions and there is a VAO so the application
is functional with core profile contexts.
Change-Id: Id780a80cb0708ef164cc172450ed74050f065596
Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
Diffstat (limited to 'examples/opengl/qopenglwidget/glwidget.h')
| -rw-r--r-- | examples/opengl/qopenglwidget/glwidget.h | 57 |
1 files changed, 34 insertions, 23 deletions
diff --git a/examples/opengl/qopenglwidget/glwidget.h b/examples/opengl/qopenglwidget/glwidget.h index 6c43ac1576f..ba8317df4a5 100644 --- a/examples/opengl/qopenglwidget/glwidget.h +++ b/examples/opengl/qopenglwidget/glwidget.h @@ -43,7 +43,7 @@ #include <QOpenGLWidget> #include <QOpenGLFunctions> -#include <QOpenGLShaderProgram> +#include <QOpenGLBuffer> #include <QVector3D> #include <QMatrix4x4> #include <QTime> @@ -53,6 +53,10 @@ class Bubble; class MainWindow; +QT_FORWARD_DECLARE_CLASS(QOpenGLTexture) +QT_FORWARD_DECLARE_CLASS(QOpenGLShader) +QT_FORWARD_DECLARE_CLASS(QOpenGLShaderProgram) + class GLWidget : public QOpenGLWidget, protected QOpenGLFunctions { Q_OBJECT @@ -64,7 +68,7 @@ public slots: void setScaling(int scale); void setLogo(); void setTexture(); - void showBubbles(bool); + void setShowBubbles(bool); void setTransparent(bool transparent); private slots: @@ -76,33 +80,40 @@ protected: void initializeGL() Q_DECL_OVERRIDE; private: - MainWindow *m_mainWindow; - GLuint m_uiTexture; - qreal m_fAngle; - qreal m_fScale; - bool m_showBubbles; void paintTexturedCube(); void paintQtLogo(); void createGeometry(); void createBubbles(int number); void quad(qreal x1, qreal y1, qreal x2, qreal y2, qreal x3, qreal y3, qreal x4, qreal y4); void extrude(qreal x1, qreal y1, qreal x2, qreal y2); - QVector<QVector3D> vertices; - QVector<QVector3D> normals; - bool qtLogo; - QList<Bubble*> bubbles; - int frames; - QTime time; - QOpenGLShaderProgram program1; - QOpenGLShaderProgram program2; - int vertexAttr1; - int normalAttr1; - int matrixUniform1; - int vertexAttr2; - int normalAttr2; - int texCoordAttr2; - int matrixUniform2; - int textureUniform2; + + MainWindow *m_mainWindow; + qreal m_fAngle; + qreal m_fScale; + bool m_showBubbles; + QVector<QVector3D> m_vertices; + QVector<QVector3D> m_normals; + bool m_qtLogo; + QList<Bubble *> m_bubbles; + int m_frames; + QTime m_time; + QOpenGLShader *m_vshader1; + QOpenGLShader *m_fshader1; + QOpenGLShader *m_vshader2; + QOpenGLShader *m_fshader2; + QOpenGLShaderProgram *m_program1; + QOpenGLShaderProgram *m_program2; + QOpenGLTexture *m_texture; + QOpenGLBuffer m_vbo1; + QOpenGLBuffer m_vbo2; + int m_vertexAttr1; + int m_normalAttr1; + int m_matrixUniform1; + int m_vertexAttr2; + int m_normalAttr2; + int m_texCoordAttr2; + int m_matrixUniform2; + int m_textureUniform2; bool m_transparent; QPushButton *m_btn; bool m_hasButton; |
