Changeset d8cf709 in opengl-game for game-gui-glfw.cpp

Timestamp:

Feb 13, 2021, 11:41:39 PM (4 years ago)

Author:

Dmitry Portnoy <dportnoy@…>

Branches:

feature/imgui-sdl

Children:

c6f0793

Parents:

8b823e7

Message:

Change UIEvent to also include the original event from the UI library the game gui is currently using, such as SDL or GLFW.

File:

• game-gui-glfw.cpp (modified) (3 diffs)

game-gui-glfw.cpp

@@ -79 +79 @@
    if (glfwWindowShouldClose(window)) {
       UIEvent e;
-      e.type = UI_EVENT_QUIT;
+      e.event.type = UI_EVENT_QUIT;
 
       s_events.push(e);
@@ -147 +147 @@
 void glfw_key_callback(GLFWwindow* window, int key, int scancode, int action, int mods) {
    UIEvent e;
-   e.type = action == GLFW_RELEASE ? UI_EVENT_KEYUP : UI_EVENT_KEYDOWN;
-   e.key.keycode = key;
+   e.event.type = action == GLFW_RELEASE ? UI_EVENT_KEYUP : UI_EVENT_KEYDOWN;
+   e.event.key.keycode = key;
 
    GameGui_GLFW::s_events.push(e);
@@ -155 +155 @@
 void glfw_window_size_callback(GLFWwindow* window, int width, int height) {
    UIEvent e;
-   e.type = UI_EVENT_WINDOWRESIZE;
-   e.windowResize.width = width;
-   e.windowResize.height = height;
+   e.event.type = UI_EVENT_WINDOWRESIZE;
+   e.event.windowResize.width = width;
+   e.event.windowResize.height = height;
 
    GameGui_GLFW::s_events.push(e);