Changeset 5a23277 in opengl-game

Timestamp:

Nov 12, 2019, 6:40:39 AM (5 years ago)

Author:

Dmitry Portnoy <dmp1488@…>

Branches:

feature/imgui-sdl, master, points-test

Children:

e3bef3a

Parents:

0ae182f

Message:

Replace the key event in game-gui with distinct key up and key down events

Files:

• game-gui-glfw.cpp (modified) (1 diff)
• game-gui-sdl.cpp (modified) (1 diff)
• game-gui.hpp (modified) (1 diff)
• opengl-game.cpp (modified) (1 diff)

game-gui-glfw.cpp

@@ -147 +147 @@
 void glfw_key_callback(GLFWwindow* window, int key, int scancode, int action, int mods) {
    UIEvent e;
-   e.type = UI_EVENT_KEY;
+   e.type = action == GLFW_RELEASE ? UI_EVENT_KEYUP ? UI_EVENT_KEYDOWN;
    e.key.keycode = key;
 

game-gui-sdl.cpp

@@ -101 +101 @@
             }
             break;
+         case SDL_KEYDOWN:
+            event->type = UI_EVENT_KEYDOWN;
+            event->key.keycode = e.key.keysym.scancode;
+            break;
          case SDL_KEYUP:
-         case SDL_KEYDOWN:
-            event->type = UI_EVENT_KEY;
+            event->type = UI_EVENT_KEYUP;
             event->key.keycode = e.key.keysym.scancode;
             break;

game-gui.hpp

@@ -15 +15 @@
    UI_EVENT_WINDOW,
    UI_EVENT_WINDOWRESIZE,
-   UI_EVENT_KEY,
+   UI_EVENT_KEYDOWN,
+   UI_EVENT_KEYUP,
    UI_EVENT_MOUSEBUTTONDOWN,
    UI_EVENT_MOUSEBUTTONUP,

opengl-game.cpp

@@ -172 +172 @@
                quit = true;
                break;
-            case UI_EVENT_KEY:
+            case UI_EVENT_KEYDOWN:
                if (e.key.keycode == GLFW_KEY_ESCAPE) {
                   quit = true;