matthew/The-Powder-Toy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix openGL compiling (most likely), fixes #146

Browse Source
This commit is contained in:
jacob1 2013-07-17 18:20:50 -04:00
parent a98fb2092d
commit cc887995c0
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/PowderToySDL.cpp
View File

@ -422,6 +422,7 @@ void EngineProcess()
break; break;
#ifdef OGLI #ifdef OGLI
case SDL_VIDEORESIZE: case SDL_VIDEORESIZE:
{
float ratio = float(XRES+BARSIZE) / float(YRES+MENUSIZE); float ratio = float(XRES+BARSIZE) / float(YRES+MENUSIZE);
float width = event.resize.w; float width = event.resize.w;
float height = width/ratio; float height = width/ratio;
@ -442,6 +443,7 @@ void EngineProcess()
std::cerr << "Oh bugger" << std::endl; std::cerr << "Oh bugger" << std::endl;
} }
break; break;
}
#endif #endif
#if defined (USE_SDL) && defined(LIN) && defined(SDL_VIDEO_DRIVER_X11) #if defined (USE_SDL) && defined(LIN) && defined(SDL_VIDEO_DRIVER_X11)
case SDL_SYSWMEVENT: case SDL_SYSWMEVENT:

5
src/graphics/OpenGLDrawMethods.inl
View File

@ -414,3 +414,8 @@ void PIXELMETHODS_CLASS::draw_image(pixel *img, int x, int y, int w, int h, int
glBindTexture(GL_TEXTURE_2D, 0); glBindTexture(GL_TEXTURE_2D, 0);
glDisable(GL_TEXTURE_2D); glDisable(GL_TEXTURE_2D);
} }
void PIXELMETHODS_CLASS::draw_image(VideoBuffer * vidBuf, int x, int y, int a)
{
draw_image(vidBuf->Buffer, x, y, vidBuf->Width, vidBuf->Height, a);
}