Made callbacks library global.

This commit is contained in:
Camilla Berglund
2010-10-24 18:28:55 +02:00
parent c5892fee53
commit 4044c2da66
23 changed files with 143 additions and 139 deletions
+1 -1
View File
@@ -585,7 +585,7 @@ int main( void )
exit( EXIT_FAILURE );
}
glfwSetWindowSizeCallback( window, reshape );
glfwSetWindowSizeCallback( reshape );
glfwEnable( window, GLFW_STICKY_KEYS );
glfwSwapInterval( 1 );
glfwSetTime( 0.0 );
+2 -2
View File
@@ -346,8 +346,8 @@ int main(int argc, char *argv[])
init(argc, argv);
// Set callback functions
glfwSetWindowSizeCallback( window, reshape );
glfwSetKeyCallback( window, key );
glfwSetWindowSizeCallback( reshape );
glfwSetKeyCallback( key );
// Main loop
while( running )
+2 -2
View File
@@ -597,8 +597,8 @@ int main(int argc, char** argv)
free(fragment_shader_src);
exit(EXIT_FAILURE);
}
glfwSetWindowCloseCallback(window, window_close_callback);
glfwSetKeyCallback(window, key_callback);
glfwSetWindowCloseCallback(window_close_callback);
glfwSetKeyCallback(key_callback);
/* Register events callback */
if (GL_TRUE != init_opengl())
+4 -4
View File
@@ -468,10 +468,10 @@ int main(void)
glfwEnable(window, GLFW_MOUSE_CURSOR);
// Set callback functions
glfwSetWindowSizeCallback(window, windowSizeFun);
glfwSetWindowRefreshCallback(window, windowRefreshFun);
glfwSetMousePosCallback(window, mousePosFun);
glfwSetMouseButtonCallback(window, mouseButtonFun);
glfwSetWindowSizeCallback(windowSizeFun);
glfwSetWindowRefreshCallback(windowRefreshFun);
glfwSetMousePosCallback(mousePosFun);
glfwSetMouseButtonCallback(mouseButtonFun);
// Main loop
do
+2 -2
View File
@@ -339,11 +339,11 @@ int main(int argc, char* argv[])
glfwSwapInterval(1);
// Keyboard handler
glfwSetKeyCallback(window, key_callback);
glfwSetKeyCallback(key_callback);
glfwEnable(window, GLFW_KEY_REPEAT);
// Window resize handler
glfwSetWindowSizeCallback(window, window_resize_callback);
glfwSetWindowSizeCallback(window_resize_callback);
// Initialize OpenGL
init_opengl();