mirror/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2024-11-25 22:14:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed key names in the example and test programs.

Browse Source
This commit is contained in:
Marcus 2011-01-03 22:22:14 +01:00
parent 3b0084799c
commit e3cb563a28
13 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/boing.c
View File

@ -608,7 +608,7 @@ int main( void )
glfwPollEvents();
/* Check if we are still running */
running = glfwIsWindow(window) && !glfwGetKey( window, GLFW_KEY_ESC );
running = glfwIsWindow(window) && !glfwGetKey( window, GLFW_KEY_ESCAPE );
}
while( running );

6
examples/gears.c
View File

@ -220,13 +220,13 @@ void key( GLFWwindow window, int k, int action )
if( action != GLFW_PRESS ) return;
switch (k) {
case 'Z':
if( glfwGetKey( window, GLFW_KEY_LSHIFT ) )
case GLFW_KEY_Z:
if( glfwGetKey( window, GLFW_KEY_LEFT_SHIFT ) )
view_rotz -= 5.0;
else
view_rotz += 5.0;
break;
case GLFW_KEY_ESC:
case GLFW_KEY_ESCAPE:
running = 0;
break;
case GLFW_KEY_UP:

2
examples/heightmap.c
View File

@ -497,7 +497,7 @@ static void key_callback(GLFWwindow window, int key, int action)
{
switch(key)
{
case GLFW_KEY_ESC:
case GLFW_KEY_ESCAPE:
/* Exit program on Escape */
running = GL_FALSE;
break;

2
examples/splitview.c
View File

@ -493,7 +493,7 @@ int main(void)
} // Check if the ESC key was pressed or the window was closed
while (glfwIsWindow(window) &&
glfwGetKey(window, GLFW_KEY_ESC) != GLFW_PRESS);
glfwGetKey(window, GLFW_KEY_ESCAPE) != GLFW_PRESS);
// Close OpenGL window and terminate GLFW
glfwTerminate();

2
examples/triangle.c
View File

@ -83,7 +83,7 @@ int main(void)
} // Check if the ESC key was pressed or the window was closed
while (glfwIsWindow(window) &&
glfwGetKey(window, GLFW_KEY_ESC) != GLFW_PRESS);
glfwGetKey(window, GLFW_KEY_ESCAPE) != GLFW_PRESS);
// Close OpenGL window and terminate GLFW
glfwTerminate();

6
examples/wave.c
View File

@ -262,7 +262,7 @@ void key_callback(GLFWwindow window, int key, int action)
switch (key)
{
case GLFW_KEY_ESC:
case GLFW_KEY_ESCAPE:
running = 0;
break;
case GLFW_KEY_SPACE:
@ -280,11 +280,11 @@ void key_callback(GLFWwindow window, int key, int action)
case GLFW_KEY_DOWN:
beta += 5;
break;
case GLFW_KEY_PAGEUP:
case GLFW_KEY_PAGE_UP:
if (zoom > 1)
zoom -= 1;
break;
case GLFW_KEY_PAGEDOWN:
case GLFW_KEY_PAGE_DOWN:
zoom += 1;
break;
default:

2
tests/events.c
View File

@ -99,7 +99,7 @@ static const char* get_key_name(int key)
case GLFW_KEY_WORLD_2: return "WORLD 2";
// Function keys
case GLFW_KEY_ESC: return "ESCAPE";
case GLFW_KEY_ESCAPE: return "ESCAPE";
case GLFW_KEY_F1: return "F1";
case GLFW_KEY_F2: return "F2";
case GLFW_KEY_F3: return "F3";

2
tests/fsfocus.c
View File

@ -49,7 +49,7 @@ static void window_key_callback(GLFWwindow window, int key, int action)
switch (key)
{
case GLFW_KEY_ESC:
case GLFW_KEY_ESCAPE:
{
printf("%0.3f: User pressed Escape\n", glfwGetTime());
running = GL_FALSE;

14
tests/gamma.c
View File

@ -51,35 +51,35 @@ static void key_callback(GLFWwindow window, int key, int action)
switch (key)
{
case GLFW_KEY_ESC:
case GLFW_KEY_ESCAPE:
glfwCloseWindow(window);
break;
case 'Q':
case GLFW_KEY_Q:
ggamma += 0.1f;
printf("Gamma: %f\n", ggamma);
glfwSetGammaFormula( ggamma, gblacklevel, ggain );
break;
case 'W':
case GLFW_KEY_W:
ggamma -= 0.1f;
printf("Gamma: %f\n", ggamma);
glfwSetGammaFormula( ggamma, gblacklevel, ggain );
break;
case 'A':
case GLFW_KEY_A:
ggain += 0.1f;
printf("Gain: %f\n", ggain);
glfwSetGammaFormula( ggamma, gblacklevel, ggain );
break;
case 'S':
case GLFW_KEY_S:
ggain -= 0.1f;
printf("Gain: %f\n", ggain);
glfwSetGammaFormula( ggamma, gblacklevel, ggain );
break;
case 'Z':
case GLFW_KEY_Z:
gblacklevel += 0.1f;
printf("Black Level: %f\n", gblacklevel);
glfwSetGammaFormula( ggamma, gblacklevel, ggain );
break;
case 'X':
case GLFW_KEY_X:
gblacklevel -= 0.1f;
printf("Black Level: %f\n", gblacklevel);
glfwSetGammaFormula( ggamma, gblacklevel, ggain );

2
tests/iconify.c
View File

@ -54,7 +54,7 @@ static void key_callback(GLFWwindow window, int key, int action)
case GLFW_KEY_SPACE:
glfwIconifyWindow(window);
break;
case GLFW_KEY_ESC:
case GLFW_KEY_ESCAPE:
glfwCloseWindow(window);
break;
}

2
tests/peter.c
View File

@ -67,7 +67,7 @@ static void key_callback(GLFWwindow window, int key, int action)
break;
}
case 'R':
case GLFW_KEY_R:
{
if (action == GLFW_PRESS)
{

4
tests/reopen.c
View File

@ -73,8 +73,8 @@ static void key_callback(GLFWwindow window, int key, int action)
switch (key)
{
case 'Q':
case GLFW_KEY_ESC:
case GLFW_KEY_Q:
case GLFW_KEY_ESCAPE:
closed = GL_TRUE;
break;
}

2
tests/sharing.c
View File

@ -37,7 +37,7 @@
static void key_callback(GLFWwindow window, int key, int action)
{
if (action == GLFW_PRESS && key == GLFW_KEY_ESC)
if (action == GLFW_PRESS && key == GLFW_KEY_ESCAPE)
glfwCloseWindow(window);
}