From ffface42ec928185ef18fcd49285114469a02223 Mon Sep 17 00:00:00 2001 From: Kevin Ottens Date: Mon, 22 Aug 2016 08:47:29 +0200 Subject: 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 Reviewed-by: Sean Harmer --- src/extras/defaults/qnormaldiffusemapmaterial.cpp | 3 ++- 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); -- cgit v1.2.3