5786ac12f0
It seems this example never worked as expected. It has a 'multiple' option which should show extra windows with rendering taking place in different thread, however although render is moved to other thread render() function was never called in that thread. Fix following things: * make rendering in other thread * stop requestUpdate if nothing is exposed * add timer so animation works at the same speed despite of number of windows (renderer B renders two windows) * wait for render to finish before triggering requestUdpate * remove mutex where not needed Pick-to: 5.15 Change-Id: I420436bd28d0357534332dd55b088d634d906c14 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
120 lines
3.9 KiB
C++
120 lines
3.9 KiB
C++
/****************************************************************************
|
|
**
|
|
** Copyright (C) 2016 The Qt Company Ltd.
|
|
** Contact: https://www.qt.io/licensing/
|
|
**
|
|
** This file is part of the examples 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 <QWindow>
|
|
|
|
#include <QColor>
|
|
#include <QMutex>
|
|
#include <QOpenGLShaderProgram>
|
|
#include <QOpenGLBuffer>
|
|
#include <QSharedPointer>
|
|
#include <QTimer>
|
|
|
|
class HelloWindow;
|
|
|
|
class Renderer : public QObject
|
|
{
|
|
Q_OBJECT
|
|
|
|
public:
|
|
explicit Renderer(const QSurfaceFormat &format, Renderer *share = nullptr,
|
|
QScreen *screen = nullptr);
|
|
|
|
QSurfaceFormat format() const { return m_format; }
|
|
|
|
public slots:
|
|
void render(HelloWindow *surface, qreal angle, const QColor &color);
|
|
|
|
signals:
|
|
void requestUpdate();
|
|
|
|
private:
|
|
void initialize();
|
|
|
|
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;
|
|
int vertexAttr;
|
|
int normalAttr;
|
|
int matrixUniform;
|
|
int colorUniform;
|
|
|
|
bool m_initialized;
|
|
QSurfaceFormat m_format;
|
|
QOpenGLContext *m_context;
|
|
QOpenGLShaderProgram *m_program;
|
|
QOpenGLBuffer m_vbo;
|
|
QColor m_backgroundColor;
|
|
};
|
|
|
|
class HelloWindow : public QWindow
|
|
{
|
|
public:
|
|
explicit HelloWindow(const QSharedPointer<Renderer> &renderer, QScreen *screen = nullptr);
|
|
|
|
QColor color() const;
|
|
void updateColor();
|
|
|
|
protected:
|
|
bool event(QEvent *ev) override;
|
|
void exposeEvent(QExposeEvent *event) override;
|
|
void mousePressEvent(QMouseEvent *) override;
|
|
void render();
|
|
|
|
private:
|
|
int m_colorIndex;
|
|
QColor m_color;
|
|
const QSharedPointer<Renderer> m_renderer;
|
|
};
|