summaryrefslogtreecommitdiffstats
path: root/src/extras
diff options
context:
space:
mode:
authorPaul Lemire <paul.lemire@kdab.com>2019-06-03 12:29:29 +0200
committerLiang Qi <liang.qi@qt.io>2019-06-03 12:29:52 +0200
commit4eee1ab5a51ac482e2252e2e85c0fe624d5d4bad (patch)
tree71fb24fc69b2f77e08a57c56011ee5b72f23a52a /src/extras
parent79aa74b5d9df52605a8833e3853b422ca8e7a651 (diff)
parent666a645d1edc98dfea92fdaf7eaeed10c86dbc56 (diff)
Merge remote-tracking branch 'origin/5.13' into dev
Conflicts: src/render/renderers/opengl/renderer/renderer.cpp tests/auto/render/textures/tst_textures.cpp Change-Id: I4da0eafe7ddd4dd822c3dcb5f5fa826653a335b4
Diffstat (limited to 'src/extras')
-rw-r--r--src/extras/defaults/qmetalroughmaterial.cpp51
1 files changed, 50 insertions, 1 deletions
diff --git a/src/extras/defaults/qmetalroughmaterial.cpp b/src/extras/defaults/qmetalroughmaterial.cpp
index c6913b490..d404f03de 100644
--- a/src/extras/defaults/qmetalroughmaterial.cpp
+++ b/src/extras/defaults/qmetalroughmaterial.cpp
@@ -171,6 +171,16 @@ void QMetalRoughMaterialPrivate::handleTextureScaleChanged(const QVariant &var)
*/
/*!
+ \qmltype MetalRoughMaterial
+ \instantiates Qt3DExtras::QMetalRoughMaterial
+ \inqmlmodule Qt3D.Extras
+
+ \brief This material uses an effect with a single render pass approach and
+ performs per fragment lighting. Techniques are provided for OpenGL 3
+ and OpenGL ES 3.
+*/
+
+/*!
Constructs a new QMetalRoughMaterial instance with parent object \a parent.
*/
QMetalRoughMaterial::QMetalRoughMaterial(QNode *parent)
@@ -201,6 +211,12 @@ QMetalRoughMaterial::~QMetalRoughMaterial()
Holds the current base color of the material. This can be either a plain
color value or a texture. By default the value of this property is "grey".
*/
+/*!
+ \qmlproperty color Qt3D.Extras::MetalRoughMaterial::baseColor
+
+ Holds the current base color of the material. This can be either a plain
+ color value or a texture. By default the value of this property is "grey".
+*/
QVariant QMetalRoughMaterial::baseColor() const
{
Q_D(const QMetalRoughMaterial);
@@ -210,7 +226,15 @@ QVariant QMetalRoughMaterial::baseColor() const
/*!
\property QMetalRoughMaterial::metalness
- Holds the current metalness level of the material, since is a value between
+ Holds the current metalness level of the material, as a value between
+ 0 (purely dielectric, the default) and 1 (purely metallic). This can be
+ either a plain uniform value or a texture. By default the value of this
+ property is 0.
+*/
+/*!
+ \qmlproperty real Qt3D.Extras::MetalRoughMaterial::metalness
+
+ Holds the current metalness level of the material, as a value between
0 (purely dielectric, the default) and 1 (purely metallic). This can be
either a plain uniform value or a texture. By default the value of this
property is 0.
@@ -228,6 +252,13 @@ QVariant QMetalRoughMaterial::metalness() const
plain uniform value or a texture. By default the value of this property is
0.
*/
+/*!
+ \qmlproperty real Qt3D.Extras::MetalRoughMaterial::roughness
+
+ Holds the current roughness level of the material. This can be either a
+ plain uniform value or a texture. By default the value of this property is
+ 0.
+*/
QVariant QMetalRoughMaterial::roughness() const
{
Q_D(const QMetalRoughMaterial);
@@ -240,6 +271,12 @@ QVariant QMetalRoughMaterial::roughness() const
Holds the current ambient occlusion map texture of the material. This can
only be a texture, otherwise it is ignored. By default this map is not set.
*/
+/*!
+ \qmlproperty Texture Qt3D.Extras::MetalRoughMaterial::ambientOcclusion
+
+ Holds the current ambient occlusion map texture of the material. This can
+ only be a texture, otherwise it is ignored. By default this map is not set.
+*/
QVariant QMetalRoughMaterial::ambientOcclusion() const
{
Q_D(const QMetalRoughMaterial);
@@ -252,6 +289,12 @@ QVariant QMetalRoughMaterial::ambientOcclusion() const
Holds the current normal map texture of the material. This can only be a
texture, otherwise it is ignored. By default this map is not set.
*/
+/*!
+ \qmlproperty Texture Qt3D.Extras::MetalRoughMaterial::normal
+
+ Holds the current normal map texture of the material. This can only be a
+ texture, otherwise it is ignored. By default this map is not set.
+*/
QVariant QMetalRoughMaterial::normal() const
{
Q_D(const QMetalRoughMaterial);
@@ -264,6 +307,12 @@ QVariant QMetalRoughMaterial::normal() const
Holds the current texture scale. It is applied as a multiplier to texture
coordinates at render time. Defaults to 1.0.
*/
+/*!
+ \qmlproperty real Qt3D.Extras::MetalRoughMaterial::textureScale
+
+ Holds the current texture scale. It is applied as a multiplier to texture
+ coordinates at render time. Defaults to 1.0.
+*/
float QMetalRoughMaterial::textureScale() const
{
Q_D(const QMetalRoughMaterial);