Changeset d8cf709 in opengl-game for gui

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.

Location:

gui

Files:

• button.cpp (modified) (1 diff)
• button.hpp (modified) (1 diff)
• game-screen.cpp (modified) (1 diff)
• game-screen.hpp (modified) (1 diff)
• main-screen.cpp (modified) (1 diff)
• main-screen.hpp (modified) (1 diff)
• panel.cpp (modified) (1 diff)
• panel.hpp (modified) (1 diff)
• screen.cpp (modified) (1 diff)
• screen.hpp (modified) (2 diffs)
• ui-element.cpp (modified) (1 diff)
• ui-element.hpp (modified) (1 diff)

gui/button.cpp

@@ -87 +87 @@
 }
 
-void Button::handleEvent(UIEvent& e) {
+void Button::handleEvent(GameEvent& e) {
    switch(e.type) {
       case UI_EVENT_MOUSEMOTION:

gui/button.hpp

@@ -21 +21 @@
    void init() override;
    void render(int x, int y) override;
-   void handleEvent(UIEvent& e) override;
+   void handleEvent(GameEvent& e) override;
 
 private:

gui/game-screen.cpp

@@ -49 +49 @@
 }
 
-void GameScreen::handleEvent(UIEvent& e) {
+void GameScreen::handleEvent(GameEvent& e) {
    Screen::handleEvent(e);
 }

gui/game-screen.hpp

@@ -13 +13 @@
       void createRenderCommands(VkCommandBuffer& commandBuffer, uint32_t currentImage) override;
 
-      void handleEvent(UIEvent& e) override;
+      void handleEvent(GameEvent& e) override;
 };
 

gui/main-screen.cpp

@@ -21 +21 @@
 }
 
-void MainScreen::handleEvent(UIEvent& e) {
+void MainScreen::handleEvent(GameEvent& e) {
    Screen::handleEvent(e);
 }

gui/main-screen.hpp

@@ -13 +13 @@
       void createRenderCommands(VkCommandBuffer& commandBuffer, uint32_t currentImage) override;
 
-      void handleEvent(UIEvent& e) override;
+      void handleEvent(GameEvent& e) override;
 };
 

gui/panel.cpp

@@ -72 +72 @@
 }
 
-void Panel::handleEvent(UIEvent& e) {
+void Panel::handleEvent(GameEvent& e) {
    for (UIElement*& uiElement : this->uiElements) {
       uiElement->handleEvent(e);

gui/panel.hpp

@@ -19 +19 @@
 
    void render(int x, int y) override;
-   void handleEvent(UIEvent& e) override;
+   void handleEvent(GameEvent& e) override;
 
 private:

gui/screen.cpp

@@ -29 +29 @@
 }
 
-void Screen::handleEvent(UIEvent& e) {
+void Screen::handleEvent(GameEvent& e) {
    for (UIElement*& uiElement : this->uiElements) {
       uiElement->handleEvent(e);

gui/screen.hpp

@@ -17 +17 @@
 class VulkanGame;
 
-template<class Type>
-struct ValueReference {
-   
-};
-
 // TODO: Add a function to create an SDL_Color from a uint32_t
 
@@ -34 +29 @@
    
    virtual void renderUI();
-   virtual void handleEvent(UIEvent& e);
+   virtual void handleEvent(GameEvent& e);
    void addUIElement(UIElement* element);
 

gui/ui-element.cpp

@@ -21 +21 @@
 }
 
-void UIElement::handleEvent(UIEvent& e) {
+void UIElement::handleEvent(GameEvent& e) {
 }

gui/ui-element.hpp

@@ -18 +18 @@
    virtual void init();
    virtual void render(int x, int y) = 0;
-   virtual void handleEvent(UIEvent& e);
+   virtual void handleEvent(GameEvent& e);
 
 protected: