summaryrefslogtreecommitdiffstats
path: root/src/extras/defaults/qdiffusemapmaterial.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/extras/defaults/qdiffusemapmaterial.cpp')
-rw-r--r--src/extras/defaults/qdiffusemapmaterial.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/extras/defaults/qdiffusemapmaterial.cpp b/src/extras/defaults/qdiffusemapmaterial.cpp
index 6fbdc0469..cfdcc9c56 100644
--- a/src/extras/defaults/qdiffusemapmaterial.cpp
+++ b/src/extras/defaults/qdiffusemapmaterial.cpp
@@ -20,10 +20,10 @@
QT_BEGIN_NAMESPACE
-using namespace Qt3DRender;
-
namespace Qt3DExtras {
+using namespace Qt3DRender;
+
QDiffuseMapMaterialPrivate::QDiffuseMapMaterialPrivate()
: QMaterialPrivate()
, m_diffuseMapEffect(new QEffect())
@@ -221,7 +221,7 @@ QDiffuseMapMaterial::~QDiffuseMapMaterial()
}
/*!
- \property QDiffuseMapMaterial::ambient
+ \property Qt3DExtras::QDiffuseMapMaterial::ambient
Holds the current ambient color.
*/
@@ -233,7 +233,7 @@ QColor QDiffuseMapMaterial::ambient() const
}
/*!
- \property QDiffuseMapMaterial::specular
+ \property Qt3DExtras::QDiffuseMapMaterial::specular
Holds the current specular color.
*/
@@ -244,7 +244,7 @@ QColor QDiffuseMapMaterial::specular() const
}
/*!
- \property QDiffuseMapMaterial::shininess
+ \property Qt3DExtras::QDiffuseMapMaterial::shininess
Holds the current shininess as a float value.
*/
@@ -255,7 +255,7 @@ float QDiffuseMapMaterial::shininess() const
}
/*!
- \property QDiffuseMapMaterial::diffuse
+ \property Qt3DExtras::QDiffuseMapMaterial::diffuse
Holds the current texture used as the diffuse map.
@@ -275,7 +275,7 @@ QAbstractTexture *QDiffuseMapMaterial::diffuse() const
}
/*!
- \property QDiffuseMapMaterial::textureScale
+ \property Qt3DExtras::QDiffuseMapMaterial::textureScale
Holds the current texture scale. It is applied as a multiplier to texture
coordinates at render time. Defaults to 1.0.