diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-01-14 01:01:06 +0100 |
---|---|---|
committer | Ulf Hermann <ulf.hermann@qt.io> | 2020-01-14 11:24:11 +0100 |
commit | 8a22c92b55b5d015e372fe5be0633c3935af4218 (patch) | |
tree | 02ad52cf1e7c3ed35b10156dd250d3cc7f6b7068 /examples/quick/scenegraph | |
parent | 3ca659657ccaf0d850e661c9312e0f98e153c9ff (diff) | |
parent | 3dc5b937c4e9acf83ee54e870390c22f341c29c8 (diff) |
Merge remote-tracking branch 'origin/5.15' into dev
Conflicts:
src/imports/folderlistmodel/plugin.cpp
src/imports/layouts/plugin.cpp
src/imports/localstorage/plugin.cpp
src/imports/models/plugin.cpp
src/imports/particles/plugin.cpp
src/imports/qtqml/plugin.cpp
src/imports/qtquick2/plugin.cpp
src/imports/shapes/plugin.cpp
src/imports/statemachine/plugin.cpp
src/imports/testlib/main.cpp
src/imports/wavefrontmesh/plugin.cpp
src/imports/window/plugin.cpp
src/imports/workerscript/plugin.cpp
src/qml/jsruntime/qv4sequenceobject.cpp
src/qml/qml/qqmlengine.cpp
src/qmlmodels/qqmlmodelsmodule.cpp
src/qmlmodels/qqmlmodelsmodule_p.h
src/qmlworkerscript/qqmlworkerscriptmodule.cpp
src/qmlworkerscript/qqmlworkerscriptmodule_p.h
src/quick/items/qquickitemsmodule.cpp
Change-Id: I5f1fbc3d00e8f583d2c89afc5389de84d68633a7
Diffstat (limited to 'examples/quick/scenegraph')
30 files changed, 331 insertions, 197 deletions
diff --git a/examples/quick/scenegraph/customgeometry/beziercurve.h b/examples/quick/scenegraph/customgeometry/beziercurve.h index be9e4ef49f..fd0085a08e 100644 --- a/examples/quick/scenegraph/customgeometry/beziercurve.h +++ b/examples/quick/scenegraph/customgeometry/beziercurve.h @@ -64,7 +64,9 @@ class BezierCurve : public QQuickItem Q_PROPERTY(QPointF p4 READ p4 WRITE setP4 NOTIFY p4Changed) Q_PROPERTY(int segmentCount READ segmentCount WRITE setSegmentCount NOTIFY segmentCountChanged) +//! [3] QML_ELEMENT +//! [3] public: BezierCurve(QQuickItem *parent = 0); diff --git a/examples/quick/scenegraph/customgeometry/customgeometry.pro b/examples/quick/scenegraph/customgeometry/customgeometry.pro index 17c30fc560..3785f88c7e 100644 --- a/examples/quick/scenegraph/customgeometry/customgeometry.pro +++ b/examples/quick/scenegraph/customgeometry/customgeometry.pro @@ -1,6 +1,10 @@ TARGET = customgeometry QT += quick +CONFIG += qmltypes +QML_IMPORT_NAME = CustomGeometry +QML_IMPORT_MAJOR_VERSION = 1 + SOURCES += \ main.cpp \ beziercurve.cpp diff --git a/examples/quick/scenegraph/customgeometry/doc/src/customgeometry.qdoc b/examples/quick/scenegraph/customgeometry/doc/src/customgeometry.qdoc index 959114b424..bd235e5dfb 100644 --- a/examples/quick/scenegraph/customgeometry/doc/src/customgeometry.qdoc +++ b/examples/quick/scenegraph/customgeometry/doc/src/customgeometry.qdoc @@ -169,11 +169,16 @@ \snippet scenegraph/customgeometry/main.cpp 1 The application is a straightforward QML application, with a - QGuiApplication and a QQuickView that we pass a .qml file. To make - use of the BezierCurve item, we need to register it in the QML - engine, using the qmlRegisterType() function. We give it the name - BezierCurve and make it part of the \c {CustomGeometry 1.0} - module. + QGuiApplication and a QQuickView that we pass a .qml file. + + \snippet scenegraph/customgeometry/beziercurve.h 3 + + To make use of the BezierCurve item, we need to register it in the QML + engine, using the QML_ELEMENT macro. This gives it the name + BezierCurve and makes it part of the \c {CustomGeometry 1.0} + module as defined in the customgeometry.pro file: + + \quotefile scenegraph/customgeometry/customgeometry.pro As the bezier curve is drawn using GL_LINE_STRIP, we specify that the view should be multisampled to get antialiasing. This is not diff --git a/examples/quick/scenegraph/customgeometry/main.cpp b/examples/quick/scenegraph/customgeometry/main.cpp index 9352e4bd24..15310d279f 100644 --- a/examples/quick/scenegraph/customgeometry/main.cpp +++ b/examples/quick/scenegraph/customgeometry/main.cpp @@ -58,8 +58,6 @@ int main(int argc, char **argv) { QGuiApplication app(argc, argv); - qmlRegisterTypesAndRevisions<BezierCurve>("CustomGeometry", 1); - QQuickView view; QSurfaceFormat format = view.format(); format.setSamples(16); diff --git a/examples/quick/scenegraph/d3d11underqml/d3d11underqml.pro b/examples/quick/scenegraph/d3d11underqml/d3d11underqml.pro index 7658a9a813..4f052cf388 100644 --- a/examples/quick/scenegraph/d3d11underqml/d3d11underqml.pro +++ b/examples/quick/scenegraph/d3d11underqml/d3d11underqml.pro @@ -2,6 +2,10 @@ QT += qml quick +CONFIG += qmltypes +QML_IMPORT_NAME = D3D11UnderQML +QML_IMPORT_MAJOR_VERSION = 1 + HEADERS += d3d11squircle.h SOURCES += d3d11squircle.cpp main.cpp RESOURCES += d3d11underqml.qrc diff --git a/examples/quick/scenegraph/d3d11underqml/main.cpp b/examples/quick/scenegraph/d3d11underqml/main.cpp index dcab8c879c..bcefae6cb5 100644 --- a/examples/quick/scenegraph/d3d11underqml/main.cpp +++ b/examples/quick/scenegraph/d3d11underqml/main.cpp @@ -56,8 +56,6 @@ int main(int argc, char **argv) { QGuiApplication app(argc, argv); - qmlRegisterTypesAndRevisions<D3D11Squircle>("D3D11UnderQML", 1); - QQuickWindow::setSceneGraphBackend(QSGRendererInterface::Direct3D11Rhi); QQuickView view; diff --git a/examples/quick/scenegraph/fboitem/fboitem.pro b/examples/quick/scenegraph/fboitem/fboitem.pro index e40e5f4cf8..180c2288e2 100644 --- a/examples/quick/scenegraph/fboitem/fboitem.pro +++ b/examples/quick/scenegraph/fboitem/fboitem.pro @@ -1,5 +1,9 @@ QT += qml quick +CONFIG += qmltypes +QML_IMPORT_NAME = SceneGraphRendering +QML_IMPORT_MAJOR_VERSION = 1 + HEADERS += fboinsgrenderer.h SOURCES += fboinsgrenderer.cpp main.cpp diff --git a/examples/quick/scenegraph/fboitem/main.cpp b/examples/quick/scenegraph/fboitem/main.cpp index 056bf24ade..153bd931ec 100644 --- a/examples/quick/scenegraph/fboitem/main.cpp +++ b/examples/quick/scenegraph/fboitem/main.cpp @@ -58,8 +58,6 @@ int main(int argc, char **argv) { QGuiApplication app(argc, argv); - qmlRegisterTypesAndRevisions<FboInSGRenderer>("SceneGraphRendering", 1); - QQuickView view; view.setResizeMode(QQuickView::SizeRootObjectToView); view.setSource(QUrl("qrc:///scenegraph/fboitem/main.qml")); diff --git a/examples/quick/scenegraph/graph/graph.pro b/examples/quick/scenegraph/graph/graph.pro index 1a880b61f1..fe36585d77 100644 --- a/examples/quick/scenegraph/graph/graph.pro +++ b/examples/quick/scenegraph/graph/graph.pro @@ -4,6 +4,10 @@ TARGET = graph TEMPLATE = app +CONFIG += qmltypes +QML_IMPORT_NAME = Graph +QML_IMPORT_MAJOR_VERSION = 1 + SOURCES += main.cpp \ graph.cpp \ noisynode.cpp \ diff --git a/examples/quick/scenegraph/graph/main.cpp b/examples/quick/scenegraph/graph/main.cpp index 9a575944b9..854fad84e3 100644 --- a/examples/quick/scenegraph/graph/main.cpp +++ b/examples/quick/scenegraph/graph/main.cpp @@ -58,8 +58,6 @@ int main(int argc, char *argv[]) { QGuiApplication a(argc, argv); - qmlRegisterTypesAndRevisions<Graph>("Graph", 1); - QQuickView view; view.resize(800, 400); view.setResizeMode(QQuickView::SizeRootObjectToView); diff --git a/examples/quick/scenegraph/metalunderqml/main.cpp b/examples/quick/scenegraph/metalunderqml/main.cpp index 3e620137cd..cefb1c10a9 100644 --- a/examples/quick/scenegraph/metalunderqml/main.cpp +++ b/examples/quick/scenegraph/metalunderqml/main.cpp @@ -56,8 +56,6 @@ int main(int argc, char **argv) { QGuiApplication app(argc, argv); - qmlRegisterTypesAndRevisions<MetalSquircle>("MetalUnderQML", 1); - QQuickWindow::setSceneGraphBackend(QSGRendererInterface::MetalRhi); QQuickView view; diff --git a/examples/quick/scenegraph/metalunderqml/metalunderqml.pro b/examples/quick/scenegraph/metalunderqml/metalunderqml.pro index 2f4c3f63da..3b0489ecdf 100644 --- a/examples/quick/scenegraph/metalunderqml/metalunderqml.pro +++ b/examples/quick/scenegraph/metalunderqml/metalunderqml.pro @@ -2,6 +2,10 @@ QT += qml quick +CONFIG += qmltypes +QML_IMPORT_NAME = MetalUnderQML +QML_IMPORT_MAJOR_VERSION = 1 + HEADERS += metalsquircle.h SOURCES += metalsquircle.mm main.cpp RESOURCES += metalunderqml.qrc diff --git a/examples/quick/scenegraph/openglunderqml/doc/src/openglunderqml.qdoc b/examples/quick/scenegraph/openglunderqml/doc/src/openglunderqml.qdoc index 9676815c44..c2944970a5 100644 --- a/examples/quick/scenegraph/openglunderqml/doc/src/openglunderqml.qdoc +++ b/examples/quick/scenegraph/openglunderqml/doc/src/openglunderqml.qdoc @@ -60,6 +60,7 @@ First of all, we need an object we can expose to QML. This is a subclass of QQuickItem so we can easily access \l QQuickItem::window(). + We expose it to QML using the QML_ELEMENT macro. \snippet scenegraph/openglunderqml/squircle.h 1 @@ -145,9 +146,7 @@ \snippet scenegraph/openglunderqml/main.cpp 1 The application's \c main() function instantiates a QQuickView and - launches the \c main.qml file. The only thing worth noting is that - we export the \c Squircle class to QML using the \l - qmlRegisterType() macro. + launches the \c main.qml file. \snippet scenegraph/openglunderqml/main.qml 1 diff --git a/examples/quick/scenegraph/openglunderqml/main.cpp b/examples/quick/scenegraph/openglunderqml/main.cpp index c04d0da68f..4ca8d05f1c 100644 --- a/examples/quick/scenegraph/openglunderqml/main.cpp +++ b/examples/quick/scenegraph/openglunderqml/main.cpp @@ -59,8 +59,6 @@ int main(int argc, char **argv) { QGuiApplication app(argc, argv); - qmlRegisterTypesAndRevisions<Squircle>("OpenGLUnderQML", 1); - QQuickView view; view.setResizeMode(QQuickView::SizeRootObjectToView); view.setSource(QUrl("qrc:///scenegraph/openglunderqml/main.qml")); diff --git a/examples/quick/scenegraph/openglunderqml/openglunderqml.pro b/examples/quick/scenegraph/openglunderqml/openglunderqml.pro index 54558ce9e9..7eaace1133 100644 --- a/examples/quick/scenegraph/openglunderqml/openglunderqml.pro +++ b/examples/quick/scenegraph/openglunderqml/openglunderqml.pro @@ -1,5 +1,9 @@ QT += qml quick +CONFIG += qmltypes +QML_IMPORT_NAME = OpenGLUnderQML +QML_IMPORT_MAJOR_VERSION = 1 + HEADERS += squircle.h SOURCES += squircle.cpp main.cpp RESOURCES += openglunderqml.qrc diff --git a/examples/quick/scenegraph/rendernode/customrenderitem.h b/examples/quick/scenegraph/rendernode/customrenderitem.h index 74115b2505..28be54925b 100644 --- a/examples/quick/scenegraph/rendernode/customrenderitem.h +++ b/examples/quick/scenegraph/rendernode/customrenderitem.h @@ -53,6 +53,7 @@ #include <QQuickItem> +//! [0] class CustomRenderItem : public QQuickItem { Q_OBJECT @@ -62,5 +63,6 @@ public: CustomRenderItem(QQuickItem *parent = nullptr); QSGNode *updatePaintNode(QSGNode *node, UpdatePaintNodeData *) override; }; +//! [0] #endif diff --git a/examples/quick/scenegraph/rendernode/doc/src/rendernode.qdoc b/examples/quick/scenegraph/rendernode/doc/src/rendernode.qdoc index ba6551fddf..87e3c8b506 100644 --- a/examples/quick/scenegraph/rendernode/doc/src/rendernode.qdoc +++ b/examples/quick/scenegraph/rendernode/doc/src/rendernode.qdoc @@ -69,7 +69,7 @@ Let's go through the most important parts of the code: - \snippet scenegraph/rendernode/main.cpp 1 + \snippet scenegraph/rendernode/customrenderitem.h 0 Our custom QML type is implemented in the class CustomRenderItem. diff --git a/examples/quick/scenegraph/rendernode/main.cpp b/examples/quick/scenegraph/rendernode/main.cpp index b1dfe47829..645360eaba 100644 --- a/examples/quick/scenegraph/rendernode/main.cpp +++ b/examples/quick/scenegraph/rendernode/main.cpp @@ -58,10 +58,6 @@ int main(int argc, char **argv) { QGuiApplication app(argc, argv); -//! [1] - qmlRegisterTypesAndRevisions<CustomRenderItem>("SceneGraphRendering", 2); -//! [1] - QQuickView view; QCoreApplication::setApplicationName("Qt Scene Graph Render Node Example"); diff --git a/examples/quick/scenegraph/rendernode/rendernode.pro b/examples/quick/scenegraph/rendernode/rendernode.pro index 5155ed12b0..4ae46de2a4 100644 --- a/examples/quick/scenegraph/rendernode/rendernode.pro +++ b/examples/quick/scenegraph/rendernode/rendernode.pro @@ -1,5 +1,9 @@ QT += qml quick +CONFIG += qmltypes +QML_IMPORT_NAME = SceneGraphRendering +QML_IMPORT_MAJOR_VERSION = 2 + HEADERS += customrenderitem.h \ openglrenderer.h \ softwarerenderer.h diff --git a/examples/quick/scenegraph/simplematerial/doc/src/simplematerial.qdoc b/examples/quick/scenegraph/simplematerial/doc/src/simplematerial.qdoc index 67ca2d8dbd..d7de1613e4 100644 --- a/examples/quick/scenegraph/simplematerial/doc/src/simplematerial.qdoc +++ b/examples/quick/scenegraph/simplematerial/doc/src/simplematerial.qdoc @@ -47,7 +47,7 @@ material state is what we assign to each individual node; in this case to give them different colors. - \snippet scenegraph/simplematerial/simplematerial.cpp 1 + \snippet scenegraph/simplematerial/simplematerialitem.cpp 1 The first thing we do when creating custom materials with the simplified scheme is to create a state class. In this case the @@ -55,7 +55,7 @@ compare function which the scene graph can use to reorder the node rendering. - \snippet scenegraph/simplematerial/simplematerial.cpp 2 + \snippet scenegraph/simplematerial/simplematerialitem.cpp 2 Next we define the material shader, by subclassing a template instantiation of \l QSGSimpleMaterialShader with our \c State. @@ -74,21 +74,21 @@ classes. Using the same \c State class in multiple shaders will will lead to undefined behavior. - \snippet scenegraph/simplematerial/simplematerial.cpp 3 + \snippet scenegraph/simplematerial/simplematerialitem.cpp 3 Next comes the declaration of the shader source code, where we define a vertex and fragment shader. The simple material assumes the presence of \c qt_Matrix in the vertex shader and \c qt_Opacity in the fragment shader. - \snippet scenegraph/simplematerial/simplematerial.cpp 4 + \snippet scenegraph/simplematerial/simplematerialitem.cpp 4 We reimplement the \c attributes function to return the name of the \c aVertex and \c aTexCoord attributes. These attributes will be mapped to attribute indices 0 and 1 in the node's geometry. - \snippet scenegraph/simplematerial/simplematerial.cpp 6 + \snippet scenegraph/simplematerial/simplematerialitem.cpp 6 Uniforms can be accessed either by name or by index, where index is faster than name. We reimplement the \c resolveUniforms() @@ -96,7 +96,7 @@ to worry about resolving \c qt_Opacity or \c qt_Matrix as these are handled by the baseclass. - \snippet scenegraph/simplematerial/simplematerial.cpp 5 + \snippet scenegraph/simplematerial/simplematerialitem.cpp 5 The \c updateState() function is called once for every unique state and we use it to update the shader program with the current @@ -105,7 +105,7 @@ use case, where all the colors are different, the updateState() function will be called once for every node. - \snippet scenegraph/simplematerial/simplematerial.cpp 7 + \snippet scenegraph/simplematerial/simplematerialitem.cpp 7 The \c ColorNode class is supposed to draw something, so it needs to be a subclass of \l QSGGeometryNode. @@ -129,12 +129,13 @@ Finally, we tell the node to take ownership of the material, so we do not have to explicitly memory-manage it. - \snippet scenegraph/simplematerial/simplematerial.cpp 8 + \snippet scenegraph/simplematerial/simplematerialitem.h 8 Since the Item is providing its own graphics to the scene graph, - we set the flag \l QQuickItem::ItemHasContents. + we set the flag \l QQuickItem::ItemHasContents. We also make sure + the item is exposed to QML by adding the QML_ELEMENT macro. - \snippet scenegraph/simplematerial/simplematerial.cpp 9 + \snippet scenegraph/simplematerial/simplematerialitem.cpp 9 Whenever the Item has changed graphically, the \l QQuickItem::updatePaintNode() function is called. @@ -159,9 +160,8 @@ \snippet scenegraph/simplematerial/simplematerial.cpp 11 - The \c main() function of the application adds the custom QML type - using \l qmlRegisterType() and opens up a \l QQuickView with our - QML file. + The \c main() function of the application opens up a \l QQuickView + with our QML file. \snippet scenegraph/simplematerial/main.qml 1 diff --git a/examples/quick/scenegraph/simplematerial/simplematerial.cpp b/examples/quick/scenegraph/simplematerial/simplematerial.cpp index 55e1d879ca..35866bd6d0 100644 --- a/examples/quick/scenegraph/simplematerial/simplematerial.cpp +++ b/examples/quick/scenegraph/simplematerial/simplematerial.cpp @@ -49,163 +49,13 @@ ****************************************************************************/ #include <qguiapplication.h> - -#include <qsgmaterial.h> -#include <qsgnode.h> - -#include <qquickitem.h> #include <qquickview.h> -#include <qsgsimplerectnode.h> - -#include <qsgsimplematerial.h> - -//! [1] -struct State -{ - QColor color; - - int compare(const State *other) const { - uint rgb = color.rgba(); - uint otherRgb = other->color.rgba(); - - if (rgb == otherRgb) { - return 0; - } else if (rgb < otherRgb) { - return -1; - } else { - return 1; - } - } -}; -//! [1] - -//! [2] -class Shader : public QSGSimpleMaterialShader<State> -{ - QSG_DECLARE_SIMPLE_COMPARABLE_SHADER(Shader, State); -//! [2] //! [3] -public: - - const char *vertexShader() const override { - return - "attribute highp vec4 aVertex; \n" - "attribute highp vec2 aTexCoord; \n" - "uniform highp mat4 qt_Matrix; \n" - "varying highp vec2 texCoord; \n" - "void main() { \n" - " gl_Position = qt_Matrix * aVertex; \n" - " texCoord = aTexCoord; \n" - "}"; - } - - const char *fragmentShader() const override { - return - "uniform lowp float qt_Opacity; \n" - "uniform lowp vec4 color; \n" - "varying highp vec2 texCoord; \n" - "void main () \n" - "{ \n" - " gl_FragColor = texCoord.y * texCoord.x * color * qt_Opacity; \n" - "}"; - } -//! [3] //! [4] - QList<QByteArray> attributes() const override - { - return QList<QByteArray>() << "aVertex" << "aTexCoord"; - } -//! [4] //! [5] - void updateState(const State *state, const State *) override - { - program()->setUniformValue(id_color, state->color); - } -//! [5] //! [6] - void resolveUniforms() override - { - id_color = program()->uniformLocation("color"); - } - -private: - int id_color; -//! [6] -}; - - -//! [7] -class ColorNode : public QSGGeometryNode -{ -public: - ColorNode() - : m_geometry(QSGGeometry::defaultAttributes_TexturedPoint2D(), 4) - { - setGeometry(&m_geometry); - - QSGSimpleMaterial<State> *material = Shader::createMaterial(); - material->setFlag(QSGMaterial::Blending); - setMaterial(material); - setFlag(OwnsMaterial); - } - - QSGGeometry m_geometry; -}; -//! [7] - - -//! [8] -class Item : public QQuickItem -{ - Q_OBJECT - - Q_PROPERTY(QColor color READ color WRITE setColor NOTIFY colorChanged) - QML_NAMED_ELEMENT(SimpleMaterialItem) - -public: - - Item() - { - setFlag(ItemHasContents, true); - } - - void setColor(const QColor &color) { - if (m_color != color) { - m_color = color; - emit colorChanged(); - update(); - } - } - QColor color() const { - return m_color; - } - -signals: - void colorChanged(); - -private: - QColor m_color; - -//! [8] //! [9] -public: - QSGNode *updatePaintNode(QSGNode *node, UpdatePaintNodeData *) override - { - ColorNode *n = static_cast<ColorNode *>(node); - if (!node) - n = new ColorNode(); - - QSGGeometry::updateTexturedRectGeometry(n->geometry(), boundingRect(), QRectF(0, 0, 1, 1)); - static_cast<QSGSimpleMaterial<State>*>(n->material())->state()->color = m_color; - - n->markDirty(QSGNode::DirtyGeometry | QSGNode::DirtyMaterial); - - return n; - } -}; -//! [9] //! [11] +//! [11] int main(int argc, char **argv) { QGuiApplication app(argc, argv); - qmlRegisterTypesAndRevisions<Item>("SimpleMaterial", 1); - QQuickView view; view.setResizeMode(QQuickView::SizeRootObjectToView); view.setSource(QUrl("qrc:///scenegraph/simplematerial/main.qml")); @@ -213,6 +63,4 @@ int main(int argc, char **argv) return app.exec(); } - -#include "simplematerial.moc" //! [11] diff --git a/examples/quick/scenegraph/simplematerial/simplematerial.pro b/examples/quick/scenegraph/simplematerial/simplematerial.pro index 6ae935f357..131af45974 100644 --- a/examples/quick/scenegraph/simplematerial/simplematerial.pro +++ b/examples/quick/scenegraph/simplematerial/simplematerial.pro @@ -1,8 +1,13 @@ QT += quick +CONFIG += qmltypes +QML_IMPORT_NAME = SimpleMaterial +QML_IMPORT_MAJOR_VERSION = 1 + SOURCES += \ - simplematerial.cpp + simplematerial.cpp \ + simplematerialitem.cpp RESOURCES += simplematerial.qrc target.path = $$[QT_INSTALL_EXAMPLES]/quick/scenegraph/simplematerial @@ -10,3 +15,6 @@ qml.files = main.qml qml.path = $$[QT_INSTALL_EXAMPLES]/quick/scenegraph/simplematerial INSTALLS += target qml + +HEADERS += \ + simplematerialitem.h diff --git a/examples/quick/scenegraph/simplematerial/simplematerialitem.cpp b/examples/quick/scenegraph/simplematerial/simplematerialitem.cpp new file mode 100644 index 0000000000..c4c7b2e07e --- /dev/null +++ b/examples/quick/scenegraph/simplematerial/simplematerialitem.cpp @@ -0,0 +1,169 @@ +/**************************************************************************** +** +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the demonstration applications 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 "simplematerialitem.h" + +#include <QtQuick/qsgsimplematerial.h> +#include <QtQuick/qsggeometry.h> +#include <QtQuick/qsgnode.h> + +//! [1] +struct State +{ + QColor color; + + int compare(const State *other) const { + uint rgb = color.rgba(); + uint otherRgb = other->color.rgba(); + + if (rgb == otherRgb) { + return 0; + } else if (rgb < otherRgb) { + return -1; + } else { + return 1; + } + } +}; +//! [1] + +//! [2] +class Shader : public QSGSimpleMaterialShader<State> +{ + QSG_DECLARE_SIMPLE_COMPARABLE_SHADER(Shader, State); +//! [2] //! [3] +public: + + const char *vertexShader() const override { + return + "attribute highp vec4 aVertex; \n" + "attribute highp vec2 aTexCoord; \n" + "uniform highp mat4 qt_Matrix; \n" + "varying highp vec2 texCoord; \n" + "void main() { \n" + " gl_Position = qt_Matrix * aVertex; \n" + " texCoord = aTexCoord; \n" + "}"; + } + + const char *fragmentShader() const override { + return + "uniform lowp float qt_Opacity; \n" + "uniform lowp vec4 color; \n" + "varying highp vec2 texCoord; \n" + "void main () \n" + "{ \n" + " gl_FragColor = texCoord.y * texCoord.x * color * qt_Opacity; \n" + "}"; + } +//! [3] //! [4] + QList<QByteArray> attributes() const override + { + return QList<QByteArray>() << "aVertex" << "aTexCoord"; + } +//! [4] //! [5] + void updateState(const State *state, const State *) override + { + program()->setUniformValue(id_color, state->color); + } +//! [5] //! [6] + void resolveUniforms() override + { + id_color = program()->uniformLocation("color"); + } + +private: + int id_color; +//! [6] +}; + + +//! [7] +class ColorNode : public QSGGeometryNode +{ +public: + ColorNode() + : m_geometry(QSGGeometry::defaultAttributes_TexturedPoint2D(), 4) + { + setGeometry(&m_geometry); + + QSGSimpleMaterial<State> *material = Shader::createMaterial(); + material->setFlag(QSGMaterial::Blending); + setMaterial(material); + setFlag(OwnsMaterial); + } + + QSGGeometry m_geometry; +}; +//! [7] + +void SimpleMaterialItem::setColor(const QColor &color) { + if (m_color != color) { + m_color = color; + emit colorChanged(); + update(); + } +} + +//! [9] +QSGNode *SimpleMaterialItem::updatePaintNode(QSGNode *node, QQuickItem::UpdatePaintNodeData *) +{ + ColorNode *n = static_cast<ColorNode *>(node); + if (!node) + n = new ColorNode(); + + QSGGeometry::updateTexturedRectGeometry(n->geometry(), boundingRect(), QRectF(0, 0, 1, 1)); + static_cast<QSGSimpleMaterial<State>*>(n->material())->state()->color = m_color; + + n->markDirty(QSGNode::DirtyGeometry | QSGNode::DirtyMaterial); + + return n; +} +//! [9] diff --git a/examples/quick/scenegraph/simplematerial/simplematerialitem.h b/examples/quick/scenegraph/simplematerial/simplematerialitem.h new file mode 100644 index 0000000000..5775ad097b --- /dev/null +++ b/examples/quick/scenegraph/simplematerial/simplematerialitem.h @@ -0,0 +1,82 @@ +/**************************************************************************** +** +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the demonstration applications 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$ +** +****************************************************************************/ + +#ifndef SIMPLEMATERIALITEM_H +#define SIMPLEMATERIALITEM_H + +#include <QtQuick/qquickitem.h> + +//! [8] +class SimpleMaterialItem : public QQuickItem +{ + Q_OBJECT + + Q_PROPERTY(QColor color READ color WRITE setColor NOTIFY colorChanged) + QML_ELEMENT + +public: + + SimpleMaterialItem() { setFlag(ItemHasContents, true); } + + void setColor(const QColor &color); + QColor color() const { return m_color; } + +signals: + void colorChanged(); + +private: + QColor m_color; + +public: + QSGNode *updatePaintNode(QSGNode *node, UpdatePaintNodeData *) override; +}; +//! [8] + +#endif // SIMPLEMATERIALITEM_H diff --git a/examples/quick/scenegraph/textureinthread/main.cpp b/examples/quick/scenegraph/textureinthread/main.cpp index 7c22fa7fdf..cb00946bf7 100644 --- a/examples/quick/scenegraph/textureinthread/main.cpp +++ b/examples/quick/scenegraph/textureinthread/main.cpp @@ -70,7 +70,6 @@ int main(int argc, char **argv) return app.exec(); } - qmlRegisterTypesAndRevisions<ThreadRenderer>("SceneGraphRendering", 1); int execReturn = 0; { diff --git a/examples/quick/scenegraph/textureinthread/textureinthread.pro b/examples/quick/scenegraph/textureinthread/textureinthread.pro index 7f5fbb76e9..4d41daa7bf 100644 --- a/examples/quick/scenegraph/textureinthread/textureinthread.pro +++ b/examples/quick/scenegraph/textureinthread/textureinthread.pro @@ -3,6 +3,10 @@ QT += quick # To make threaded gl check... QT += core-private gui-private +CONFIG += qmltypes +QML_IMPORT_NAME = SceneGraphRendering +QML_IMPORT_MAJOR_VERSION = 1 + HEADERS += threadrenderer.h SOURCES += threadrenderer.cpp main.cpp diff --git a/examples/quick/scenegraph/threadedanimation/main.cpp b/examples/quick/scenegraph/threadedanimation/main.cpp index c77a291f5d..85ff486b16 100644 --- a/examples/quick/scenegraph/threadedanimation/main.cpp +++ b/examples/quick/scenegraph/threadedanimation/main.cpp @@ -57,8 +57,6 @@ int main(int argc, char **argv) { QGuiApplication app(argc, argv); - qmlRegisterTypesAndRevisions<Spinner>("Spinner", 1); - QQuickView view; view.setSource(QUrl("qrc:///scenegraph/threadedanimation/main.qml")); view.show(); diff --git a/examples/quick/scenegraph/threadedanimation/threadedanimation.pro b/examples/quick/scenegraph/threadedanimation/threadedanimation.pro index 419ee97e2e..3caf3fa94b 100644 --- a/examples/quick/scenegraph/threadedanimation/threadedanimation.pro +++ b/examples/quick/scenegraph/threadedanimation/threadedanimation.pro @@ -1,5 +1,9 @@ QT += qml quick +CONFIG += qmltypes +QML_IMPORT_NAME = Spinner +QML_IMPORT_MAJOR_VERSION = 1 + HEADERS += spinner.h SOURCES += spinner.cpp main.cpp RESOURCES += threadedanimation.qrc diff --git a/examples/quick/scenegraph/twotextureproviders/main.cpp b/examples/quick/scenegraph/twotextureproviders/main.cpp index 3f53bb6e32..df0454ce40 100644 --- a/examples/quick/scenegraph/twotextureproviders/main.cpp +++ b/examples/quick/scenegraph/twotextureproviders/main.cpp @@ -58,8 +58,6 @@ int main(int argc, char **argv) { QGuiApplication app(argc, argv); - qmlRegisterTypesAndRevisions<XorBlender>("SceneGraphRendering", 1); - QQuickView view; view.setResizeMode(QQuickView::SizeRootObjectToView); view.setSource(QUrl("qrc:///scenegraph/twotextureproviders/main.qml")); diff --git a/examples/quick/scenegraph/twotextureproviders/twotextureproviders.pro b/examples/quick/scenegraph/twotextureproviders/twotextureproviders.pro index 7b7c093b48..b87a0a2611 100644 --- a/examples/quick/scenegraph/twotextureproviders/twotextureproviders.pro +++ b/examples/quick/scenegraph/twotextureproviders/twotextureproviders.pro @@ -1,5 +1,9 @@ QT += qml quick +CONFIG += qmltypes +QML_IMPORT_NAME = SceneGraphRendering +QML_IMPORT_MAJOR_VERSION = 1 + HEADERS += xorblender.h SOURCES += xorblender.cpp main.cpp |