diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-10-05 13:58:50 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-10-05 13:58:50 +0200 |
| commit | 6c77dea4711b6a88e80e30db21d622808e5ef9b6 (patch) | |
| tree | 7f03934b19f5782447da135aeceb4269298e3f2a /src/doc/src | |
| parent | edc88e97721c0a223a2b77cec217f550f08a4135 (diff) | |
| parent | d8789d8fd17fd58f06003e9846b3d107ffc8ec52 (diff) | |
Merge remote-tracking branch 'origin/5.11' into 5.12
Change-Id: I2a92242b0d6be4f4e7f07f0f020fa6751ada9bc3
Diffstat (limited to 'src/doc/src')
| -rw-r--r-- | src/doc/src/qmlextramaterials.qdoc | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/src/doc/src/qmlextramaterials.qdoc b/src/doc/src/qmlextramaterials.qdoc index 10198845f..c54cc948b 100644 --- a/src/doc/src/qmlextramaterials.qdoc +++ b/src/doc/src/qmlextramaterials.qdoc @@ -28,6 +28,8 @@ /*! \qmltype DiffuseMapMaterial \inqmlmodule Qt3D.Extras + \obsolete + \brief The DiffuseMapMaterial provides a default implementation of the phong lighting effect where the diffuse light component is read from a texture map. \since 5.7 @@ -86,6 +88,8 @@ /*! \qmltype DiffuseSpecularMapMaterial \inqmlmodule Qt3D.Extras + \obsolete + \brief The DiffuseSpecularMapMaterial provides a default implementation of the phong lighting effect where the diffuse and specular light components are read from texture maps. \since 5.7 @@ -220,6 +224,8 @@ /*! \qmltype NormalDiffuseMapAlphaMaterial \inqmlmodule Qt3D.Extras + \obsolete + \brief The NormalDiffuseMapAlphaMaterial provides a specialization of NormalDiffuseMapMaterial with alpha coverage and a depth test performed in the rendering pass. \since 5.7 @@ -291,6 +297,8 @@ /*! \qmltype NormalDiffuseMapMaterial \inqmlmodule Qt3D.Extras + \obsolete + \brief The NormalDiffuseMapMaterial provides a default implementation of the phong lighting and bump effect where the diffuse light component is read from a texture map and the normals of the mesh being rendered from a normal texture map. @@ -363,6 +371,8 @@ /*! \qmltype NormalDiffuseSpecularMapMaterial \inqmlmodule Qt3D.Extras + \obsolete + \brief The NormalDiffuseSpecularMapMaterial 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. @@ -465,6 +475,8 @@ /*! \qmltype PhongAlphaMaterial \inqmlmodule Qt3D.Extras + \obsolete + \brief The PhongAlphaMaterial class provides a default implementation of the phong lighting effect with alpha. \since 5.7 @@ -516,6 +528,8 @@ /*! \qmltype PhongMaterial \inqmlmodule Qt3D.Extras + \obsolete + \brief The PhongMaterial class provides a default implementation of the phong lighting effect. \since 5.7 \inherits Qt3D.Render::Material |