Changeset d5f2b42 in opengl-game

Timestamp:

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

Author:

Dmitry Portnoy <dmitry.portnoy@…>

Branches:

feature/imgui-sdl, master, points-test

Children:

d8cb15e

Parents:

d02c25f

Message:

Create a generic GetError() function in game-gui that returns the last error returned by a call to some other function in game-gui

Files:

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

game-gui-sdl.cpp

@@ -1 +1 @@
 #include "game-gui-sdl.hpp"
+
+string GameGui_SDL::s_errorMessage;
+
+string& GameGui_SDL::GetError() {
+   GameGui_SDL::s_errorMessage = SDL_GetError();
+
+   return GameGui_SDL::s_errorMessage;
+}
 
 bool GameGui_SDL::Init() {
@@ -5 +13 @@
    // prevents SDL from setting up its own handlers for SIG_SEGV and stuff like that
 
-   // If this function fails, I can call SDL_GetError() for more info
-   // I should create a generic error retrieval function, similar to SDL_GetError()
+   GameGui_SDL::s_errorMessage = "No error";
 
-   // cout << "SDL could not initialize! SDL_Error: " << SDL_GetError() << endl;
-
-   // TODO: Print out contextual error messages instead of just returning
    if (SDL_Init(SDL_INIT_EVERYTHING) < 0) {
       return RTWO_ERROR;

game-gui-sdl.hpp

@@ -11 +11 @@
 class GameGui_SDL : public GameGui {
    public:
+      string& GetError();
+
       bool Init();
       void Shutdown();
@@ -26 +28 @@
    private:
       SDL_Window* window;
+
+      static string s_errorMessage;
 };
 

game-gui.hpp

@@ -18 +18 @@
       virtual ~GameGui() {};
 
+      virtual string& GetError() = 0;
+
       virtual bool Init() = 0;
       virtual void Shutdown() = 0;

vulkan-game.cpp

@@ -30 +30 @@
    if (gui->Init() == RTWO_ERROR) {
       cout << "UI library could not be initialized!" << endl;
-      cout << SDL_GetError() << endl;
+      cout << gui->GetError() << endl;
       return RTWO_ERROR;
    }