diff options
author | Gunnar Sletta <gunnar.sletta@digia.com> | 2013-01-07 16:20:39 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-01-16 21:32:32 +0100 |
commit | c8a04f9412c1e765a98be86387fd848ca7ea6993 (patch) | |
tree | 253f1f893d4265073e18f155e0d4f5b9adb81310 /src/quick/scenegraph/util | |
parent | 20f5919a63e36fe43a9d8107992badcd8cf8c915 (diff) |
Greatly improved Scene Graph Overview documentation
Change-Id: I86b6bb9007d268ec039614a1693ecd839901e6d9
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Diffstat (limited to 'src/quick/scenegraph/util')
4 files changed, 8 insertions, 0 deletions
diff --git a/src/quick/scenegraph/util/qsgflatcolormaterial.cpp b/src/quick/scenegraph/util/qsgflatcolormaterial.cpp index 4c76f65e19..307201277c 100644 --- a/src/quick/scenegraph/util/qsgflatcolormaterial.cpp +++ b/src/quick/scenegraph/util/qsgflatcolormaterial.cpp @@ -124,6 +124,7 @@ const char *FlatColorMaterialShader::fragmentShader() const { solid colored geometry in the scene graph. \inmodule QtQuick + \ingroup qtquick-scenegraph-materials The flat color material will fill every pixel in a geometry using a solid color. The color can contain transparency. diff --git a/src/quick/scenegraph/util/qsgsimplematerial.cpp b/src/quick/scenegraph/util/qsgsimplematerial.cpp index 612dbbe5e6..bed1b710ca 100644 --- a/src/quick/scenegraph/util/qsgsimplematerial.cpp +++ b/src/quick/scenegraph/util/qsgsimplematerial.cpp @@ -46,6 +46,7 @@ building custom materials for the scene graph. \inmodule QtQuick + \ingroup qtquick-scenegraph-materials Where the QSGMaterial and QSGMaterialShader API requires a bit of boilerplate code to create a functioning material, the @@ -221,6 +222,7 @@ \class QSGSimpleMaterial \inmodule QtQuick + \ingroup qtquick-scenegraph-materials \brief The QSGSimpleMaterial class is a template generated class used to store the state used with a QSGSimpleMateralShader. diff --git a/src/quick/scenegraph/util/qsgtexturematerial.cpp b/src/quick/scenegraph/util/qsgtexturematerial.cpp index 3100a84749..ff91109a2a 100644 --- a/src/quick/scenegraph/util/qsgtexturematerial.cpp +++ b/src/quick/scenegraph/util/qsgtexturematerial.cpp @@ -131,6 +131,8 @@ void QSGOpaqueTextureMaterialShader::updateState(const RenderState &state, QSGMa \class QSGOpaqueTextureMaterial \brief The QSGOpaqueTextureMaterial class provides a convenient way of rendering textured geometry in the scene graph. + \inmodule QtQuick + \ingroup qtquick-scenegraph-materials The opaque textured material will fill every pixel in a geometry with the supplied texture. The material does not respect the opacity of the @@ -323,6 +325,8 @@ int QSGOpaqueTextureMaterial::compare(const QSGMaterial *o) const \class QSGTextureMaterial \brief The QSGTextureMaterial class provides a convenient way of rendering textured geometry in the scene graph. + \inmodule QtQuick + \ingroup qtquick-scenegraph-materials The textured material will fill every pixel in a geometry with the supplied texture. diff --git a/src/quick/scenegraph/util/qsgvertexcolormaterial.cpp b/src/quick/scenegraph/util/qsgvertexcolormaterial.cpp index 7536712ca4..29f95e56b0 100644 --- a/src/quick/scenegraph/util/qsgvertexcolormaterial.cpp +++ b/src/quick/scenegraph/util/qsgvertexcolormaterial.cpp @@ -114,6 +114,7 @@ const char *QSGVertexColorMaterialShader::fragmentShader() const { colored geometry in the scene graph. \inmodule QtQuick + \ingroup qtquick-scenegraph-materials The vertex color material will give each vertex in a geometry a color. Pixels between vertices will be linearly interpolated. The colors can contain transparency. |