diff options
author | Topi Reinio <topi.reinio@digia.com> | 2015-06-12 15:43:39 +0200 |
---|---|---|
committer | Topi Reiniƶ <topi.reinio@digia.com> | 2015-06-15 11:28:58 +0000 |
commit | 60cb61f9d70ec52f3193bac44384099d921827b3 (patch) | |
tree | d24608c2e7c438f603c8e566e1b5a45f29d6afcd /src/render/defaults/qnormaldiffusespecularmapmaterial.cpp | |
parent | 6f93508bcd38d8d0fa524ac00d65b518fac0d82a (diff) |
Doc: Fix multiple documentation issuesv5.5.0-rc1
- Restore qt3d-index.html as the main landing page. Needed
for external linking.
- Fix \inmodule commands for Renderer classes
- Add proper group so that all three modules are listed on
the landing page, both C++ and QML modules
- Remove qt3drenderer-index.html (to be consistent with
Qt3DCore), copy contents over to the module page and
to a new file, qt3d-examples.qdoc.
- Fix indexTitles in qdocconf files, and subprojects for
Renderer QML types and Qt3D examples
Change-Id: I0e2497771d0525d120ffa9d7d6338b01fdfa6963
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
Diffstat (limited to 'src/render/defaults/qnormaldiffusespecularmapmaterial.cpp')
-rw-r--r-- | src/render/defaults/qnormaldiffusespecularmapmaterial.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/render/defaults/qnormaldiffusespecularmapmaterial.cpp b/src/render/defaults/qnormaldiffusespecularmapmaterial.cpp index ce154e0cf..2e77418c9 100644 --- a/src/render/defaults/qnormaldiffusespecularmapmaterial.cpp +++ b/src/render/defaults/qnormaldiffusespecularmapmaterial.cpp @@ -147,7 +147,7 @@ void QNormalDiffuseSpecularMapMaterialPrivate::init() \class Qt3D::QNormalDiffuseSpecularMapMaterial \brief The QNormalDiffuseSpecularMapMaterial provides a default implementation of the phong lighting and bump effect where the diffuse and specular light components are read from texture maps and the normals of the mesh being rendered from a normal texture map. - \inmodule Qt3DRender + \inmodule Qt3DRenderer \since 5.5 The specular lighting effect is based on the combination of 3 lighting components ambient, diffuse and specular. |