Changeset d8cf709 in opengl-game for game-gui-sdl.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-sdl.cpp (modified) (4 diffs)

game-gui-sdl.cpp

@@ -79 +79 @@
 }
 
-int GameGui_SDL::pollEvent(UIEvent* event) {
+int GameGui_SDL::pollEvent(UIEvent* uiEvent) {
    SDL_Event e;
 
@@ -87 +87 @@
 
    if (SDL_PollEvent(&e)) {
+      uiEvent->rawEvent.sdl = e;
+
+      GameEvent* event = &uiEvent->event;
+
       switch(e.type) {
          case SDL_QUIT:
@@ -93 +97 @@
          case SDL_WINDOWEVENT:
             if (e.window.event == SDL_WINDOWEVENT_SIZE_CHANGED ||
-               e.window.event == SDL_WINDOWEVENT_MINIMIZED ||
-               e.window.event == SDL_WINDOWEVENT_MAXIMIZED) {
+                  e.window.event == SDL_WINDOWEVENT_MINIMIZED ||
+                  e.window.event == SDL_WINDOWEVENT_MAXIMIZED) {
                event->type = UI_EVENT_WINDOWRESIZE;
+            } else if (e.window.event == SDL_WINDOWEVENT_CLOSE &&
+                  e.window.windowID == SDL_GetWindowID(window)) {
+               event->type = UI_EVENT_QUIT;
             } else {
                event->type = UI_EVENT_WINDOW;
@@ -122 +129 @@
             event->mouse.y = e.motion.y;
          case SDL_FINGERMOTION:
+            // TODO: Get coordinates for finger events
             event->type = UI_EVENT_MOUSEMOTION;
             break;
-         // Ignore the following events
+         // The following events are not currently supported
          case SDL_AUDIODEVICEADDED:
          case SDL_AUDIODEVICEREMOVED:
          case SDL_TEXTINPUT:
          case SDL_TEXTEDITING:
+         case SDL_MOUSEWHEEL:
             event->type = UI_EVENT_UNKNOWN;
-            event->unknown.eventType = e.type;
             break;
          default:
             event->type = UI_EVENT_UNKNOWN;
-            event->unknown.eventType = 0;
       }
 
       return 1;
+   } else {
+      return 0;
    }
-
-   event = nullptr;
-   return 0;
 }