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.h | |
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.h')
-rw-r--r-- | src/render/texture/qabstracttextureimage.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/render/texture/qabstracttextureimage.h b/src/render/texture/qabstracttextureimage.h index b5f0d7501..ec664a2f7 100644 --- a/src/render/texture/qabstracttextureimage.h +++ b/src/render/texture/qabstracttextureimage.h @@ -66,14 +66,14 @@ class QAbstractTextureImagePrivate; class QT3DRENDERSHARED_EXPORT QAbstractTextureImage : public Qt3DCore::QNode { Q_OBJECT - Q_PROPERTY(int mipmapLevel READ mipmapLevel WRITE setMipmapLevel NOTIFY mipmapLevelChanged) + Q_PROPERTY(int mipLevel READ mipLevel WRITE setMipLevel NOTIFY mipLevelChanged) Q_PROPERTY(int layer READ layer WRITE setLayer NOTIFY layerChanged) Q_PROPERTY(Qt3DRender::QAbstractTextureProvider::CubeMapFace cubeMapFace READ cubeMapFace WRITE setCubeMapFace NOTIFY cubeMapFaceChanged) public: explicit QAbstractTextureImage(Qt3DCore::QNode *parent = 0); virtual ~QAbstractTextureImage(); - int mipmapLevel() const; + int mipLevel() const; int layer() const; QAbstractTextureProvider::CubeMapFace cubeMapFace() const; @@ -81,12 +81,12 @@ public: virtual QTextureDataFunctorPtr dataFunctor() const = 0; public Q_SLOTS: - void setMipmapLevel(int level); + void setMipLevel(int level); void setLayer(int layer); void setCubeMapFace(QAbstractTextureProvider::CubeMapFace face); Q_SIGNALS: - void mipmapLevelChanged(int mipmapLevel); + void mipLevelChanged(int mipLevel); void layerChanged(int layer); void cubeMapFaceChanged(QAbstractTextureProvider::CubeMapFace cubeMapFace); |