diff options
| author | Nguyễn Gia Phong <mcsinyx@disroot.org> | 2021-06-21 18:11:55 +0700 |
|---|---|---|
| committer | Nguyễn Gia Phong <mcsinyx@disroot.org> | 2021-06-21 21:31:11 +0700 |
| commit | 325dca9f212f9fd44cd10a8180529970c7a08c72 (patch) | |
| tree | e1cfaec078dfa49f4d51d05eef8a5b0967843a41 /src/Textures.cpp | |
| parent | 10f5376de856ecead4e8bbf66f19157f36f7a382 (diff) | |
| download | blackshades-1.2.0.tar.gz | |
Remove trailing whitespaces and duplicated blank lines 1.2.0
Diffstat (limited to 'src/Textures.cpp')
| -rw-r--r-- | src/Textures.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/Textures.cpp b/src/Textures.cpp index 0f829dc..dbd3674 100644 --- a/src/Textures.cpp +++ b/src/Textures.cpp @@ -48,7 +48,7 @@ GLuint loadTexture(const char* filename_, GLenum minFilter, GLenum magFilter, bo format = GL_BGR; }; }; - + //well, our textures are upside down. Fixing it here. Uint32 bytesPerRow = surface->format->BytesPerPixel*surface->w; char * buf = new char[bytesPerRow]; @@ -61,13 +61,12 @@ GLuint loadTexture(const char* filename_, GLenum minFilter, GLenum magFilter, bo memcpy(&p[offset2], buf, bytesPerRow); } delete[] buf; - + glTexImage2D(GL_TEXTURE_2D, 0, numColors, surface->w, surface->h, 0, format, GL_UNSIGNED_BYTE, surface->pixels); if (mipmaps) gluBuild2DMipmaps(GL_TEXTURE_2D, format, surface->w, surface->h, format, GL_UNSIGNED_BYTE, surface->pixels); } - + delete surface; return tex; } - |