diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2015-06-29 20:32:37 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-06-29 20:32:37 +0200 |
commit | 57e982442a4df1fd3a4fd063964aeb3895ae3e12 (patch) | |
tree | 55ee517c952eb299c5f41baf629f62bf231ea3f1 /src/render/defaults | |
parent | 8f58119cd18d69fac28528f0a7536cb9fccc15e3 (diff) | |
parent | cdd39567c3b0bd0f9440dead548954d5230a611f (diff) |
Merge remote-tracking branch 'origin/5.5' into dev
Conflicts:
.qmake.conf
src/render/defaults/qforwardrenderer.cpp
src/render/doc/qt3drender.qdocconf
Change-Id: I1c4a15d2b57980dca82fa420ab6ef8c48c049a2c
Diffstat (limited to 'src/render/defaults')
-rw-r--r-- | src/render/defaults/qdiffusemapmaterial.cpp | 2 | ||||
-rw-r--r-- | src/render/defaults/qdiffusespecularmapmaterial.cpp | 2 | ||||
-rw-r--r-- | src/render/defaults/qnormaldiffusemapalphamaterial.cpp | 2 | ||||
-rw-r--r-- | src/render/defaults/qnormaldiffusemapmaterial.cpp | 2 | ||||
-rw-r--r-- | src/render/defaults/qnormaldiffusespecularmapmaterial.cpp | 2 | ||||
-rw-r--r-- | src/render/defaults/qpervertexcolormaterial.cpp | 2 | ||||
-rw-r--r-- | src/render/defaults/qphongmaterial.cpp | 2 | ||||
-rw-r--r-- | src/render/defaults/qskyboxentity.cpp | 1 |
8 files changed, 8 insertions, 7 deletions
diff --git a/src/render/defaults/qdiffusemapmaterial.cpp b/src/render/defaults/qdiffusemapmaterial.cpp index 3cdbfacf7..f759d143c 100644 --- a/src/render/defaults/qdiffusemapmaterial.cpp +++ b/src/render/defaults/qdiffusemapmaterial.cpp @@ -132,7 +132,7 @@ void QDiffuseMapMaterialPrivate::init() \class Qt3D::QDiffuseMapMaterial \brief The QDiffuseMapMaterial provides a default implementation of the phong lighting effect where the diffuse light component is read from a 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. diff --git a/src/render/defaults/qdiffusespecularmapmaterial.cpp b/src/render/defaults/qdiffusespecularmapmaterial.cpp index 55786f692..25ed94490 100644 --- a/src/render/defaults/qdiffusespecularmapmaterial.cpp +++ b/src/render/defaults/qdiffusespecularmapmaterial.cpp @@ -140,7 +140,7 @@ void QDiffuseSpecularMapMaterialPrivate::init() \class Qt3D::QDiffuseSpecularMapMaterial \brief The QDiffuseSpecularMapMaterial provides a default implementation of the phong lighting and bump effect where the diffuse and specular light components are read from texture maps. - \inmodule Qt3DRender + \inmodule Qt3DRenderer \since 5.5 The specular lighting effect is based on the combination of 3 lighting components ambient, diffuse and specular. diff --git a/src/render/defaults/qnormaldiffusemapalphamaterial.cpp b/src/render/defaults/qnormaldiffusemapalphamaterial.cpp index 6854e7f1d..0c236b56d 100644 --- a/src/render/defaults/qnormaldiffusemapalphamaterial.cpp +++ b/src/render/defaults/qnormaldiffusemapalphamaterial.cpp @@ -129,7 +129,7 @@ void QNormalDiffuseMapAlphaMaterialPrivate::init() \brief The QNormalDiffuseMapAlphaMaterial 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. In addition, it defines an alpha to coverage and a depth test to be performed in the rendering pass. - \inmodule Qt3DRender + \inmodule Qt3DRenderer \since 5.5 The specular lighting effect is based on the combination of 3 lighting components ambient, diffuse and specular. diff --git a/src/render/defaults/qnormaldiffusemapmaterial.cpp b/src/render/defaults/qnormaldiffusemapmaterial.cpp index 136e3d94a..6f64c31eb 100644 --- a/src/render/defaults/qnormaldiffusemapmaterial.cpp +++ b/src/render/defaults/qnormaldiffusemapmaterial.cpp @@ -141,7 +141,7 @@ void QNormalDiffuseMapMaterialPrivate::init() \class Qt3D::QNormalDiffuseMapMaterial \brief The QNormalDiffuseMapMaterial 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. - \inmodule Qt3DRender + \inmodule Qt3DRenderer \since 5.5 The specular lighting effect is based on the combination of 3 lighting components ambient, diffuse and specular. diff --git a/src/render/defaults/qnormaldiffusespecularmapmaterial.cpp b/src/render/defaults/qnormaldiffusespecularmapmaterial.cpp index 3e30bee27..ff312964a 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. diff --git a/src/render/defaults/qpervertexcolormaterial.cpp b/src/render/defaults/qpervertexcolormaterial.cpp index c1c68ce0e..578ff35f4 100644 --- a/src/render/defaults/qpervertexcolormaterial.cpp +++ b/src/render/defaults/qpervertexcolormaterial.cpp @@ -74,7 +74,7 @@ QPerVertexColorMaterialPrivate::QPerVertexColorMaterialPrivate() /*! \class Qt3D::QPerVertexColorMaterial \brief The QPerVertexColorMaterial class provides a default implementation for rendering the color properties set for each vertex. - \inmodule Qt3DRender + \inmodule Qt3DRenderer \since 5.5 This lighting effect is based on the combination of 2 lighting components ambient and diffuse. Ambient is set by the vertex color. diff --git a/src/render/defaults/qphongmaterial.cpp b/src/render/defaults/qphongmaterial.cpp index 43e9f298c..a1d313c67 100644 --- a/src/render/defaults/qphongmaterial.cpp +++ b/src/render/defaults/qphongmaterial.cpp @@ -78,7 +78,7 @@ QPhongMaterialPrivate::QPhongMaterialPrivate() /*! \class Qt3D::QPhongMaterial \brief The QPhongMaterial class provides a default implementation of the phong lighting effect. - \inmodule Qt3DRender + \inmodule Qt3DRenderer \since 5.5 The phong lighting effect is based on the combination of 3 lighting components ambient, diffuse and specular. diff --git a/src/render/defaults/qskyboxentity.cpp b/src/render/defaults/qskyboxentity.cpp index 457fa746a..a2a1e0eaf 100644 --- a/src/render/defaults/qskyboxentity.cpp +++ b/src/render/defaults/qskyboxentity.cpp @@ -212,6 +212,7 @@ QSkyboxEntity::QSkyboxEntity(QNode *parent) QSkyboxEntity::~QSkyboxEntity() { + QNode::cleanup(); } /*! |