From f2889973e36f3c24645d84560eec89aa17caca42 Mon Sep 17 00:00:00 2001 From: Gunnar Sletta Date: Mon, 24 Jun 2013 11:17:09 +0200 Subject: [PATCH] Example for running animations on the render thread Change-Id: I7a829f201c9d1514b2462e7f3bd11761d02cb66c Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com> --- examples/quick/scenegraph/scenegraph.pro | 1 + .../quick/scenegraph/threadedanimation/main.cpp | 58 +++++++++ .../quick/scenegraph/threadedanimation/main.qml | 134 ++++++++++++++++++++ .../quick/scenegraph/threadedanimation/spinner.cpp | 133 +++++++++++++++++++ .../quick/scenegraph/threadedanimation/spinner.h | 69 ++++++++++ .../quick/scenegraph/threadedanimation/spinner.png | Bin 0 -> 3198 bytes .../threadedanimation/threadedanimation.pro | 8 ++ .../threadedanimation/threadedanimation.qrc | 6 + 8 files changed, 409 insertions(+), 0 deletions(-) create mode 100644 examples/quick/scenegraph/threadedanimation/main.cpp create mode 100644 examples/quick/scenegraph/threadedanimation/main.qml create mode 100644 examples/quick/scenegraph/threadedanimation/spinner.cpp create mode 100644 examples/quick/scenegraph/threadedanimation/spinner.h create mode 100644 examples/quick/scenegraph/threadedanimation/spinner.png create mode 100644 examples/quick/scenegraph/threadedanimation/threadedanimation.pro create mode 100644 examples/quick/scenegraph/threadedanimation/threadedanimation.qrc diff --git a/examples/quick/scenegraph/scenegraph.pro b/examples/quick/scenegraph/scenegraph.pro index 3ddb216..4354954 100644 --- a/examples/quick/scenegraph/scenegraph.pro +++ b/examples/quick/scenegraph/scenegraph.pro @@ -5,3 +5,4 @@ SUBDIRS += \ simplematerial \ textureinsgnode \ textureinthread \ + threadedanimation diff --git a/examples/quick/scenegraph/threadedanimation/main.cpp b/examples/quick/scenegraph/threadedanimation/main.cpp new file mode 100644 index 0000000..28abf9d --- /dev/null +++ b/examples/quick/scenegraph/threadedanimation/main.cpp @@ -0,0 +1,58 @@ +/**************************************************************************** +** +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the demonstration applications of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** 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 Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Digia gives you certain additional +** rights. These rights are described in the Digia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 3.0 requirements will be +** met: http://www.gnu.org/copyleft/gpl.html. +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include +#include + +#include "spinner.h" + +int main(int argc, char **argv) +{ + QGuiApplication app(argc, argv); + + qmlRegisterType("Spinner", 1, 0, "Spinner"); + + QQuickView view; + view.setSource(QUrl("qrc:///scenegraph/threadedanimation/main.qml")); + view.show(); + + return app.exec(); +} diff --git a/examples/quick/scenegraph/threadedanimation/main.qml b/examples/quick/scenegraph/threadedanimation/main.qml new file mode 100644 index 0000000..30ba9a2 --- /dev/null +++ b/examples/quick/scenegraph/threadedanimation/main.qml @@ -0,0 +1,134 @@ +/**************************************************************************** +** +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the demonstration applications of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** 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 Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Digia gives you certain additional +** rights. These rights are described in the Digia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 3.0 requirements will be +** met: http://www.gnu.org/copyleft/gpl.html. +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +//! [1] +import QtQuick 2.0 +import Spinner 1.0 + +Rectangle { + + width: 320 + height: 480 + + gradient: Gradient { + GradientStop { position: 0; color: "lightsteelblue" } + GradientStop { position: 1; color: "black" } + } + + Rectangle { + color: Qt.rgba(1, 1, 1, 0.7); + radius: 10 + border.width: 1 + border.color: "white" + anchors.fill: blockingLabel; + anchors.margins: -10 + } + + Text { + id: blockingLabel + color: blocker.running ? "red" : "black" + text: blocker.running ? "Blocked!" : "Not blocked" + anchors.horizontalCenter: parent.horizontalCenter + anchors.top: parent.top + anchors.topMargin: 100 + } + + Timer { + id: blocker + interval: 357 + running: false; + repeat: true + onTriggered: { + var d = new Date(); + var x = 0; + var wait = 50 + Math.random() * 200; + while ((new Date().getTime() - d.getTime()) < 100) { + x += 1; + } + } + } + + Timer { + id: blockerEnabler + interval: 4000 + running: true + repeat: true + onTriggered: { + blocker.running = !blocker.running + } + } + + Spinner { + anchors.centerIn: parent + anchors.horizontalCenterOffset: 80 + spinning: true + } + + Image { + anchors.centerIn: parent + anchors.horizontalCenterOffset: -80 + source: "spinner.png" + NumberAnimation on rotation { + from: 0; to: 360; duration: 1000; loops: Animation.Infinite + } + } + + Rectangle { + color: Qt.rgba(1, 1, 1, 0.7) + radius: 10 + border.width: 1 + border.color: "white" + anchors.fill: label + anchors.margins: -10 + } + + Text { + id: label + color: "black" + wrapMode: Text.WordWrap + text: "This application shows two spinners. The one to the right is animated on the scene graph thread (when applicable) and the left one is using the normal Qt Quick animation system." + anchors.right: parent.right + anchors.left: parent.left + anchors.bottom: parent.bottom + anchors.margins: 20 + } +} +//! [2] diff --git a/examples/quick/scenegraph/threadedanimation/spinner.cpp b/examples/quick/scenegraph/threadedanimation/spinner.cpp new file mode 100644 index 0000000..7efcdb5 --- /dev/null +++ b/examples/quick/scenegraph/threadedanimation/spinner.cpp @@ -0,0 +1,133 @@ +/**************************************************************************** +** +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the demonstration applications of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** 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 Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Digia gives you certain additional +** rights. These rights are described in the Digia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 3.0 requirements will be +** met: http://www.gnu.org/copyleft/gpl.html. +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include "spinner.h" + +#include +#include +#include + +#include +#include + +class SpinnerNode : public QObject, public QSGTransformNode +{ + Q_OBJECT +public: + SpinnerNode(QQuickWindow *window) + : m_rotation(0) + , m_spinning(false) + , m_window(window) + { + connect(window, SIGNAL(beforeRendering()), this, SLOT(maybeRotate())); + connect(window, SIGNAL(frameSwapped()), this, SLOT(maybeUpdate())); + + QImage image(":/scenegraph/threadedanimation/spinner.png"); + m_texture = window->createTextureFromImage(image); + QSGSimpleTextureNode *textureNode = new QSGSimpleTextureNode(); + textureNode->setTexture(m_texture); + textureNode->setRect(0, 0, image.width(), image.height()); + textureNode->setFiltering(QSGTexture::Linear); + appendChildNode(textureNode); + } + + ~SpinnerNode() { + delete m_texture; + } + + void setSpinning(bool spinning) + { + m_spinning = spinning; + } + +public slots: + void maybeRotate() { + if (m_spinning) { + m_rotation += (360 / m_window->screen()->refreshRate()); + QMatrix4x4 matrix; + matrix.translate(32, 32); + matrix.rotate(m_rotation, 0, 0, 1); + matrix.translate(-32, -32); + setMatrix(matrix); + } + } + + void maybeUpdate() { + if (m_spinning) { + m_window->update(); + } + } + +private: + qreal m_rotation; + bool m_spinning; + QSGTexture *m_texture; + QQuickWindow *m_window; +}; + +Spinner::Spinner() + : m_spinning(false) +{ + setSize(QSize(64, 64)); + setFlag(ItemHasContents); +} + +void Spinner::setSpinning(bool spinning) +{ + if (spinning == m_spinning) + return; + m_spinning = spinning; + emit spinningChanged(); + update(); +} + +QSGNode *Spinner::updatePaintNode(QSGNode *old, UpdatePaintNodeData *) +{ + SpinnerNode *n = static_cast(old); + if (!n) + n = new SpinnerNode(window()); + + n->setSpinning(m_spinning); + + return n; +} + +#include "spinner.moc" diff --git a/examples/quick/scenegraph/threadedanimation/spinner.h b/examples/quick/scenegraph/threadedanimation/spinner.h new file mode 100644 index 0000000..01b4890 --- /dev/null +++ b/examples/quick/scenegraph/threadedanimation/spinner.h @@ -0,0 +1,69 @@ +/**************************************************************************** +** +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the demonstration applications of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** 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 Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Digia gives you certain additional +** rights. These rights are described in the Digia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 3.0 requirements will be +** met: http://www.gnu.org/copyleft/gpl.html. +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef SPINNER_H +#define SPINNER_H + +#include + +class Spinner : public QQuickItem +{ + Q_OBJECT + + Q_PROPERTY(bool spinning READ spinning WRITE setSpinning NOTIFY spinningChanged) + +public: + Spinner(); + + bool spinning() const { return m_spinning; } + void setSpinning(bool spinning); + +protected: + QSGNode *updatePaintNode(QSGNode *, UpdatePaintNodeData *); + +signals: + void spinningChanged(); + +private: + bool m_spinning; +}; + +#endif // SQUIRCLE_H diff --git a/examples/quick/scenegraph/threadedanimation/spinner.png b/examples/quick/scenegraph/threadedanimation/spinner.png new file mode 100644 index 0000000000000000000000000000000000000000..bacb1698d7c4f4e9c460a889f86b43cbc60774d0 GIT binary patch literal 3198 zcmV-^41x2BP)k1k=>2RSc*BjRYe&SPixe;83UX2o_U@;Snrh zV3^mvYxT!D`<%V^Id|q>=FuOrk~3%Dz4z?1zi+Lz*V_9W;H;dLFSO8bJmjI(+s>iR zo>@$o%tEygnV1JEAzUR42&A1sCn0DRkv(AS?m<`6vkR^}G1PM#G6H`7@`slY)9nnI zBfv}ulnB5A0OH-ny9)#&@GpS?U||-f?F`DY~x_~4|8?*f8)YxMy)-*Kq40P@TCSb`cTj!8cPeY{Ens5Lr1ndHhtLGR? zuwBEq2$o&UeBTQX&S@OT{Lh$xWvjQ8cObPKL_ZQk)6g1>0jfe13j?*RT=r`0LFVGUs1~V4A?zbUbhkMg!D+3KQTGWoke2ES8;;Pu%j?MfLki z#iC06ho!G=y8@E`kbr3*fD8_aymC-S1ac_ui*a)y4C>&6cKaZ_gJ`-Wav$FDjeTbLZIGgD8UknBH;J0H(#hE z@fIm$0YDMKBEfY9{}1`BXkv&ETyd}^rpDF22{FjbvYMP#O zK@xzV41*MH1<-x^a0)S2KU3Qh0UnJw8oWWqj8h}Jm-UOUuf`|e*m*4zHd?+GeUKgh z{Wdd<NO8t|6a)iEMLDjE%~mU0x!c0fEP&u`)$l}P?#U3c0pZl+_RE}CL!E;FA>!eDAd01 z0(wazPykesSN7Tk5Of0gb(QK}zUa2uoy7px^5-9Z{Um@DcdvZoh3=k;h0OdgKpD&T z`vGs%UwriVu>}C0j(b+D1w7ZdKhu8tgZYu?N zA-U@h8!uzQS{78tfp>xHIR$ls*6u7{upwp_8M_E}be@`@AQ~SodfvjPh{6@#{Oy=#Ee6>wS^0%3p}U;z(jY)jT>=+XEuC1 zT|muY8X5-U!1PTs3pLQmdHTjrzI(~`LB?*$_kQ>G<$!DkC}Tzh81t2I%7AVMkP}?I z;g@qiF~^Hq0IA!6Fk{nZ9%|pO13A_pj}0|=0C;Wj4gY}9<7Q-tXx#S`d-n+>L~eJ- zixME16Z&@G*9K^^iST|O4v<+_EorPM zNC40^i%2O`^JJL5CPb6rk%Mkzv1*vG2U4z5F9~yRA<(837$G~ENuH`R$FT@dM3Z%1 zZ)%Y>u4>SN|(;lqyR0yv;o$yOiX^vqLpa@lwr^KW8ngDbHgP!#jEBDN+ zZIdn!Sb14=Usqn1h|~$h!e|o!^nZxw5HeN@^cx15JbJWsh*FHW{cYNmYVQ}n^ScY_ z@c>Fbj~^td2@gT~p1Gm7cC+5KfRly(E2wgsnYkMOCjz>1xd{ok@6$N?BX>$SSw${k>Zisaa;Lb=Du0jh7-Khmxtx1vl5#oE{3Wt{gcc6=fAYpDJLi zKB(36(G%90tho@9U`u%>^)+*>$a#QLYGbemKverNX8}-3Rdc>);ZOl~B~{+N2qI%+ zkHiqOGYrlVu`z^Xt#=BB9@g=0!1!qP7S#R0if)%|x3w{j>Fvx0?@*I8)#)M~+l{ zcC>v7=cy4Q~yvnpo;=uw|qbPRfsZ) z3GauA=&@`%^HSYcMiuqx>;C=6N9Hngry@L}lp3q_^ZaKi=h>#uhiifUEiEHQWM&dk z?90(Uw@_>UzQ3Ln-c`YCNkjj{#MS_me3cU)nSwXEsfu1kE;T}`#=nFjT>`@t{ zBnK1|=ivzFS zBluh<$O*_M!)J%6;G>KedPbFAO|*L#FcSV7P_f z=b#35bU7&HJj=?*)H*san*y1&>rDOsC;Kr$w_9d(GR|4`3;J5+oNivrzy-q@;wNlr0xMiyX7{j_s8S9TwsA%gn}Xf+oo1nmJJLeb4I*Wc}W~>5ANly9nxTMW}PN8*0^iv?9}5LJRORJF^b~ zB27?O+4K3x7pG2*-`Jdq3@QPp{B3XBlqA#b1YApsW)UdaCjoHWK_mxKTS;LfA-8IB z&6wT&Jo1cW$Otf{vE@ibMVjltR4WOpO@Jm6Q6&+o2mmRxli(yswJO3MMYNmKz1ydb k8#nA9UYwP)@&%Ls0S>wjj + + main.qml + spinner.png + + -- 1.7.2.5