sid
/
NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Minor changes 

Former-commit-id: c66ee9a05270965921c48ab7b9faf3033a59ce20
This commit is contained in:
Lynix 2013-07-10 21:10:53 +02:00
parent 380b65814a
commit afbd002234
2 changed files with 9 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/Nazara/Utility/PixelFormat.hpp
View File

@ -12,8 +12,6 @@
#include <Nazara/Utility/Enums.hpp> #include <Nazara/Utility/Enums.hpp>
#include <map> #include <map>
class NzUtility;
class NzPixelFormat class NzPixelFormat
{ {
friend class NzUtility; friend class NzUtility;

27
src/Nazara/Renderer/TextureSampler.cpp
View File

@ -214,8 +214,10 @@ void NzTextureSampler::SetDefaultWrapMode(nzSamplerWrap wrapMode)
void NzTextureSampler::Apply(const NzTexture* texture) const void NzTextureSampler::Apply(const NzTexture* texture) const
{ {
// On considère que la texture est déjà active lors de l'appel à cette fonction nzImageType type = texture->GetType();
GLenum target = NzOpenGL::TextureTarget[texture->GetType()]; GLenum target = NzOpenGL::TextureTarget[type];
NzOpenGL::BindTexture(type, texture->GetOpenGLID());
if (s_useAnisotropicFilter) 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]; GLenum wrapMode = NzOpenGL::SamplerWrapMode[(m_wrapMode == nzSamplerWrap_Default) ? s_defaultWrapMode : m_wrapMode];
switch (texture->GetType()) switch (type)
{ {
// Notez l'absence de "break" ici // Notez l'absence de "break" ici
case nzImageType_3D: case nzImageType_3D:
@ -317,29 +319,18 @@ void NzTextureSampler::UpdateSamplerId() const
switch (filterMode) switch (filterMode)
{ {
case nzSamplerFilter_Bilinear: case nzSamplerFilter_Bilinear:
if (m_mipmaps) glSamplerParameteri(sampler, GL_TEXTURE_MIN_FILTER, (m_mipmaps) ? GL_LINEAR_MIPMAP_NEAREST : GL_LINEAR);
glSamplerParameteri(sampler, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_NEAREST);
else
glSamplerParameteri(sampler, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
glSamplerParameteri(sampler, GL_TEXTURE_MAG_FILTER, GL_LINEAR); glSamplerParameteri(sampler, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
break; break;
case nzSamplerFilter_Nearest: case nzSamplerFilter_Nearest:
if (m_mipmaps) glSamplerParameteri(sampler, GL_TEXTURE_MIN_FILTER, (m_mipmaps) ? GL_NEAREST_MIPMAP_NEAREST : GL_NEAREST);
glSamplerParameteri(sampler, GL_TEXTURE_MIN_FILTER, GL_NEAREST_MIPMAP_NEAREST);
else
glSamplerParameteri(sampler, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
glSamplerParameteri(sampler, GL_TEXTURE_MAG_FILTER, GL_NEAREST); glSamplerParameteri(sampler, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
break; break;
case nzSamplerFilter_Trilinear: case nzSamplerFilter_Trilinear:
if (m_mipmaps) // Équivalent au filtrage bilinéaire si les mipmaps sont absentes
glSamplerParameteri(sampler, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR); glSamplerParameteri(sampler, GL_TEXTURE_MIN_FILTER, (m_mipmaps) ? GL_LINEAR_MIPMAP_LINEAR : GL_LINEAR);
else
glSamplerParameteri(sampler, GL_TEXTURE_MIN_FILTER, GL_LINEAR); // Filtrage bilinéaire
glSamplerParameteri(sampler, GL_TEXTURE_MAG_FILTER, GL_LINEAR); glSamplerParameteri(sampler, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
break; break;