From 077ad5f30446f6b3ccc38cb7f05897566f8e5eb7 Mon Sep 17 00:00:00 2001 From: Gunnar Sletta Date: Wed, 12 Dec 2012 20:11:12 +0100 Subject: Documentation for scene graph examples. Change-Id: Idb39fc0b6d5e538b90ae8a0b98d9f4d77e1fb617 Reviewed-by: Yoann Lopes --- src/quick/scenegraph/util/qsgsimplematerial.cpp | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'src/quick/scenegraph/util/qsgsimplematerial.cpp') diff --git a/src/quick/scenegraph/util/qsgsimplematerial.cpp b/src/quick/scenegraph/util/qsgsimplematerial.cpp index 6267d3ff5c..f91c85af93 100644 --- a/src/quick/scenegraph/util/qsgsimplematerial.cpp +++ b/src/quick/scenegraph/util/qsgsimplematerial.cpp @@ -144,6 +144,29 @@ \sa {Simple Material Example} */ +/*! + \macro QSG_DECLARE_SIMPLE_SHADER(Shader, State) + \relates QSGSimpleMaterialShader + + This macro is used to declare a QSGMaterialType and a \c + createMaterial() function for \a Shader with the given \a State. + */ + +/*! + \macro QSG_DECLARE_SIMPLE_COMPARABLE_SHADER(Shader, State) + \relates QSGSimpleMaterialShader + + This macro is used to declare a QSGMaterialType and a \c + createMaterial() function for \a Shader with the given \a State, + where the \a State class must define a compare function on the + form: + + \code + int compare(const State *other) const; + \endcode +*/ + + /*! \fn char const *const *QSGSimpleMaterialShader::attributeNames() const \internal -- cgit v1.2.3 From 83deab8d1b82bb3a02b0b92737b298848d19beb6 Mon Sep 17 00:00:00 2001 From: Sergio Ahumada Date: Wed, 2 Jan 2013 12:17:46 +0100 Subject: Update copyright year in Digia's license headers Change-Id: I6c3bd7bebe3d62d1cfd0fa6334544c9db8398c76 Reviewed-by: Akseli Salovaara Reviewed-by: Sergio Ahumada --- src/quick/scenegraph/util/qsgsimplematerial.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/quick/scenegraph/util/qsgsimplematerial.cpp') diff --git a/src/quick/scenegraph/util/qsgsimplematerial.cpp b/src/quick/scenegraph/util/qsgsimplematerial.cpp index f91c85af93..612dbbe5e6 100644 --- a/src/quick/scenegraph/util/qsgsimplematerial.cpp +++ b/src/quick/scenegraph/util/qsgsimplematerial.cpp @@ -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 QtQml module of the Qt Toolkit. -- cgit v1.2.3 From c8a04f9412c1e765a98be86387fd848ca7ea6993 Mon Sep 17 00:00:00 2001 From: Gunnar Sletta Date: Mon, 7 Jan 2013 16:20:39 +0100 Subject: Greatly improved Scene Graph Overview documentation Change-Id: I86b6bb9007d268ec039614a1693ecd839901e6d9 Reviewed-by: Jerome Pasion --- src/quick/scenegraph/util/qsgsimplematerial.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/quick/scenegraph/util/qsgsimplematerial.cpp') 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. -- cgit v1.2.3