LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-19 20:19:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

Make setMode get the actual width and height after setting, fixes bug with width and height 0 (aka desktop resolution)

Browse Source
This commit is contained in:
Bart van Strien
2012-05-18 17:46:00 +02:00
parent 1e00f0f981
commit 1b568fdf39
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/graphics/opengl/Graphics.cpp
+8 -4
View File
@@ -113,7 +113,11 @@ namespace opengl
// the display mode change. // the display mode change.
Volatile::unloadAll(); Volatile::unloadAll();
currentWindow->setWindow(width, height, fullscreen, vsync, fsaa); bool success = currentWindow->setWindow(width, height, fullscreen, vsync, fsaa);
// Regardless of failure, we'll have to set up OpenGL once again.
width = currentWindow->getWidth();
height = currentWindow->getHeight();
// Okay, setup OpenGL. // Okay, setup OpenGL.
@@ -132,14 +136,14 @@ namespace opengl
glEnable(GL_TEXTURE_2D); glEnable(GL_TEXTURE_2D);
// Set the viewport to top-left corner // Set the viewport to top-left corner
glViewport(0,0, width, height); glViewport(0, 0, width, height);
// Reset the projection matrix // Reset the projection matrix
glMatrixMode(GL_PROJECTION); glMatrixMode(GL_PROJECTION);
glLoadIdentity(); glLoadIdentity();
// Set up orthographic view (no depth) // Set up orthographic view (no depth)
glOrtho(0.0, width, height,0.0, -1.0, 1.0); glOrtho(0.0, width, height, 0.0, -1.0, 1.0);
// Reset modelview matrix // Reset modelview matrix
glMatrixMode(GL_MODELVIEW); glMatrixMode(GL_MODELVIEW);
@@ -160,7 +164,7 @@ namespace opengl
glGetIntegerv(GL_MAX_MODELVIEW_STACK_DEPTH, &matrixLimit); glGetIntegerv(GL_MAX_MODELVIEW_STACK_DEPTH, &matrixLimit);
matrixLimit -= 5; matrixLimit -= 5;
return true; return success;
} }
void Graphics::getMode(int &width, int &height, bool &fullscreen, bool &vsync, int &fsaa) void Graphics::getMode(int &width, int &height, bool &fullscreen, bool &vsync, int &fsaa)