diff options
| author | Johanna Aijala <johanna.aijala@digia.com> | 2013-02-21 09:17:06 +0200 |
|---|---|---|
| committer | Johanna Aijala <johanna.aijala@digia.com> | 2013-02-21 09:21:34 +0200 |
| commit | d9e4b5c1820e62700756ede2ef5290baccc3c1b2 (patch) | |
| tree | cc6975c1bd3ea86e4b7e5373560603e5165b7ff4 /examples/quick/particles/customparticle/doc/src/customparticle.qdoc | |
| parent | f4d4689d3c09cb4eae30be892be426d4fa185ed4 (diff) | |
| parent | fb7ab18fa799032f37fd6f78ab34b76aff91ed6c (diff) | |
Merge branch 'stable' into release
Change-Id: I13e80072db1e2c14a37b6a123276be81b085e87e
Diffstat (limited to 'examples/quick/particles/customparticle/doc/src/customparticle.qdoc')
| -rw-r--r-- | examples/quick/particles/customparticle/doc/src/customparticle.qdoc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/examples/quick/particles/customparticle/doc/src/customparticle.qdoc b/examples/quick/particles/customparticle/doc/src/customparticle.qdoc index 39c3d7c101..341484d9ab 100644 --- a/examples/quick/particles/customparticle/doc/src/customparticle.qdoc +++ b/examples/quick/particles/customparticle/doc/src/customparticle.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the documentation of the Qt Toolkit. @@ -27,7 +27,7 @@ /*! \title QtQuick.Particles Examples - CustomParticle - \example particles/customparticle + \example quick/particles/customparticle \brief This is a collection of examples using CustomParticle in the QML particle system. \image qml-customparticle-example.png @@ -36,19 +36,19 @@ Blur Particles adds a blur effect to the particles, which increases over the particle's life time. It uses a custom vertex shader: - \snippet particles/customparticle/content/blurparticles.qml vertex + \snippet quick/particles/customparticle/content/blurparticles.qml vertex to propagate life time simulation to a custom fragement shader: - \snippet particles/customparticle/content/blurparticles.qml fragment + \snippet quick/particles/customparticle/content/blurparticles.qml fragment which has access to both the normal image sampler and a blurred sampler, the image plus a ShaderEffect. Fragment Shader just uses the particle system as a vertex delivery system. - \snippet particles/customparticle/content/fragmentshader.qml 0 + \snippet quick/particles/customparticle/content/fragmentshader.qml 0 Image Colors uses CustomParticle to assign colors to particles based on their location in a picture. The vertex shader, - \snippet particles/customparticle/content/imagecolors.qml vertex + \snippet quick/particles/customparticle/content/imagecolors.qml vertex passes along the starting position for each vertex to the fragment shader, - \snippet particles/customparticle/content/imagecolors.qml fragment + \snippet quick/particles/customparticle/content/imagecolors.qml fragment which uses it to determine the color for that particle. */ |