Removed calling of callbacks from setters.

This commit is contained in:
Camilla Berglund
2012-08-07 12:14:58 +02:00
parent c55f84ef3f
commit 8ed66ea4d5
7 changed files with 47 additions and 48 deletions
+9 -5
View File
@@ -330,6 +330,7 @@ static void init(int argc, char *argv[])
int main(int argc, char *argv[])
{
GLFWwindow window;
int width, height;
if( !glfwInit() )
{
@@ -337,6 +338,11 @@ int main(int argc, char *argv[])
exit( EXIT_FAILURE );
}
// Set callback functions
glfwSetWindowCloseCallback(window_close_callback);
glfwSetWindowSizeCallback( reshape );
glfwSetKeyCallback( key );
glfwWindowHint(GLFW_DEPTH_BITS, 16);
window = glfwCreateWindow( 300, 300, GLFW_WINDOWED, "Gears", NULL );
@@ -347,17 +353,15 @@ int main(int argc, char *argv[])
exit( EXIT_FAILURE );
}
glfwGetWindowSize(window, &width, &height);
reshape(window, width, height);
glfwSetInputMode( window, GLFW_KEY_REPEAT, GL_TRUE );
glfwSwapInterval( 1 );
// Parse command-line options
init(argc, argv);
// Set callback functions
glfwSetWindowCloseCallback(window_close_callback);
glfwSetWindowSizeCallback( reshape );
glfwSetKeyCallback( key );
// Main loop
while( running )
{