Changeset e1f88a9 in opengl-game for vulkan-game.cpp

Timestamp:

Jun 10, 2020, 2:36:24 AM (5 years ago)

Author:

Dmitry Portnoy <dmitry.portnoy@…>

Branches:

feature/imgui-sdl, master

Children:

699e83a

Parents:

4e705d6

Message:

Create a system to draw and switch between different screens, a Screen class, a MainScreen class that extends it, and some classes for UI elements that can be added to screens.

File:

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

vulkan-game.cpp

@@ -46 +46 @@
    }
 
+   screens[SCREEN_MAIN] = new MainScreen(*renderer, *this);
+
+   currentScreen = screens[SCREEN_MAIN];
+
    initVulkan();
    mainLoop();
@@ -51 +55 @@
 
    close_log();
+}
+
+void VulkanGame::goToScreen(Screen* screen) {
+   currentScreen = screen;
+   currentScreen->init();
+
+   recreateSwapChain();
+}
+
+void VulkanGame::quitGame() {
+   this->quit = true;
 }
 
@@ -121 +136 @@
    SDL_SetRenderTarget(renderer, uiOverlay);
 
+   // TODO: Print the filename of the font in the error message
+
    font = TTF_OpenFont("assets/fonts/lazy.ttf", 28);
    if (font == nullptr) {
@@ -157 +174 @@
 
    SDL_FreeSurface(imageSDLSurface);
+
+   proggyFont = TTF_OpenFont("assets/fonts/ProggyClean.ttf", 16);
+   if (proggyFont == nullptr) {
+      cout << "Failed to load proggy font! SDL_ttf Error: " << TTF_GetError() << endl;
+      return RTWO_ERROR;
+   }
 
    return RTWO_SUCCESS;
@@ -640 +663 @@
 void VulkanGame::mainLoop() {
    UIEvent e;
-   bool quit = false;
+   this->quit = false;
 
    this->startTime = high_resolution_clock::now();
@@ -647 +670 @@
    lastSpawn_asteroid = curTime;
 
-   while (!quit) {
+   while (!this->quit) {
 
       this->prevTime = curTime;
@@ -659 +682 @@
             case UI_EVENT_QUIT:
                cout << "Quit event detected" << endl;
-               quit = true;
+               this->quit = true;
                break;
             case UI_EVENT_WINDOW:
@@ -675 +698 @@
 
                if (e.key.keycode == SDL_SCANCODE_ESCAPE) {
-                  quit = true;
+                  this->quit = true;
                } else if (e.key.keycode == SDL_SCANCODE_SPACE) {
                   cout << "Adding a plane" << endl;
@@ -753 +776 @@
                cout << "Unhandled UI event: " << e.type << endl;
          }
+
+         currentScreen->handleEvent(e);
       }
 
@@ -787 +812 @@
       }
 
-      renderUI();
+      // renderUI();
+      currentScreen->renderUI();
+
+      // Copy the UI image to a vulkan texture
+      VulkanUtils::populateVulkanImageFromSDLTexture(device, physicalDevice, commandPool, uiOverlay, renderer,
+         sdlOverlayImage, graphicsQueue);
+
       renderScene();
    }
@@ -1010 +1041 @@
 }
 
+// TODO: Maybe move all/most of this to the base Screen class
 void VulkanGame::renderScene() {
    vkWaitForFences(device, 1, &inFlightFences[currentFrame], VK_TRUE, numeric_limits<uint64_t>::max());
@@ -1111 +1143 @@
    vkDestroyInstance(instance, nullptr);
 
+   delete screens[SCREEN_MAIN];
+
    // TODO: Check if any of these functions accept null parameters
    // If they do, I don't need to check for that
@@ -1126 +1160 @@
    TTF_CloseFont(font);
    font = nullptr;
+
+   if (proggyFont != nullptr) {
+      TTF_CloseFont(proggyFont);
+      proggyFont = nullptr;
+   }
 
    if (uiOverlay != nullptr) {
@@ -1582 +1621 @@
       vkCmdBeginRenderPass(commandBuffers[i], &renderPassInfo, VK_SUBPASS_CONTENTS_INLINE);
 
+      /*
       modelPipeline.createRenderCommands(commandBuffers[i], i);
       shipPipeline.createRenderCommands(commandBuffers[i], i);
@@ -1590 +1630 @@
       // Always render this pipeline last
       overlayPipeline.createRenderCommands(commandBuffers[i], i);
+      */
+
+      currentScreen->createRenderCommands(commandBuffers[i], i);
 
       vkCmdEndRenderPass(commandBuffers[i]);