diff options
Diffstat (limited to 'src/extras/defaults/qnormaldiffusespecularmapmaterial.cpp')
| -rw-r--r-- | src/extras/defaults/qnormaldiffusespecularmapmaterial.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/extras/defaults/qnormaldiffusespecularmapmaterial.cpp b/src/extras/defaults/qnormaldiffusespecularmapmaterial.cpp index 22713da40..098b6b799 100644 --- a/src/extras/defaults/qnormaldiffusespecularmapmaterial.cpp +++ b/src/extras/defaults/qnormaldiffusespecularmapmaterial.cpp @@ -20,10 +20,10 @@ QT_BEGIN_NAMESPACE -using namespace Qt3DRender; - namespace Qt3DExtras { +using namespace Qt3DRender; + QNormalDiffuseSpecularMapMaterialPrivate::QNormalDiffuseSpecularMapMaterialPrivate() : QMaterialPrivate() , m_normalDiffuseSpecularEffect(new QEffect()) @@ -254,7 +254,7 @@ QNormalDiffuseSpecularMapMaterial::~QNormalDiffuseSpecularMapMaterial() } /*! - \property QNormalDiffuseSpecularMapMaterial::ambient + \property Qt3DExtras::QNormalDiffuseSpecularMapMaterial::ambient Holds the current ambient color. */ @@ -265,7 +265,7 @@ QColor QNormalDiffuseSpecularMapMaterial::ambient() const } /*! - \property QNormalDiffuseSpecularMapMaterial::diffuse + \property Qt3DExtras::QNormalDiffuseSpecularMapMaterial::diffuse Holds the current diffuse map texture. @@ -285,7 +285,7 @@ QAbstractTexture *QNormalDiffuseSpecularMapMaterial::diffuse() const } /*! - \property QNormalDiffuseSpecularMapMaterial::normal + \property Qt3DExtras::QNormalDiffuseSpecularMapMaterial::normal Holds the current normal map texture. @@ -304,7 +304,7 @@ QAbstractTexture *QNormalDiffuseSpecularMapMaterial::normal() const } /*! - \property QNormalDiffuseSpecularMapMaterial::specular + \property Qt3DExtras::QNormalDiffuseSpecularMapMaterial::specular Holds the current specular map texture. @@ -324,7 +324,7 @@ QAbstractTexture *QNormalDiffuseSpecularMapMaterial::specular() const } /*! - \property QNormalDiffuseSpecularMapMaterial::shininess + \property Qt3DExtras::QNormalDiffuseSpecularMapMaterial::shininess Holds the current shininess as a float value. */ @@ -335,7 +335,7 @@ float QNormalDiffuseSpecularMapMaterial::shininess() const } /*! - \property QNormalDiffuseSpecularMapMaterial::textureScale + \property Qt3DExtras::QNormalDiffuseSpecularMapMaterial::textureScale Holds the current texture scale. It is applied as a multiplier to texture coordinates at render time. Defaults to 1.0. |