diff options
author | Alan Alpert <alan.alpert@nokia.com> | 2011-07-11 11:20:58 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-07-20 06:57:44 +0200 |
commit | 963e769c01237265a403e2d28c1b2691cb45bf99 (patch) | |
tree | 89e874d035fc37348552f6ed8fc05bede181d9c8 /src/declarative/particles/qsgcustomparticle.cpp | |
parent | 12ebf79f3a92646ae7d5671d8ba4147055d203c2 (diff) |
Initial stab at docs for QtQuick.Particles 2.0
Change-Id: I3c53f7998dff95616a994edf19094fa4007d74ab
Reviewed-on: http://codereview.qt.nokia.com/1388
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Diffstat (limited to 'src/declarative/particles/qsgcustomparticle.cpp')
-rw-r--r-- | src/declarative/particles/qsgcustomparticle.cpp | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/src/declarative/particles/qsgcustomparticle.cpp b/src/declarative/particles/qsgcustomparticle.cpp index 908169582d..f1477f6ebf 100644 --- a/src/declarative/particles/qsgcustomparticle.cpp +++ b/src/declarative/particles/qsgcustomparticle.cpp @@ -119,6 +119,15 @@ struct PlainVertices { PlainVertex v4; }; +/*! + \qmlclass CustomParticle QSGCustomParticle + \inqmlmodule QtQuick.Particles 2 + \since QtQuick.Particles 2.0 + \inherits ParticlePainter + \brief The CustomParticle element allows you to specify your own shader to paint particles. + +*/ + QSGCustomParticle::QSGCustomParticle(QSGItem* parent) : QSGParticlePainter(parent) , m_pleaseReset(true) @@ -137,7 +146,7 @@ void QSGCustomParticle::componentComplete() //Trying to keep the shader conventions the same as in qsgshadereffectitem /*! - \qmlproperty string CustomParticle::fragmentShader + \qmlproperty string QtQuick.Particles2::CustomParticle::fragmentShader This property holds the fragment shader's GLSL source code. The default shader passes the texture coordinate along to the fragment @@ -156,7 +165,7 @@ void QSGCustomParticle::setFragmentShader(const QByteArray &code) } /*! - \qmlproperty string CustomParticle::vertexShader + \qmlproperty string QtQuick.Particles2::CustomParticle::vertexShader This property holds the vertex shader's GLSL source code. The default shader expects the texture coordinate to be passed from the |