mirror of
https://github.com/glfw/glfw.git
synced 2024-11-10 00:51:47 +00:00
Merge branch 'master' into joystickname
This commit is contained in:
commit
42c78fbe42
@ -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;
|
||||
|
||||
glfwGetWindowSize(glfwGetCurrentContext(), &width, &height);
|
||||
glfwGetWindowSize(window, &width, &height);
|
||||
|
||||
glMatrixMode(GL_PROJECTION);
|
||||
glLoadIdentity();
|
||||
@ -210,7 +210,7 @@ int main(void)
|
||||
glClear(GL_COLOR_BUFFER_BIT);
|
||||
|
||||
refresh_joysticks();
|
||||
draw_joysticks();
|
||||
draw_joysticks(window);
|
||||
|
||||
glfwSwapBuffers(window);
|
||||
glfwPollEvents();
|
||||
|
Loading…
Reference in New Issue
Block a user