Changeset a6f6833 in opengl-game

Timestamp:

Sep 15, 2019, 5:27:13 AM (5 years ago)

Author:

Dmitry Portnoy <dmp1488@…>

Branches:

feature/imgui-sdl, master, points-test

Children:

92cbc6a

Parents:

09e15a4

Message:

Remove getWindowSize() from game-gui and instead add getWindowWidth(), getWindowHeight(), and refreshWindowSize() (which updates the internal variables returned by the first two functions)

Files:

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

game-gui-glfw.cpp

@@ -56 +56 @@
    window = glfwCreateWindow(windowWidth, windowHeight, title.c_str(), mon, nullptr);
 
+   // TODO: I should check the window size after it's created to make sure it matches the requested size
+   // glfwGetFramebufferSize(window, width, height) segfaults on OSX, check other platforms
+   // I think glfwGetWindowSize(window, width, height) works fine.
+
    glfwSetMouseButtonCallback(window, glfw_mouse_button_callback);
    glfwSetKeyCallback(window, glfw_key_callback);
@@ -89 +93 @@
 }
 
+void GameGui_GLFW::refreshWindowSize() {
+   // glfwGetFramebufferSize(window, width, height) segfaults on OSX, check other platforms
+   // I think glfwGetWindowSize(window, width, height) works fine.
+   glfwGetWindowSize(window, &windowWidth, &windowHeight);
+}
+
+int GameGui_GLFW::getWindowWidth() {
+   return windowWidth;
+}
+
+int GameGui_GLFW::getWindowHeight() {
+   return windowHeight;
+}
+
 #ifdef GAMEGUI_INCLUDE_VULKAN
 
@@ -95 +113 @@
       RTWO_SUCCESS : RTWO_ERROR;
 }
-
-#endif
 
 vector<const char*> GameGui_GLFW::getRequiredExtensions() {
@@ -109 +125 @@
 }
 
-void GameGui_GLFW::getWindowSize(int* width, int* height) {
-   // This function segfaults on OSX, check other platforms
-   //glfwGetFramebufferSize(window, width, height);
-
-   *width = windowWidth;
-   *height = windowHeight;
-}
+#endif
 
 void glfw_error_callback(int error, const char* description) {

game-gui-glfw.hpp

@@ -8 +8 @@
 #ifdef GAMEGUI_INCLUDE_VULKAN
    #define GLFW_INCLUDE_VULKAN
+#else
+   #include <GL/glew.h>
 #endif
 
@@ -30 +32 @@
       int pollEvent(UIEvent* event);
 
+      void refreshWindowSize();
+      int getWindowWidth();
+      int getWindowHeight();
+
 #ifdef GAMEGUI_INCLUDE_VULKAN
       bool createVulkanSurface(VkInstance instance, VkSurfaceKHR* surface);
+      vector<const char*> getRequiredExtensions();
 #endif
-
-      vector<const char*> getRequiredExtensions();
-      void getWindowSize(int* width, int* height);
 
    private:
       GLFWwindow* window;
-
       int windowWidth, windowHeight;
 };

game-gui-sdl.cpp

@@ -61 +61 @@
                SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED,
                width, height, flags);
+
+   refreshWindowSize();
 
    return window;
@@ -125 +127 @@
 }
 
+void GameGui_SDL::refreshWindowSize() {
+   SDL_GetWindowSize(window, &windowWidth, &windowHeight);
+}
+
+int GameGui_SDL::getWindowWidth() {
+   return windowWidth;
+}
+
+int GameGui_SDL::getWindowHeight() {
+   return windowHeight;
+}
+
 #ifdef GAMEGUI_INCLUDE_VULKAN
 
@@ -131 +145 @@
       RTWO_SUCCESS : RTWO_ERROR;
 }
-
-#endif
 
 vector<const char*> GameGui_SDL::getRequiredExtensions() {
@@ -144 +156 @@
 }
 
-void GameGui_SDL::getWindowSize(int* width, int* height) {
-   SDL_GetWindowSize(window, width, height);
-}
+#endif

game-gui-sdl.hpp

@@ -7 +7 @@
 #include <SDL2/SDL_image.h>
 #include <SDL2/SDL_ttf.h>
-#include <SDL2/SDL_vulkan.h>
+
+#ifdef GAMEGUI_INCLUDE_VULKAN
+   #include <SDL2/SDL_vulkan.h>
+#endif
 
 class GameGui_SDL : public GameGui {
@@ -22 +25 @@
       int pollEvent(UIEvent* event);
 
+      void refreshWindowSize();
+      int getWindowWidth();
+      int getWindowHeight();
+
 #ifdef GAMEGUI_INCLUDE_VULKAN
       bool createVulkanSurface(VkInstance instance, VkSurfaceKHR* surface);
+      vector<const char*> getRequiredExtensions();
 #endif
-
-      vector<const char*> getRequiredExtensions();
-      void getWindowSize(int* width, int* height);
 
    private:
       SDL_Window* window;
+      int windowWidth, windowHeight;
 
       static string s_errorMessage;

game-gui.hpp

@@ -67 +67 @@
       virtual int pollEvent(UIEvent* event) = 0;
 
-      /*
-      virtual void processEvents() = 0;
-
-      virtual int pollMouseEvent(MouseEvent* event) = 0;
-
-      virtual unsigned char getKeyEvent(unsigned int key) = 0;
-      virtual bool isKeyPressed(unsigned int key) = 0;
-      */
+      virtual void refreshWindowSize() = 0;
+      virtual int getWindowWidth() = 0;
+      virtual int getWindowHeight() = 0;
 
 #ifdef GAMEGUI_INCLUDE_VULKAN
       virtual bool createVulkanSurface(VkInstance instance, VkSurfaceKHR* surface) = 0;
+      virtual vector<const char*> getRequiredExtensions() = 0;
 #endif
-
-      virtual vector<const char*> getRequiredExtensions() = 0;
-      virtual void getWindowSize(int* width, int* height) = 0;
 };
 

opengl-game.cpp

@@ -66 +66 @@
    }
 
-   int actualWidth=0, actualHeight=0;
-   gui->getWindowSize(&actualWidth, &actualHeight);
-
    cout << "Target window size: (" << width << ", " << height << ")" << endl;
-   cout << "Actual window size: (" << actualWidth << ", " << actualHeight << ")" << endl;
+   cout << "Actual window size: (" << gui->getWindowWidth() << ", " << gui->getWindowHeight() << ")" << endl;
 
    return RTWO_SUCCESS;

vulkan-game.cpp

@@ -78 +78 @@
    }
 
-   int actualWidth, actualHeight;
-   gui->getWindowSize(&actualWidth, &actualHeight);
-
    cout << "Target window size: (" << width << ", " << height << ")" << endl;
-   cout << "Actual window size: (" << actualWidth << ", " << actualHeight << ")" << endl;
+   cout << "Actual window size: (" << gui->getWindowWidth() << ", " << gui->getWindowHeight() << ")" << endl;
 
    return RTWO_SUCCESS;