gesche
/
tibia-client
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix texture bug

This commit is contained in:
Eduardo Bart 2011-05-16 20:21:41 -03:00
parent 6f3eb16ab5
commit 2d3add1b36
2 changed files with 42 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/framework/graphics/texture.cpp
View File

@ -24,21 +24,31 @@
#include <prerequisites.h>
#include <graphics/texture.h>
#include "graphics.h"
Texture::Texture(int width, int height, int channels, const uchar *pixels)
Texture::Texture(int width, int height, int channels, uchar *pixels)
{
// generate opengl texture
m_textureId = internalLoadGLTexture(pixels, channels, width, height);
}
uint Texture::internalLoadGLTexture(const uchar *pixels, int channels, int width, int height)
uint Texture::internalLoadGLTexture(uchar *pixels, int channels, int width, int height)
{
GLint texSize;
glGetIntegerv(GL_MAX_TEXTURE_SIZE, &texSize);
if(width > texSize || height > texSize) {
flogError("loading texture with size %dx%d failed, the maximum size is %dx%d", width % height % texSize % texSize);
return 0;
}
// generate gl texture
GLuint id;
glGenTextures(1, &id);
glBindTexture(GL_TEXTURE_2D, id);
m_size.setSize(width, height);
bool mustFree = false;
// convert texture size to power of 2
if(!g_graphics.isExtensionSupported("GL_ARB_texture_non_power_of_two") && pixels) {
int glWidth = 1;
while(glWidth < width)
glWidth = glWidth << 1;
@ -47,20 +57,22 @@ uint Texture::internalLoadGLTexture(const uchar *pixels, int channels, int width
while(glHeight < height)
glHeight = glHeight << 1;
m_size.setSize(width, height);
m_glSize.setSize(glWidth, glHeight);
uchar *out = NULL;
if(m_size != m_glSize) {
out = new uchar[glHeight*glWidth*channels];
memset(out, 0, glHeight*glWidth*channels);
uchar *tmp = new uchar[glHeight*glWidth*channels];
memset(tmp, 0, glHeight*glWidth*channels);
if(pixels)
for(int y=0;y<height;++y)
for(int x=0;x<width;++x)
for(int i=0;i<channels;++i)
out[y*glWidth*channels+x*channels+i] = pixels[y*width*channels+x*channels+i];
tmp[y*glWidth*channels+x*channels+i] = pixels[y*width*channels+x*channels+i];
pixels = tmp;
mustFree = true;
}
m_glSize.setSize(glWidth, glHeight);
} else
m_glSize = m_size;
// detect pixels GL format
GLenum format = 0;
switch(channels) {
@ -79,7 +91,7 @@ uint Texture::internalLoadGLTexture(const uchar *pixels, int channels, int width
}
// load pixels into gl memory
glTexImage2D(GL_TEXTURE_2D, 0, channels, glWidth, glHeight, 0, format, GL_UNSIGNED_BYTE, out != NULL ? out : pixels);
glTexImage2D(GL_TEXTURE_2D, 0, channels, m_glSize.width(), m_glSize.height(), 0, format, GL_UNSIGNED_BYTE, pixels);
// disable texture border
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
@ -89,9 +101,10 @@ uint Texture::internalLoadGLTexture(const uchar *pixels, int channels, int width
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
// free
if(out)
delete[] out;
// free if needed
if(mustFree)
delete[] pixels;
return id;
}

4
src/framework/graphics/texture.h
View File

@ -31,7 +31,7 @@ class Texture : public boost::enable_shared_from_this<Texture>
{
public:
/// Create a texture, width and height must be a multiple of 2
Texture(int width, int height, int channels, const uchar *pixels = NULL);
Texture(int width, int height, int channels, uchar *pixels = NULL);
virtual ~Texture();
/// Enable texture bilinear filter (smooth scaled textures)
@ -48,7 +48,7 @@ public:
protected:
Texture() { }
uint internalLoadGLTexture(const uchar *pixels, int channels, int w, int h);
uint internalLoadGLTexture(uchar *pixels, int channels, int w, int h);
uint m_textureId;
Size m_size;