From f3ecda32e0f7bd21b44e7737d2939dcce2c26517 Mon Sep 17 00:00:00 2001 From: Johan Klokkhammer Helsing Date: Wed, 11 Dec 2019 14:50:40 +0100 Subject: Move QOpenGLPaintEngine and related classes from QtGui to QtOpenGL Also moves the openglwindow test to the opengl folder, as it makes use of these classes. Task-number: QTBUG-74409 Change-Id: Id9f0013cedcc8bd1e87122c005641d7298525045 Reviewed-by: Laszlo Agocs --- examples/gui/gui.pro | 2 - examples/gui/openglwindow/main.cpp | 177 ----------------------------- examples/gui/openglwindow/openglwindow.cpp | 161 -------------------------- examples/gui/openglwindow/openglwindow.h | 91 --------------- examples/gui/openglwindow/openglwindow.pri | 3 - examples/gui/openglwindow/openglwindow.pro | 7 -- 6 files changed, 441 deletions(-) delete mode 100644 examples/gui/openglwindow/main.cpp delete mode 100644 examples/gui/openglwindow/openglwindow.cpp delete mode 100644 examples/gui/openglwindow/openglwindow.h delete mode 100644 examples/gui/openglwindow/openglwindow.pri delete mode 100644 examples/gui/openglwindow/openglwindow.pro (limited to 'examples/gui') diff --git a/examples/gui/gui.pro b/examples/gui/gui.pro index b8080c2075..275adc804d 100644 --- a/examples/gui/gui.pro +++ b/examples/gui/gui.pro @@ -6,5 +6,3 @@ CONFIG += no_docs_target SUBDIRS += analogclock SUBDIRS += rasterwindow -qtHaveModule(gui):qtConfig(opengl): \ - SUBDIRS += openglwindow diff --git a/examples/gui/openglwindow/main.cpp b/examples/gui/openglwindow/main.cpp deleted file mode 100644 index 03a6ece06f..0000000000 --- a/examples/gui/openglwindow/main.cpp +++ /dev/null @@ -1,177 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** BSD License Usage -** Alternatively, you may use this file under the terms of the BSD license -** as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of The Qt Company Ltd nor the names of its -** contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "openglwindow.h" - -#include -#include -#include -#include -#include - - -//! [1] -class TriangleWindow : public OpenGLWindow -{ -public: - using OpenGLWindow::OpenGLWindow; - - void initialize() override; - void render() override; - -private: - GLint m_posAttr = 0; - GLint m_colAttr = 0; - GLint m_matrixUniform = 0; - - QOpenGLShaderProgram *m_program = nullptr; - int m_frame = 0; -}; -//! [1] - -//! [2] -int main(int argc, char **argv) -{ - QGuiApplication app(argc, argv); - - QSurfaceFormat format; - format.setSamples(16); - - TriangleWindow window; - window.setFormat(format); - window.resize(640, 480); - window.show(); - - window.setAnimating(true); - - return app.exec(); -} -//! [2] - - -//! [3] -static const char *vertexShaderSource = - "attribute highp vec4 posAttr;\n" - "attribute lowp vec4 colAttr;\n" - "varying lowp vec4 col;\n" - "uniform highp mat4 matrix;\n" - "void main() {\n" - " col = colAttr;\n" - " gl_Position = matrix * posAttr;\n" - "}\n"; - -static const char *fragmentShaderSource = - "varying lowp vec4 col;\n" - "void main() {\n" - " gl_FragColor = col;\n" - "}\n"; -//! [3] - -//! [4] -void TriangleWindow::initialize() -{ - m_program = new QOpenGLShaderProgram(this); - m_program->addShaderFromSourceCode(QOpenGLShader::Vertex, vertexShaderSource); - m_program->addShaderFromSourceCode(QOpenGLShader::Fragment, fragmentShaderSource); - m_program->link(); - m_posAttr = m_program->attributeLocation("posAttr"); - Q_ASSERT(m_posAttr != -1); - m_colAttr = m_program->attributeLocation("colAttr"); - Q_ASSERT(m_colAttr != -1); - m_matrixUniform = m_program->uniformLocation("matrix"); - Q_ASSERT(m_matrixUniform != -1); -} -//! [4] - -//! [5] -void TriangleWindow::render() -{ - const qreal retinaScale = devicePixelRatio(); - glViewport(0, 0, width() * retinaScale, height() * retinaScale); - - glClear(GL_COLOR_BUFFER_BIT); - - m_program->bind(); - - QMatrix4x4 matrix; - matrix.perspective(60.0f, 4.0f / 3.0f, 0.1f, 100.0f); - matrix.translate(0, 0, -2); - matrix.rotate(100.0f * m_frame / screen()->refreshRate(), 0, 1, 0); - - m_program->setUniformValue(m_matrixUniform, matrix); - - static const GLfloat vertices[] = { - 0.0f, 0.707f, - -0.5f, -0.5f, - 0.5f, -0.5f - }; - - static const GLfloat colors[] = { - 1.0f, 0.0f, 0.0f, - 0.0f, 1.0f, 0.0f, - 0.0f, 0.0f, 1.0f - }; - - glVertexAttribPointer(m_posAttr, 2, GL_FLOAT, GL_FALSE, 0, vertices); - glVertexAttribPointer(m_colAttr, 3, GL_FLOAT, GL_FALSE, 0, colors); - - glEnableVertexAttribArray(m_posAttr); - glEnableVertexAttribArray(m_colAttr); - - glDrawArrays(GL_TRIANGLES, 0, 3); - - glDisableVertexAttribArray(m_colAttr); - glDisableVertexAttribArray(m_posAttr); - - m_program->release(); - - ++m_frame; -} -//! [5] diff --git a/examples/gui/openglwindow/openglwindow.cpp b/examples/gui/openglwindow/openglwindow.cpp deleted file mode 100644 index bac887dca0..0000000000 --- a/examples/gui/openglwindow/openglwindow.cpp +++ /dev/null @@ -1,161 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** BSD License Usage -** Alternatively, you may use this file under the terms of the BSD license -** as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of The Qt Company Ltd nor the names of its -** contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "openglwindow.h" - -#include -#include -#include - -//! [1] -OpenGLWindow::OpenGLWindow(QWindow *parent) - : QWindow(parent) -{ - setSurfaceType(QWindow::OpenGLSurface); -} -//! [1] - -OpenGLWindow::~OpenGLWindow() -{ - delete m_device; -} -//! [2] -void OpenGLWindow::render(QPainter *painter) -{ - Q_UNUSED(painter); -} - -void OpenGLWindow::initialize() -{ -} - -void OpenGLWindow::render() -{ - if (!m_device) - m_device = new QOpenGLPaintDevice; - - glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT); - - m_device->setSize(size() * devicePixelRatio()); - m_device->setDevicePixelRatio(devicePixelRatio()); - - QPainter painter(m_device); - render(&painter); -} -//! [2] - -//! [3] -void OpenGLWindow::renderLater() -{ - requestUpdate(); -} - -bool OpenGLWindow::event(QEvent *event) -{ - switch (event->type()) { - case QEvent::UpdateRequest: - renderNow(); - return true; - default: - return QWindow::event(event); - } -} - -void OpenGLWindow::exposeEvent(QExposeEvent *event) -{ - Q_UNUSED(event); - - if (isExposed()) - renderNow(); -} -//! [3] - -//! [4] -void OpenGLWindow::renderNow() -{ - if (!isExposed()) - return; - - bool needsInitialize = false; - - if (!m_context) { - m_context = new QOpenGLContext(this); - m_context->setFormat(requestedFormat()); - m_context->create(); - - needsInitialize = true; - } - - m_context->makeCurrent(this); - - if (needsInitialize) { - initializeOpenGLFunctions(); - initialize(); - } - - render(); - - m_context->swapBuffers(this); - - if (m_animating) - renderLater(); -} -//! [4] - -//! [5] -void OpenGLWindow::setAnimating(bool animating) -{ - m_animating = animating; - - if (animating) - renderLater(); -} -//! [5] - diff --git a/examples/gui/openglwindow/openglwindow.h b/examples/gui/openglwindow/openglwindow.h deleted file mode 100644 index 8db943ddde..0000000000 --- a/examples/gui/openglwindow/openglwindow.h +++ /dev/null @@ -1,91 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** BSD License Usage -** Alternatively, you may use this file under the terms of the BSD license -** as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of The Qt Company Ltd nor the names of its -** contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include -#include - -QT_BEGIN_NAMESPACE -class QPainter; -class QOpenGLContext; -class QOpenGLPaintDevice; -QT_END_NAMESPACE - -//! [1] -class OpenGLWindow : public QWindow, protected QOpenGLFunctions -{ - Q_OBJECT -public: - explicit OpenGLWindow(QWindow *parent = nullptr); - ~OpenGLWindow(); - - virtual void render(QPainter *painter); - virtual void render(); - - virtual void initialize(); - - void setAnimating(bool animating); - -public slots: - void renderLater(); - void renderNow(); - -protected: - bool event(QEvent *event) override; - - void exposeEvent(QExposeEvent *event) override; - -private: - bool m_animating = false; - - QOpenGLContext *m_context = nullptr; - QOpenGLPaintDevice *m_device = nullptr; -}; -//! [1] - diff --git a/examples/gui/openglwindow/openglwindow.pri b/examples/gui/openglwindow/openglwindow.pri deleted file mode 100644 index 45b0b0cd29..0000000000 --- a/examples/gui/openglwindow/openglwindow.pri +++ /dev/null @@ -1,3 +0,0 @@ -INCLUDEPATH += $$PWD -SOURCES += $$PWD/openglwindow.cpp -HEADERS += $$PWD/openglwindow.h diff --git a/examples/gui/openglwindow/openglwindow.pro b/examples/gui/openglwindow/openglwindow.pro deleted file mode 100644 index 93f18f3d3f..0000000000 --- a/examples/gui/openglwindow/openglwindow.pro +++ /dev/null @@ -1,7 +0,0 @@ -include(openglwindow.pri) - -SOURCES += \ - main.cpp - -target.path = $$[QT_INSTALL_EXAMPLES]/gui/openglwindow -INSTALLS += target -- cgit v1.2.3