diff options
| author | Kevin Ottens <kevin.ottens@kdab.com> | 2016-08-22 08:47:29 +0200 |
|---|---|---|
| committer | Kevin Ottens <kevin.ottens@kdab.com> | 2016-08-24 13:14:39 +0000 |
| commit | ffface42ec928185ef18fcd49285114469a02223 (patch) | |
| tree | e17cf3c8466992cd3c33aa5b37d7ab229852dd87 | |
| parent | ecf3d9f464a1b04b0652db553cb92e9e9014143b (diff) | |
Use trilinear filtering for normal maps
Porting over fixes from Sean which were only done in the QML variants of
the default materials (1791e4b and 17d5edb).
Change-Id: Id347066aa56b896c9e044850f55267e348f47db8
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
| -rw-r--r-- | src/extras/defaults/qnormaldiffusemapmaterial.cpp | 3 | ||||
| -rw-r--r-- | src/extras/defaults/qnormaldiffusespecularmapmaterial.cpp | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/extras/defaults/qnormaldiffusemapmaterial.cpp b/src/extras/defaults/qnormaldiffusemapmaterial.cpp index 01d67a477..c38756c98 100644 --- a/src/extras/defaults/qnormaldiffusemapmaterial.cpp +++ b/src/extras/defaults/qnormaldiffusemapmaterial.cpp @@ -86,8 +86,9 @@ QNormalDiffuseMapMaterialPrivate::QNormalDiffuseMapMaterialPrivate() m_diffuseTexture->setMaximumAnisotropy(16.0f); m_normalTexture->setMagnificationFilter(QAbstractTexture::Linear); - m_normalTexture->setMinificationFilter(QAbstractTexture::Linear); + m_normalTexture->setMinificationFilter(QAbstractTexture::LinearMipMapLinear); m_normalTexture->setWrapMode(QTextureWrapMode(QTextureWrapMode::Repeat)); + m_normalTexture->setGenerateMipMaps(true); m_normalTexture->setMaximumAnisotropy(16.0f); } diff --git a/src/extras/defaults/qnormaldiffusespecularmapmaterial.cpp b/src/extras/defaults/qnormaldiffusespecularmapmaterial.cpp index 6d54b9535..3c26fde5a 100644 --- a/src/extras/defaults/qnormaldiffusespecularmapmaterial.cpp +++ b/src/extras/defaults/qnormaldiffusespecularmapmaterial.cpp @@ -87,8 +87,9 @@ QNormalDiffuseSpecularMapMaterialPrivate::QNormalDiffuseSpecularMapMaterialPriva m_diffuseTexture->setMaximumAnisotropy(16.0f); m_normalTexture->setMagnificationFilter(QAbstractTexture::Linear); - m_normalTexture->setMinificationFilter(QAbstractTexture::Linear); + m_normalTexture->setMinificationFilter(QAbstractTexture::LinearMipMapLinear); m_normalTexture->setWrapMode(QTextureWrapMode(QTextureWrapMode::Repeat)); + m_normalTexture->setGenerateMipMaps(true); m_normalTexture->setMaximumAnisotropy(16.0f); m_specularTexture->setMagnificationFilter(QAbstractTexture::Linear); |