miguel.horta/commandergenius
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed small bug in OpenGL example

Browse Source
This commit is contained in:
pelya
2012-11-11 23:08:20 +02:00
parent 0741c52be5
commit 7fe0cb067c
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
project/jni/application/test-opengl/sdl_hello.cpp
View File

@@ -21,7 +21,7 @@ struct Sprite {
Sprite(const char * path) Sprite(const char * path)
{ {
w = h = upload_w = upload_h = texture = 0; w = h = texcoord_w = texcoord_h = texture = 0;
imagePath = path; imagePath = path;
loadTexture(); loadTexture();
} }
@@ -47,8 +47,11 @@ struct Sprite {
GLenum glFormat = (pic->format->BitsPerPixel == 32 ? GL_RGBA : GL_RGB); GLenum glFormat = (pic->format->BitsPerPixel == 32 ? GL_RGBA : GL_RGB);
w = pic->w; w = pic->w;
h = pic->h; h = pic->h;
upload_w = powerOfTwo(w); // All OpenGL textures must have size which is power of 2, such as 128, 256, 512 etc
upload_h = powerOfTwo(h); int upload_w = powerOfTwo(w);
int upload_h = powerOfTwo(h);
texcoord_w = (float) w / (float) upload_w;
texcoord_h = (float) h / (float) upload_h;
glGenTextures(1, &texture); glGenTextures(1, &texture);
@@ -66,7 +69,7 @@ struct Sprite {
SDL_FreeSurface(pic); SDL_FreeSurface(pic);
return 0; return true;
} }
int powerOfTwo(int i) int powerOfTwo(int i)
@@ -82,9 +85,9 @@ struct Sprite {
return; return;
// GL coordinates start at bottom-left corner, which is counter-intuitive for sprite graphics, so we have to flip Y coordinate // GL coordinates start at bottom-left corner, which is counter-intuitive for sprite graphics, so we have to flip Y coordinate
GLfloat textureCoordinates[] = { 0.0f, 0.0f, GLfloat textureCoordinates[] = { 0.0f, 0.0f,
0.0f, 1.0f, 0.0f, texcoord_h,
1.0f, 1.0f, texcoord_w, texcoord_h,
1.0f, 0.0f }; texcoord_w, 0.0f };
GLfloat vertices[] = { x, screenHeight - y, GLfloat vertices[] = { x, screenHeight - y,
x, screenHeight - (y + height), x, screenHeight - (y + height),
x + width, screenHeight - (y + height), x + width, screenHeight - (y + height),
@@ -107,7 +110,8 @@ struct Sprite {
} }
GLuint texture; GLuint texture;
int w, h, upload_w, upload_h; int w, h;
GLfloat texcoord_w, texcoord_h; // Fix for textures with non-power-of-2 size
std::string imagePath; std::string imagePath;
}; };