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/textureimage.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/textureimage.cpp')
| -rw-r--r-- | src/render/texture/textureimage.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/render/texture/textureimage.cpp b/src/render/texture/textureimage.cpp index fe4247410..32fbaca3c 100644 --- a/src/render/texture/textureimage.cpp +++ b/src/render/texture/textureimage.cpp @@ -52,7 +52,7 @@ namespace Render { TextureImage::TextureImage() : BackendNode() , m_layer(0) - , m_mipmapLevel(0) + , m_mipLevel(0) , m_face(QAbstractTextureProvider::CubeMapPositiveX) , m_dirty(true) , m_textureManager(Q_NULLPTR) @@ -65,7 +65,7 @@ TextureImage::TextureImage() void TextureImage::cleanup() { m_layer = 0; - m_mipmapLevel = 0; + m_mipLevel = 0; m_dirty = true; m_face = QAbstractTextureProvider::CubeMapPositiveX; m_functor.reset(); @@ -80,7 +80,7 @@ void TextureImage::updateFromPeer(Qt3DCore::QNode *peer) { QAbstractTextureImage *textureImage = static_cast<QAbstractTextureImage *>(peer); m_layer = textureImage->layer(); - m_mipmapLevel = textureImage->mipmapLevel(); + m_mipLevel = textureImage->mipLevel(); m_face = textureImage->cubeMapFace(); m_functor = textureImage->dataFunctor(); // Notify the Texture that we are one of its TextureImage @@ -105,8 +105,8 @@ void TextureImage::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) if (propertyChange->propertyName() == QByteArrayLiteral("layer")) { m_layer = propertyChange->value().toInt(); m_dirty = true; - } else if (propertyChange->propertyName() == QByteArrayLiteral("mipmapLevel")) { - m_mipmapLevel = propertyChange->value().toInt(); + } else if (propertyChange->propertyName() == QByteArrayLiteral("mipLevel")) { + m_mipLevel = propertyChange->value().toInt(); m_dirty = true; } else if (propertyChange->propertyName() == QByteArrayLiteral("cubeMapFace")) { m_face = static_cast<QAbstractTextureProvider::CubeMapFace>(propertyChange->value().toInt()); @@ -154,7 +154,7 @@ void TextureImage::setTextureDataHandle(HTextureData handle) void TextureImage::updateDNA() { m_dna = ::qHash(m_layer - + (m_mipmapLevel << 4) + + (m_mipLevel << 4) + (static_cast<int>(m_face) << 8) + (m_textureDataHandle.handle() << 12)); } |