mirror/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2024-11-10 00:51:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into joystickname

Browse Source
This commit is contained in:
Camilla Berglund 2012-12-02 16:45:08 +01:00
commit 42c78fbe42
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/joysticks.c
View File

@ -95,11 +95,11 @@ static void draw_joystick(Joystick* j, int x, int y, int width, int height)
} }
} }
static void draw_joysticks(void) static void draw_joysticks(GLFWwindow window)
{ {
int i, width, height; int i, width, height;
glfwGetWindowSize(glfwGetCurrentContext(), &width, &height); glfwGetWindowSize(window, &width, &height);
glMatrixMode(GL_PROJECTION); glMatrixMode(GL_PROJECTION);
glLoadIdentity(); glLoadIdentity();
@ -210,7 +210,7 @@ int main(void)
glClear(GL_COLOR_BUFFER_BIT); glClear(GL_COLOR_BUFFER_BIT);
refresh_joysticks(); refresh_joysticks();
draw_joysticks(); draw_joysticks(window);
glfwSwapBuffers(window); glfwSwapBuffers(window);
glfwPollEvents(); glfwPollEvents();