Separated window and framebuffer sizes.

This commit is contained in:
Camilla Berglund
2013-06-03 12:51:57 +02:00
parent 89588a4508
commit 3498163da1
26 changed files with 197 additions and 58 deletions
+5 -5
View File
@@ -361,10 +361,10 @@ void scroll_callback(GLFWwindow* window, double x, double y)
//========================================================================
// Callback function for window resize events
// Callback function for framebuffer resize events
//========================================================================
void window_size_callback(GLFWwindow* window, int width, int height)
void framebuffer_size_callback(GLFWwindow* window, int width, int height)
{
float ratio = 1.f;
@@ -404,7 +404,7 @@ int main(int argc, char* argv[])
}
glfwSetKeyCallback(window, key_callback);
glfwSetWindowSizeCallback(window, window_size_callback);
glfwSetFramebufferSizeCallback(window, framebuffer_size_callback);
glfwSetMouseButtonCallback(window, mouse_button_callback);
glfwSetCursorPosCallback(window, cursor_position_callback);
glfwSetScrollCallback(window, scroll_callback);
@@ -412,8 +412,8 @@ int main(int argc, char* argv[])
glfwMakeContextCurrent(window);
glfwSwapInterval(1);
glfwGetWindowSize(window, &width, &height);
window_size_callback(window, width, height);
glfwGetFramebufferSize(window, &width, &height);
framebuffer_size_callback(window, width, height);
// Initialize OpenGL
init_opengl();