Changeset 4e705d6 in opengl-game for vulkan-game.cpp

Timestamp:

Jun 9, 2020, 2:14:06 PM (4 years ago)

Author:

Dmitry Portnoy <dmitry.portnoy@…>

Branches:

feature/imgui-sdl, master

Children:

e1f88a9

Parents:

b8d4456

Message:

Rename initWindow to initUI and move code for initializing the UI overlay into it

File:

• vulkan-game.cpp (modified) (8 diffs)

vulkan-game.cpp

@@ -42 +42 @@
    cout << "Vulkan Game" << endl;
 
-   // This gets the runtime version, use SDL_VERSION() for the comppile-time version
+   if (initUI(width, height, guiFlags) == RTWO_ERROR) {
+      return;
+   }
+
+   initVulkan();
+   mainLoop();
+   cleanup();
+
+   close_log();
+}
+
+bool VulkanGame::initUI(int width, int height, unsigned char guiFlags) {
    // TODO: Create a game-gui function to get the gui version and retrieve it that way
-   SDL_GetVersion(&sdlVersion);
+
+   SDL_VERSION(&sdlVersion); // This gets the compile-time version
+   SDL_GetVersion(&sdlVersion); // This gets the runtime version
+
+   cout << "SDL "<<
+      to_string(sdlVersion.major) << "." <<
+      to_string(sdlVersion.minor) << "." <<
+      to_string(sdlVersion.patch) << endl;
 
    // TODO: Refactor the logger api to be more flexible,
@@ -54 +72 @@
       to_string(sdlVersion.patch).c_str());
 
+   // TODO: Use open_Log() and related functions instead of gl_log ones
    open_log();
    get_log() << "starting SDL" << endl;
@@ -61 +80 @@
       (int)sdlVersion.patch << endl;
 
-   if (initWindow(width, height, guiFlags) == RTWO_ERROR) {
-      return;
-   }
-
-   initVulkan();
-   mainLoop();
-   cleanup();
-
-   close_log();
-}
-
-// TODO: Make some more init functions, or call this initUI if the
-// amount of things initialized here keeps growing
-bool VulkanGame::initWindow(int width, int height, unsigned char guiFlags) {
    // TODO: Put all fonts, textures, and images in the assets folder
    gui = new GameGui_SDL();
@@ -102 +107 @@
    }
 
-   SDL_VERSION(&sdlVersion);
-
-   cout << "SDL "<<
-      to_string(sdlVersion.major) << "." <<
-      to_string(sdlVersion.minor) << "." <<
-      to_string(sdlVersion.patch) << endl;
+   uiOverlay = SDL_CreateTexture(renderer, SDL_PIXELFORMAT_RGBA8888, SDL_TEXTUREACCESS_TARGET,
+      gui->getWindowWidth(), gui->getWindowHeight());
+
+   if (uiOverlay == nullptr) {
+      cout << "Unable to create blank texture! SDL Error: " << SDL_GetError() << endl;
+      return RTWO_ERROR;
+   }
+   if (SDL_SetTextureBlendMode(uiOverlay, SDL_BLENDMODE_BLEND) != 0) {
+      cout << "Unable to set texture blend mode! SDL Error: " << SDL_GetError() << endl;
+      return RTWO_ERROR;
+   }
+
+   SDL_SetRenderTarget(renderer, uiOverlay);
 
    font = TTF_OpenFont("assets/fonts/lazy.ttf", 28);
@@ -145 +157 @@
 
    SDL_FreeSurface(imageSDLSurface);
-
-   // In SDL 2.0.10 (currently, the latest), SDL_TEXTUREACCESS_TARGET is required to get a transparent overlay working
-   // However, the latest SDL version available through homebrew on Mac is 2.0.9, which requires SDL_TEXTUREACCESS_STREAMING
-   // I tried building sdl 2.0.10 (and sdl_image and sdl_ttf) from source on Mac, but had some issues, so this is easier
-   // until the homebrew recipe is updated
-   if (sdlVersion.major == 2 && sdlVersion.minor == 0 && sdlVersion.patch == 9) {
-      uiOverlay = SDL_CreateTexture(renderer, SDL_PIXELFORMAT_RGBA8888, SDL_TEXTUREACCESS_STREAMING,
-         gui->getWindowWidth(), gui->getWindowHeight());
-   } else {
-      uiOverlay = SDL_CreateTexture(renderer, SDL_PIXELFORMAT_RGBA8888, SDL_TEXTUREACCESS_TARGET,
-         gui->getWindowWidth(), gui->getWindowHeight());
-   }
-
-   if (uiOverlay == nullptr) {
-      cout << "Unable to create blank texture! SDL Error: " << SDL_GetError() << endl;
-      return RTWO_ERROR;
-   }
-   if (SDL_SetTextureBlendMode(uiOverlay, SDL_BLENDMODE_BLEND) != 0) {
-      cout << "Unable to set texture blend mode! SDL Error: " << SDL_GetError() << endl;
-      return RTWO_ERROR;
-   }
-
-   SDL_SetRenderTarget(renderer, uiOverlay);
 
    return RTWO_SUCCESS;
@@ -755 +744 @@
                break;
             case UI_EVENT_MOUSEBUTTONDOWN:
-               cout << "Mouse button down event detected" << endl;
-               break;
             case UI_EVENT_MOUSEBUTTONUP:
-               cout << "Mouse button up event detected" << endl;
-               break;
             case UI_EVENT_MOUSEMOTION:
                break;
             case UI_EVENT_UNKNOWN:
-               cout << "Unknown event type: 0x" << hex << e.unknown.eventType << dec << endl;
+               //cout << "Unknown event type: 0x" << hex << e.unknown.eventType << dec << endl;
                break;
             default:
@@ -1030 +1015 @@
    uint32_t imageIndex;
 
+   // TODO: Recreate the swap chain here if the user went to a new screen
+
    VkResult result = vkAcquireNextImageKHR(device, swapChain, numeric_limits<uint64_t>::max(),
       imageAvailableSemaphores[currentFrame], VK_NULL_HANDLE, &imageIndex);
@@ -1127 +1114 @@
    // If they do, I don't need to check for that
 
+   if (fontSDLTexture != nullptr) {
+      SDL_DestroyTexture(fontSDLTexture);
+      fontSDLTexture = nullptr;
+   }
+
+   if (imageSDLTexture != nullptr) {
+      SDL_DestroyTexture(imageSDLTexture);
+      imageSDLTexture = nullptr;
+   }
+
+   TTF_CloseFont(font);
+   font = nullptr;
+
    if (uiOverlay != nullptr) {
       SDL_DestroyTexture(uiOverlay);
       uiOverlay = nullptr;
    }
-
-   if (fontSDLTexture != nullptr) {
-      SDL_DestroyTexture(fontSDLTexture);
-      fontSDLTexture = nullptr;
-   }
-
-   if (imageSDLTexture != nullptr) {
-      SDL_DestroyTexture(imageSDLTexture);
-      imageSDLTexture = nullptr;
-   }
-
-   TTF_CloseFont(font);
-   font = nullptr;
 
    SDL_DestroyRenderer(renderer);