Changeset 40995d3 in opengl-game

Timestamp:

Oct 1, 2019, 3:14:06 AM (5 years ago)

Author:

Dmitry Portnoy <dmp1488@…>

Branches:

feature/imgui-sdl, master, points-test

Children:

4d84c72

Parents:

7563b8a (diff), a0da009 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of medievaltech.com: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);
 }
 
@@ -151 +152 @@
    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 = nullptr;
-            return 0;
+            event->type = UI_EVENT_UNKNOWN;
+            event->unknown.eventType = e.type;
             break;
          default:
-            cout << "Unknown event type: 0x" << hex << e.type << dec << endl;
-            event = nullptr;
-            return 0;
+            event->type = UI_EVENT_UNKNOWN;
+            event->unknown.eventType = 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
@@ -21 +18 @@
    UI_EVENT_MOUSEBUTTONDOWN,
    UI_EVENT_MOUSEBUTTONUP,
-   UI_EVENT_MOUSEMOTION
+   UI_EVENT_MOUSEMOTION,
+   UI_EVENT_UNKNOWN
 };
 
@@ -35 +33 @@
 struct MouseEvent {
    EventType type;
+   /*
+      int button;
+      int action;
+      int x;
+      int y;
+   */
+};
+
+struct UnknownEvent {
+   EventType type;
+   unsigned int eventType;
 };
 
@@ -42 +51 @@
    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);
@@ -343 +346 @@
          overlayImageInfo.imageView = sdlOverlayImageView;
          overlayImageInfo.sampler = textureSampler;
+
+         // SHADER-SPECIFIC STUFF STARTS HERE
 
          vector<Vertex> sceneVertices = {