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

Added scancode to key callback.

Browse Source
This commit is contained in:
Camilla Berglund
2013-05-30 17:19:12 +02:00
parent 362bf5de64
commit 11615fcaf2
25 changed files with 125 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
examples/boing.c
View File

@@ -43,7 +43,7 @@
void init( void );
void display( void );
void reshape( GLFWwindow* window, int w, int h );
void key_callback( GLFWwindow* window, int key, int action, int mods );
void key_callback( GLFWwindow* window, int key, int scancode, int action, int mods );
void DrawBoingBall( void );
void BounceBall( double dt );
void DrawBoingBallBand( GLfloat long_lo, GLfloat long_hi );
@@ -245,7 +245,7 @@ void reshape( GLFWwindow* window, int w, int h )
0.0, -1.0, 0.0 ); /* up vector */
}
void key_callback( GLFWwindow* window, int key, int action, int mods )
void key_callback( GLFWwindow* window, int key, int scancode, int action, int mods )
{
if (key == GLFW_KEY_ESCAPE && action == GLFW_PRESS)
glfwSetWindowShouldClose(window, GL_TRUE);

2
examples/gears.c
View File

@@ -211,7 +211,7 @@ static void animate(void)
/* change view angle, exit upon ESC */
void key( GLFWwindow* window, int k, int action, int mods )
void key( GLFWwindow* window, int k, int s, int action, int mods )
{
if( action != GLFW_PRESS ) return;

2
examples/heightmap.c
View File

@@ -477,7 +477,7 @@ static void update_mesh(void)
* GLFW callback functions
*********************************************************************/
static void key_callback(GLFWwindow* window, int key, int action, int mods)
static void key_callback(GLFWwindow* window, int key, int scancode, int action, int mods)
{
switch(key)
{

2
examples/splitview.c
View File

@@ -434,7 +434,7 @@ static void mouseButtonFun(GLFWwindow* window, int button, int action, int mods)
do_redraw = 1;
}
static void key_callback(GLFWwindow* window, int key, int action, int mods)
static void key_callback(GLFWwindow* window, int key, int scancode, int action, int mods)
{
if (key == GLFW_KEY_ESCAPE && action == GLFW_PRESS)
glfwSetWindowShouldClose(window, GL_TRUE);

2
examples/wave.c
View File

@@ -270,7 +270,7 @@ static void error_callback(int error, const char* description)
// Handle key strokes
//========================================================================
void key_callback(GLFWwindow* window, int key, int action, int mods)
void key_callback(GLFWwindow* window, int key, int scancode, int action, int mods)
{
if (action != GLFW_PRESS)
return;