Changeset a6f6833 in opengl-game for game-gui-glfw.cpp

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)

File:

• game-gui-glfw.cpp (modified) (4 diffs)

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) {