mirror of
https://github.com/glfw/glfw.git
synced 2026-02-17 21:12:34 +01:00
Fixed key names in the example and test programs.
This commit is contained in:
@@ -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 );
|
||||
|
||||
|
||||
@@ -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:
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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();
|
||||
|
||||
@@ -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();
|
||||
|
||||
@@ -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:
|
||||
|
||||
Reference in New Issue
Block a user