From afbd002234054671385d641c3216a31486e6dccb Mon Sep 17 00:00:00 2001 From: Lynix Date: Wed, 10 Jul 2013 21:10:53 +0200 Subject: [PATCH] Minor changes Former-commit-id: c66ee9a05270965921c48ab7b9faf3033a59ce20 --- include/Nazara/Utility/PixelFormat.hpp | 2 -- src/Nazara/Renderer/TextureSampler.cpp | 27 +++++++++----------------- 2 files changed, 9 insertions(+), 20 deletions(-) diff --git a/include/Nazara/Utility/PixelFormat.hpp b/include/Nazara/Utility/PixelFormat.hpp index bef7ad204..38c1f1ca5 100644 --- a/include/Nazara/Utility/PixelFormat.hpp +++ b/include/Nazara/Utility/PixelFormat.hpp @@ -12,8 +12,6 @@ #include #include -class NzUtility; - class NzPixelFormat { friend class NzUtility; diff --git a/src/Nazara/Renderer/TextureSampler.cpp b/src/Nazara/Renderer/TextureSampler.cpp index 9e1ea54b8..e548b704a 100644 --- a/src/Nazara/Renderer/TextureSampler.cpp +++ b/src/Nazara/Renderer/TextureSampler.cpp @@ -214,8 +214,10 @@ void NzTextureSampler::SetDefaultWrapMode(nzSamplerWrap wrapMode) void NzTextureSampler::Apply(const NzTexture* texture) const { - // On considère que la texture est déjà active lors de l'appel à cette fonction - GLenum target = NzOpenGL::TextureTarget[texture->GetType()]; + nzImageType type = texture->GetType(); + GLenum target = NzOpenGL::TextureTarget[type]; + + NzOpenGL::BindTexture(type, texture->GetOpenGLID()); if (s_useAnisotropicFilter) { @@ -259,7 +261,7 @@ void NzTextureSampler::Apply(const NzTexture* texture) const } GLenum wrapMode = NzOpenGL::SamplerWrapMode[(m_wrapMode == nzSamplerWrap_Default) ? s_defaultWrapMode : m_wrapMode]; - switch (texture->GetType()) + switch (type) { // Notez l'absence de "break" ici case nzImageType_3D: @@ -317,29 +319,18 @@ void NzTextureSampler::UpdateSamplerId() const switch (filterMode) { case nzSamplerFilter_Bilinear: - if (m_mipmaps) - glSamplerParameteri(sampler, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_NEAREST); - else - glSamplerParameteri(sampler, GL_TEXTURE_MIN_FILTER, GL_LINEAR); - + glSamplerParameteri(sampler, GL_TEXTURE_MIN_FILTER, (m_mipmaps) ? GL_LINEAR_MIPMAP_NEAREST : GL_LINEAR); glSamplerParameteri(sampler, GL_TEXTURE_MAG_FILTER, GL_LINEAR); break; case nzSamplerFilter_Nearest: - if (m_mipmaps) - glSamplerParameteri(sampler, GL_TEXTURE_MIN_FILTER, GL_NEAREST_MIPMAP_NEAREST); - else - glSamplerParameteri(sampler, GL_TEXTURE_MIN_FILTER, GL_NEAREST); - + glSamplerParameteri(sampler, GL_TEXTURE_MIN_FILTER, (m_mipmaps) ? GL_NEAREST_MIPMAP_NEAREST : GL_NEAREST); glSamplerParameteri(sampler, GL_TEXTURE_MAG_FILTER, GL_NEAREST); break; case nzSamplerFilter_Trilinear: - if (m_mipmaps) - glSamplerParameteri(sampler, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR); - else - glSamplerParameteri(sampler, GL_TEXTURE_MIN_FILTER, GL_LINEAR); // Filtrage bilinéaire - + // Équivalent au filtrage bilinéaire si les mipmaps sont absentes + glSamplerParameteri(sampler, GL_TEXTURE_MIN_FILTER, (m_mipmaps) ? GL_LINEAR_MIPMAP_LINEAR : GL_LINEAR); glSamplerParameteri(sampler, GL_TEXTURE_MAG_FILTER, GL_LINEAR); break;