mirror of
https://github.com/glfw/glfw.git
synced 2026-09-23 00:59:48 +00:00
Fixed key names in the example and test programs.
This commit is contained in:
+1
-1
@@ -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";
|
||||
|
||||
+1
-1
@@ -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;
|
||||
|
||||
+7
-7
@@ -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 );
|
||||
|
||||
+1
-1
@@ -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;
|
||||
}
|
||||
|
||||
+1
-1
@@ -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)
|
||||
{
|
||||
|
||||
+2
-2
@@ -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;
|
||||
}
|
||||
|
||||
+1
-1
@@ -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);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user