Changeset c324d6a in opengl-game for game-gui-sdl.cpp

Timestamp:

Jan 2, 2021, 4:07:45 PM (4 years ago)

Author:

Dmitry Portnoy <dportnoy@…>

Branches:

feature/imgui-sdl, master

Children:

3b7d497, ca188cc

Parents:

a2f62d7

Message:

Make some minor updates to VulkanGame

File:

• game-gui-sdl.cpp (modified) (5 diffs)

game-gui-sdl.cpp

@@ -3 +3 @@
 #include <map>
 #include <queue>
+
+#include <SDL2/SDL_ttf.h>
 
 #include "compiler.hpp"
@@ -9 +11 @@
 using namespace std;
 
-string GameGui_SDL::s_errorMessage;
-
 GameGui_SDL::GameGui_SDL() : keyState(SDL_GetKeyboardState(NULL)) {
+   window = nullptr;
 }
 
 string& GameGui_SDL::getError() {
-   GameGui_SDL::s_errorMessage = SDL_GetError();
+   s_errorMessage = SDL_GetError();
 
-   return GameGui_SDL::s_errorMessage;
+   return s_errorMessage;
 }
 
@@ -24 +25 @@
    // prevents SDL from setting up its own handlers for SIG_SEGV and stuff like that
 
-   GameGui_SDL::s_errorMessage = "No error";
+   s_errorMessage = "No error";
 
    if (SDL_Init(SDL_INIT_EVERYTHING) < 0) {
@@ -56 +57 @@
 
 #ifdef WINDOWS
-    uint32_t flags = SDL_WINDOW_VULKAN | SDL_WINDOW_SHOWN | (fullscreen ? SDL_WINDOW_FULLSCREEN_DESKTOP : SDL_WINDOW_RESIZABLE);
+   uint32_t flags = SDL_WINDOW_VULKAN | SDL_WINDOW_SHOWN | SDL_WINDOW_ALLOW_HIGHDPI |
+      (fullscreen ? SDL_WINDOW_FULLSCREEN_DESKTOP : SDL_WINDOW_RESIZABLE);
 #else
-    uint32_t flags = SDL_WINDOW_VULKAN | SDL_WINDOW_SHOWN | (fullscreen ? SDL_WINDOW_FULLSCREEN : SDL_WINDOW_RESIZABLE);
+   uint32_t flags = SDL_WINDOW_VULKAN | SDL_WINDOW_SHOWN | SDL_WINDOW_ALLOW_HIGHDPI |
+      (fullscreen ? SDL_WINDOW_FULLSCREEN : SDL_WINDOW_RESIZABLE);
 #endif
 
-   window = SDL_CreateWindow(title.c_str(),
-               SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED,
-               width, height, flags);
+   window = SDL_CreateWindow(title.c_str(), SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED, width, height, flags);
 
    refreshWindowSize();
@@ -148 +149 @@
 
 void GameGui_SDL::refreshWindowSize() {
+   // TODO: Make sure this works on a mac (the analogous glfw function had issues on Mac retina displays)
    SDL_GetWindowSize(window, &windowWidth, &windowHeight);
 }