Changes in / [40995d3:7563b8a] in opengl-game

Files:

• game-gui-glfw.cpp (modified) (2 diffs)
• game-gui-glfw.hpp (modified) (1 diff)
• game-gui-sdl.cpp (modified) (1 diff)
• game-gui.hpp (modified) (4 diffs)
• opengl-game.cpp (modified) (1 diff)
• vulkan-game.cpp (modified) (1 diff)
• vulkan-ref.cpp (modified) (2 diffs)

game-gui-glfw.cpp

@@ -66 +66 @@
    glfwSetMouseButtonCallback(window, glfw_mouse_button_callback);
    glfwSetKeyCallback(window, glfw_key_callback);
-   glfwSetWindowSizeCallback(window, glfw_window_size_callback);
 }
 
@@ -152 +151 @@
    GameGui_GLFW::s_events.push(e);
 }
-
-void glfw_window_size_callback(GLFWwindow* window, int width, int height) {
-   UIEvent e;
-   e.type = UI_EVENT_WINDOWRESIZE;
-
-   GameGui_GLFW::s_events.push(e);
-}

game-gui-glfw.hpp

@@ -50 +50 @@
 void glfw_mouse_button_callback(GLFWwindow* window, int button, int action, int mods);
 void glfw_key_callback(GLFWwindow* window, int key, int scancode, int action, int mods);
-void glfw_window_size_callback(GLFWwindow* window, int width, int height);
 
 #endif // _GAME_GUI_GLFW_H

game-gui-sdl.cpp

@@ -122 +122 @@
          case SDL_AUDIODEVICEREMOVED:
          case SDL_TEXTEDITING: // TODO: Research this one later
-            event->type = UI_EVENT_UNKNOWN;
-            event->unknown.eventType = e.type;
+            event = nullptr;
+            return 0;
             break;
          default:
-            event->type = UI_EVENT_UNKNOWN;
-            event->unknown.eventType = 0;
+            cout << "Unknown event type: 0x" << hex << e.type << dec << endl;
+            event = nullptr;
+            return 0;
       }
 

game-gui.hpp

@@ -4 +4 @@
 #include <string>
 #include <vector>
+
+// TODO: Remove the line below once the couts in the game-gui-* files are moved
+#include <iostream>
 
 #ifdef GAMEGUI_INCLUDE_VULKAN
@@ -18 +21 @@
    UI_EVENT_MOUSEBUTTONDOWN,
    UI_EVENT_MOUSEBUTTONUP,
-   UI_EVENT_MOUSEMOTION,
-   UI_EVENT_UNKNOWN
+   UI_EVENT_MOUSEMOTION
 };
 
@@ -33 +35 @@
 struct MouseEvent {
    EventType type;
-   /*
-      int button;
-      int action;
-      int x;
-      int y;
-   */
-};
-
-struct UnknownEvent {
-   EventType type;
-   unsigned int eventType;
 };
 
@@ -51 +42 @@
    KeyEvent key;
    MouseEvent mouse;
-   UnknownEvent unknown;
 };
+
+/*
+struct MouseEvent {
+   int button;
+   int action;
+   int x;
+   int y;
+};
+*/
 
 class GameGui {

opengl-game.cpp

@@ -125 +125 @@
                }
                break;
-            case UI_EVENT_WINDOWRESIZE:
-               cout << "Window resize event detected" << endl;
-               break;
             default:
                cout << "Unhandled UI event: " << e.type << endl;

vulkan-game.cpp

@@ -144 +144 @@
                break;
             case UI_EVENT_MOUSEMOTION:
-               break;
-            case UI_EVENT_UNKNOWN:
-               cout << "Unknown event type: 0x" << hex << e.unknown.eventType << dec << endl;
                break;
             default:

vulkan-ref.cpp

@@ -330 +330 @@
 /*** END OF REFACTORED CODE ***/
 
-         // THIS SECTION IS WHERE TEXTURES ARE CREATED, MAYBE SPLIT IT OFF INTO A SEPARATE FUNCTION
-         // MAY WANT TO CREATE A STRUCT TO HOLD SIMILAR VARIABLES< LIKE THOSE FOR A TEXTURE
-
          createImageResources("textures/texture.jpg", textureImage, textureImageMemory, textureImageView);
          createImageResourcesFromSDLTexture(uiOverlay, sdlOverlayImage, sdlOverlayImageMemory, sdlOverlayImageView);
@@ -346 +343 @@
          overlayImageInfo.imageView = sdlOverlayImageView;
          overlayImageInfo.sampler = textureSampler;
-
-         // SHADER-SPECIFIC STUFF STARTS HERE
 
          vector<Vertex> sceneVertices = {