diff options
| author | Clyne Sullivan <tullivan99@gmail.com> | 2016-11-27 16:28:51 -0500 |
|---|---|---|
| committer | Clyne Sullivan <tullivan99@gmail.com> | 2016-11-27 16:28:51 -0500 |
| commit | 3437e928e978939aa4c85369ab597e08f00ab93b (patch) | |
| tree | 761f06a34bd8de78440c31026cf2c96df1ccad4f /src/texture.cpp | |
| parent | 21ce3f06312a02c23d6b3c89f64f84222f54fe6d (diff) | |
world draw fix; offset fix
Diffstat (limited to 'src/texture.cpp')
| -rw-r--r-- | src/texture.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/texture.cpp b/src/texture.cpp index 3a2f071..a232e0e 100644 --- a/src/texture.cpp +++ b/src/texture.cpp @@ -46,7 +46,6 @@ namespace Texture{ GLuint loadTexture(std::string fileName) { SDL_Surface *image; - static GLuint object = 0; // check if texture is already loaded for(auto &t : LoadedTexture) { @@ -67,11 +66,13 @@ namespace Texture{ #ifdef DEBUG DEBUG_printf("Loaded image file: %s\n", fileName.c_str()); #endif // DEBUG + /* * Load texture through OpenGL. */ - //glGenTextures(1,&object); // Turns "object" into a texture - glBindTexture(GL_TEXTURE_2D,++object); // Binds "object" to the top of the stack + GLuint object; + glGenTextures(1, &object); // Turns "object" into a texture + glBindTexture(GL_TEXTURE_2D, object); // Binds "object" to the top of the stack glPixelStoref(GL_UNPACK_ALIGNMENT,1); glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); // Sets the "min" filter |