diff options
Diffstat (limited to 'src/Textures.cpp')
| -rw-r--r-- | src/Textures.cpp | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/Textures.cpp b/src/Textures.cpp index 9e22c87..78808a1 100644 --- a/src/Textures.cpp +++ b/src/Textures.cpp @@ -24,8 +24,7 @@ #include "Textures.h" -GLuint loadTexture(const char* filename_, GLenum minFilter, - GLenum magFilter, bool mipmaps) +GLuint loadTexture(const char* filename_) { // TODO: get rid of the :Data: thing char filename[1024]; @@ -50,8 +49,8 @@ GLuint loadTexture(const char* filename_, GLenum minFilter, glGenTextures(1, &tex); glBindTexture(GL_TEXTURE_2D, tex); glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, magFilter); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, minFilter); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); GLint internal_format; GLenum pixel_format; @@ -66,9 +65,8 @@ GLuint loadTexture(const char* filename_, GLenum minFilter, glPixelStorei(GL_UNPACK_ALIGNMENT, 1); glTexImage2D(GL_TEXTURE_2D, 0, internal_format, width, height, 0, pixel_format, GL_UNSIGNED_BYTE, data); - if (mipmaps) - gluBuild2DMipmaps(GL_TEXTURE_2D, internal_format, width, height, - pixel_format, GL_UNSIGNED_BYTE, data); + gluBuild2DMipmaps(GL_TEXTURE_2D, internal_format, width, height, + pixel_format, GL_UNSIGNED_BYTE, data); stbi_image_free(data); return tex; |