Changeset d8cf709 in opengl-game for game-gui.hpp

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.hpp (modified) (6 diffs)

game-gui.hpp

@@ -8 +8 @@
    #include <vulkan/vulkan.h>
 #endif
+
+// These are included here so I can implement the RawEvent union, which requires knowledge
+// of the ui event types of all ui libraries I might use for any of the GameGui clases
+// GLFW does not have its own event type though, so SDL is currently the only library this is done for
+#include <SDL2/SDL.h>
 
 using namespace std;
@@ -25 +30 @@
 };
 
-struct WindowEvent {
-   EventType type;
+union RawEvent {
+   SDL_Event sdl;
 };
 
@@ -45 +50 @@
 };
 
+struct WindowEvent {
+   EventType type;
+};
+
 struct WindowResizeEvent {
    EventType type;
@@ -53 +62 @@
 struct UnknownEvent {
    EventType type;
-   unsigned int eventType;
 };
 
 // TODO: Switch from union to std::variant
 
-union UIEvent {
+union GameEvent {
    EventType type;
    WindowEvent window;
@@ -65 +73 @@
    WindowResizeEvent windowResize;
    UnknownEvent unknown;
+};
+
+struct UIEvent {
+   RawEvent rawEvent;
+   GameEvent event;
 };
 
@@ -80 +93 @@
 
       virtual void processEvents() = 0;
-      virtual int pollEvent(UIEvent* event) = 0;
+      virtual int pollEvent(UIEvent* uiEvent) = 0;
       virtual bool keyPressed(unsigned int key) = 0;