Changeset 7fc5e27 in opengl-game for game-gui-glfw.cpp

Timestamp:

Sep 3, 2019, 7:07:39 PM (5 years ago)

Author:

Dmitry Portnoy <dmitry.portnoy@…>

Branches:

feature/imgui-sdl, master, points-test

Children:

b6e60b4

Parents:

1ce9afe

Message:

Change all game-gui function names to lower camel case

File:

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

game-gui-glfw.cpp

@@ -11 +11 @@
 bool GameGui_GLFW::s_keyDown[NUM_KEYS];
 
-string& GameGui_GLFW::GetError() {
+string& GameGui_GLFW::getError() {
    return GameGui_GLFW::s_errorMessage;
 }
 
-bool GameGui_GLFW::Init() {
+bool GameGui_GLFW::init() {
    GameGui_GLFW::s_errorMessage = "No error";
    glfwSetErrorCallback(glfw_error_callback);
+
+   windowWidth = -1;
+   windowHeight = -1;
 
    return glfwInit() == GLFW_TRUE ? RTWO_SUCCESS : RTWO_ERROR;
 }
 
-void GameGui_GLFW::Shutdown() {
+void GameGui_GLFW::shutdown() {
    glfwTerminate();
 }
 
-void* GameGui_GLFW::CreateWindow(const string& title, unsigned int width, unsigned int height, bool fullscreen) {
+void* GameGui_GLFW::createWindow(const string& title, int width, int height, bool fullscreen) {
    GLFWwindow* window = nullptr;
    GLFWmonitor* mon = nullptr;
@@ -49 +52 @@
       const GLFWvidmode* vmode = glfwGetVideoMode(mon);
 
-      width = vmode->width;
-      height = vmode->height;
-
-      // TODO: Should probably enable some way to retrieve this from outside this class
-      // and print it out there
-      cout << "Fullscreen resolution " << vmode->width << "x" << vmode->height << endl;
+      windowWidth = vmode->width;
+      windowHeight = vmode->height;
+   } else {
+      windowWidth = width;
+      windowHeight = height;
    }
 
-   window = glfwCreateWindow(width, height, title.c_str(), mon, nullptr);
+   window = glfwCreateWindow(windowWidth, windowHeight, title.c_str(), mon, nullptr);
    //glfwMakeContextCurrent(window);
 
@@ -68 +70 @@
 }
 
-void GameGui_GLFW::DestroyWindow() {
+void GameGui_GLFW::destroyWindow() {
    // TODO: This function can throw some errors. They should be handled
    glfwDestroyWindow(window);
@@ -75 +77 @@
 #ifdef GAMEGUI_INCLUDE_VULKAN
 
-bool GameGui_GLFW::CreateVulkanSurface(VkInstance instance, VkSurfaceKHR* surface) {
+bool GameGui_GLFW::createVulkanSurface(VkInstance instance, VkSurfaceKHR* surface) {
    return glfwCreateWindowSurface(instance, window, nullptr, surface) == VK_SUCCESS ?
       RTWO_SUCCESS : RTWO_ERROR;
@@ -82 +84 @@
 #endif
 
-vector<const char*> GameGui_GLFW::GetRequiredExtensions() {
+vector<const char*> GameGui_GLFW::getRequiredExtensions() {
    uint32_t glfwExtensionCount = 0;
    const char** glfwExtensions;
@@ -93 +95 @@
 }
 
-void GameGui_GLFW::GetWindowSize(int* width, int* height) {
-   glfwGetFramebufferSize(window, width, height);
+void GameGui_GLFW::getWindowSize(int* width, int* height) {
+   // This function segfaults on OSX, check other platforms
+   //glfwGetFramebufferSize(window, width, height);
+
+   *width = windowWidth;
+   *height = windowHeight;
 }