Changeset d8cb15e in opengl-game

Timestamp:

Aug 30, 2019, 7:30:53 PM (5 years ago)

Author:

Dmitry Portnoy <dmitry.portnoy@…>

Branches:

feature/imgui-sdl, master, points-test

Children:

5529ab5

Parents:

d5f2b42

Message:

Implement GetError() in game-gui-glfw and start using game-gui-glfw in opengl-game to show a window

Files:

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

game-gui-glfw.cpp

@@ -1 +1 @@
 #include "game-gui-glfw.hpp"
 
+string GameGui_GLFW::s_errorMessage;
+
+void glfw_error_callback(int error, const char* description) {
+   GameGui_GLFW::s_errorMessage = description;
+}
+
+string& GameGui_GLFW::GetError() {
+   return GameGui_GLFW::s_errorMessage;
+}
+
 bool GameGui_GLFW::Init() {
-   return glfwInit() == GLFW_TRUE ? RTWO_SUCCESS : RTWO_SUCCESS;
+   GameGui_GLFW::s_errorMessage = "No error";
+   glfwSetErrorCallback(glfw_error_callback);
+
+   return glfwInit() == GLFW_TRUE ? RTWO_SUCCESS : RTWO_ERROR;
 }
 

game-gui-glfw.hpp

@@ -12 +12 @@
 class GameGui_GLFW : public GameGui {
    public:
+      string& GetError();
+
+      static string s_errorMessage; // Has to be public so that glfw_error_callback can access it
+
       bool Init();
       void Shutdown();
@@ -29 +33 @@
 };
 
+void glfw_error_callback(int error, const char* description);
+
 #endif // _GAME_GUI_GLFW_H

makefile

@@ -25 +25 @@
         $(CC) $^ $(DEP) $(CFLAGS) -o $@
 
-openglgame: main-opengl.cpp opengl-game.cpp
+openglgame: main-opengl.cpp opengl-game.cpp game-gui-glfw.cpp
         $(CC) $^ $(DEP) $(CFLAGS) -o $@
 

opengl-game.cpp

@@ -3 +3 @@
 #include <iostream>
 
+#include "game-gui-glfw.hpp"
+
 using namespace std;
 
 OpenGLGame::OpenGLGame() {
+   gui = nullptr;
+   window = nullptr;
 }
 
@@ -12 +16 @@
 
 void OpenGLGame::run() {
-   cout << "Running like a boss!" << endl;
+   if (initWindow() == RTWO_ERROR) {
+      return;
+   }
+   initOpenGL();
+   mainLoop();
+   cleanup();
 }
+
+bool OpenGLGame::initWindow() {
+   gui = new GameGui_GLFW();
+
+   if (gui->Init() == RTWO_ERROR) {
+      cout << "UI library could not be initialized!" << endl;
+      cout << gui->GetError() << endl;
+      return RTWO_ERROR;
+   }
+   cout << "GUI init succeeded" << endl;
+
+   window = (GLFWwindow*) gui->CreateWindow("OpenGL Game", SCREEN_WIDTH, SCREEN_HEIGHT);
+   if (window == nullptr) {
+      cout << "Window could not be created!" << endl;
+      return RTWO_ERROR;
+   }
+
+   return RTWO_SUCCESS;
+}
+
+void OpenGLGame::initOpenGL() {
+}
+
+void OpenGLGame::mainLoop() {
+   while (!glfwWindowShouldClose(window)) {
+      glfwPollEvents();
+
+      glfwSwapBuffers(window);
+   }
+}
+
+void OpenGLGame::cleanup() {
+   gui->DestroyWindow();
+   gui->Shutdown();
+   delete gui;
+}

opengl-game.hpp

@@ -3 +3 @@
 
 #include "game-gui-glfw.hpp"
+
+const int SCREEN_WIDTH = 800;
+const int SCREEN_HEIGHT = 600;
 
 class OpenGLGame {
@@ -12 +15 @@
 
    private:
+      GameGui* gui;
+      GLFWwindow* window;
+
+      bool initWindow();
+      void initOpenGL();
+      void mainLoop();
+      void cleanup();
 };