Changeset b6e60b4 in opengl-game for opengl-game.cpp

Timestamp:

Sep 3, 2019, 7:11:36 PM (5 years ago)

Author:

Dmitry Portnoy <dmitry.portnoy@…>

Branches:

feature/imgui-sdl, master, points-test

Children:

ed7c953

Parents:

7fc5e27

Message:

In vulkangame and openglgame:

• use int instead of usigned int for width and heights paremters
• Fix a bug where GUI_FLAGS_WINDOW_FULLSCREEN was being incorrectly checked
• Print the size of a window after it has been created

File:

• opengl-game.cpp (modified) (3 diffs)

opengl-game.cpp

@@ -17 +17 @@
 }
 
-void OpenGLGame::run(unsigned int width, unsigned int height, unsigned char guiFlags) {
+void OpenGLGame::run(int width, int height, unsigned char guiFlags) {
    if (initWindow(width, height, guiFlags) == RTWO_ERROR) {
       return;
    }
+
    initOpenGL();
    mainLoop();
@@ -26 +27 @@
 }
 
-bool OpenGLGame::initWindow(unsigned int width, unsigned int height, unsigned char guiFlags) {
+bool OpenGLGame::initWindow(int width, int height, unsigned char guiFlags) {
    gui = new GameGui_GLFW();
 
-   if (gui->Init() == RTWO_ERROR) {
+   if (gui->init() == RTWO_ERROR) {
       cout << "UI library could not be initialized!" << endl;
-      cout << gui->GetError() << endl;
+      cout << gui->getError() << endl;
       return RTWO_ERROR;
    }
    cout << "GUI init succeeded" << endl;
 
-   window = (GLFWwindow*) gui->CreateWindow("OpenGL Game", width, height, guiFlags | GUI_FLAGS_WINDOW_FULLSCREEN);
+   window = (GLFWwindow*) gui->createWindow("OpenGL Game", width, height, guiFlags & GUI_FLAGS_WINDOW_FULLSCREEN);
    if (window == nullptr) {
       cout << "Window could not be created!" << endl;
       return RTWO_ERROR;
    }
+
+   int actualWidth=0, actualHeight=0;
+   gui->getWindowSize(&actualWidth, &actualHeight);
+
+   cout << "Target window size: (" << width << ", " << height << ")" << endl;
+   cout << "Actual window size: (" << actualWidth << ", " << actualHeight << ")" << endl;
 
    return RTWO_SUCCESS;
@@ -61 +68 @@
 
 void OpenGLGame::cleanup() {
-   gui->DestroyWindow();
-   gui->Shutdown();
+   gui->destroyWindow();
+   gui->shutdown();
    delete gui;
 }