Mirrors/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2026-02-17 21:12:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Removed calling of callbacks from setters.

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

22
examples/wave.c
View File

@@ -355,7 +355,7 @@ void scroll_callback(GLFWwindow window, double x, double y)
// Callback function for window resize events
//========================================================================
void window_resize_callback(GLFWwindow window, int width, int height)
void window_size_callback(GLFWwindow window, int width, int height)
{
float ratio = 1.f;
@@ -391,6 +391,7 @@ int main(int argc, char* argv[])
{
GLFWwindow window;
double t, dt_total, t_old;
int width, height;
if (!glfwInit())
{
@@ -398,6 +399,13 @@ int main(int argc, char* argv[])
exit(EXIT_FAILURE);
}
glfwSetKeyCallback(key_callback);
glfwSetWindowCloseCallback(window_close_callback);
glfwSetWindowSizeCallback(window_size_callback);
glfwSetMouseButtonCallback(mouse_button_callback);
glfwSetCursorPosCallback(cursor_position_callback);
glfwSetScrollCallback(scroll_callback);
window = glfwCreateWindow(640, 480, GLFW_WINDOWED, "Wave Simulation", NULL);
if (!window)
{
@@ -405,19 +413,13 @@ int main(int argc, char* argv[])
exit(EXIT_FAILURE);
}
glfwGetWindowSize(window, &width, &height);
window_size_callback(window, width, height);
glfwSwapInterval(1);
// Keyboard handler
glfwSetKeyCallback(key_callback);
glfwSetInputMode(window, GLFW_KEY_REPEAT, GL_TRUE);
// Window resize handler
glfwSetWindowCloseCallback(window_close_callback);
glfwSetWindowSizeCallback(window_resize_callback);
glfwSetMouseButtonCallback(mouse_button_callback);
glfwSetCursorPosCallback(cursor_position_callback);
glfwSetScrollCallback(scroll_callback);
// Initialize OpenGL
init_opengl();