Merge branch 'master' of github.com:elmindreda/glfw

This commit is contained in:
Camilla Berglund
2011-10-09 00:02:14 +02:00
5 changed files with 83 additions and 41 deletions
+1 -1
View File
@@ -62,7 +62,7 @@ static void window_size_callback(GLFWwindow window, int width, int height)
static int window_close_callback(GLFWwindow window)
{
printf("Close callback triggered\n");
window_handle = NULL;
closed = GL_TRUE;
return 0;
}
+4 -1
View File
@@ -66,7 +66,10 @@ int main(void)
glfwSetWindowPos(windows[i], 100 + (i & 1) * 300, 100 + (i >> 1) * 300);
glClearColor((GLclampf) (i & 1), (GLclampf) (i >> 1), 0.0, 0.0);
glClearColor((GLclampf) (i & 1),
(GLclampf) (i >> 1),
i ? 0.0 : 1.0,
0.0);
}
while (running)