diff options
author | Robert Brock <robert.brock@kdab.com> | 2016-02-25 16:27:50 +0000 |
---|---|---|
committer | Sean Harmer <sean.harmer@kdab.com> | 2016-02-29 11:18:33 +0000 |
commit | 33696e8d63f9a4b11de909c3a75fa6ec627bfdd5 (patch) | |
tree | 0fe5287e0ff9328537dfdc510f201c34d68e565f /src/render/texture/qabstracttextureimage.cpp | |
parent | 8a30f6391791e468a680834d1e445102e6fe4d47 (diff) |
QAbstractTextureImage mipmapLevel now mipLevel
Checked qlight test is running
As per API review
Change-Id: Ie27271612e0bfad4ead2361e45f53cd13f692165
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/render/texture/qabstracttextureimage.cpp')
-rw-r--r-- | src/render/texture/qabstracttextureimage.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/render/texture/qabstracttextureimage.cpp b/src/render/texture/qabstracttextureimage.cpp index 02b61756b..a28cf9668 100644 --- a/src/render/texture/qabstracttextureimage.cpp +++ b/src/render/texture/qabstracttextureimage.cpp @@ -95,20 +95,20 @@ QAbstractTextureImage::~QAbstractTextureImage() /*! - \qmlproperty int Qt3D.Render::AbstractTextureImage::mipmapLevel + \qmlproperty int Qt3D.Render::AbstractTextureImage::mipLevel Holds the mipmap level of the texture image. */ /*! - \property Qt3DRender::QAbstractTextureImage::mipmapLevel + \property Qt3DRender::QAbstractTextureImage::mipLevel Holds the mipmap level of the texture image. */ -int QAbstractTextureImage::mipmapLevel() const +int QAbstractTextureImage::mipLevel() const { Q_D(const QAbstractTextureImage); - return d->m_mipmapLevel; + return d->m_mipLevel; } /*! @@ -160,12 +160,12 @@ QAbstractTextureProvider::CubeMapFace QAbstractTextureImage::cubeMapFace() const return d->m_face; } -void QAbstractTextureImage::setMipmapLevel(int level) +void QAbstractTextureImage::setMipLevel(int level) { Q_D(QAbstractTextureImage); - if (level != d->m_mipmapLevel) { - d->m_mipmapLevel = level; - emit mipmapLevelChanged(level); + if (level != d->m_mipLevel) { + d->m_mipLevel = level; + emit mipLevelChanged(level); } } @@ -210,7 +210,7 @@ void QAbstractTextureImage::copy(const QNode *ref) const QAbstractTextureImage *imageRef = static_cast<const QAbstractTextureImage *>(ref); d_func()->m_face = imageRef->cubeMapFace(); d_func()->m_layer = imageRef->layer(); - d_func()->m_mipmapLevel = imageRef->mipmapLevel(); + d_func()->m_mipLevel = imageRef->mipLevel(); } /*! \internal */ |