Changeset e1f88a9 in opengl-game

Timestamp:

Jun 10, 2020, 2:36:24 AM (4 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.

Files:

• assets/fonts/ProggyClean.ttf (added)
• consts.hpp (modified) (1 diff)
• game-gui.hpp (modified) (2 diffs)
• gui/button.cpp (added)
• gui/button.hpp (added)
• gui/main-screen.cpp (added)
• gui/main-screen.hpp (added)
• gui/screen.cpp (added)
• gui/screen.hpp (added)
• gui/ui-element.cpp (added)
• gui/ui-element.hpp (added)
• makefile (modified) (3 diffs)
• vulkan-game.cpp (modified) (15 diffs)
• vulkan-game.hpp (modified) (4 diffs)

consts.hpp

@@ -13 +13 @@
 constexpr unsigned char GUI_FLAGS_WINDOW_FULLSCREEN { 1 << 0 };
 
+enum ScreenType {
+   SCREEN_MAIN,
+   SCREEN_GAME
+};
+
 #endif // _RTWO_CONSTS_H

game-gui.hpp

@@ -10 +10 @@
 
 using namespace std;
+
+// TODO: See if it makes sense to combine this with the files in the gui folder
 
 enum EventType {
@@ -54 +56 @@
 };
 
+// TODO: Switch from union to std::variant
+
 union UIEvent {
    EventType type;

makefile

@@ -45 +45 @@
 endif
 
-LIBS = `pkg-config --static --libs sdl2 sdl2_image sdl2_ttf`
+LIBS = `pkg-config --static --libs sdl2 sdl2_image sdl2_ttf sdl2_gfx`
 ifeq ($(OS),Darwin)
         LIBS := $(VULKAN_SDK_PATH)/lib/libvulkan.dylib $(LIBS)
@@ -51 +51 @@
 ifeq ($(OS),Linux)
         LIBS = `pkg-config --static --libs sdl2`
-        LIBS := -lvulkan $(LIBS) -lSDL2_image -lSDL2_ttf # TODO: figure out how to statically link these, ideally using pkg-config
+        LIBS := -lvulkan $(LIBS) -lSDL2_image -lSDL2_ttf -lSDL2_gfx # TODO: figure out how to statically link these, ideally using pkg-config
 endif
 
@@ -59 +59 @@
         $(CC) $(CXX_FLAGS) -o $@ $^ $(LIB_FLAGS) -DGAMEGUI_INCLUDE_VULKAN
 
-SRC_FILES = main-vulkan.cpp vulkan-game.cpp crash-logger.cpp logger.cpp vulkan-utils.cpp utils.cpp game-gui-sdl.cpp
-HEADER_FILES = vulkan-game.hpp crash-logger.hpp logger.hpp vulkan-utils.hpp utils.hpp game-gui-sdl.hpp game-gui.hpp graphics-pipeline_vulkan.hpp
+GUI_SRC_FILES = gui/screen.cpp gui/main-screen.cpp gui/ui-element.cpp gui/button.cpp
+GUI_HEADER_FILES = gui/screen.hpp gui/main-screen.hpp gui/ui-element.hpp gui/button.hpp
+
+SRC_FILES = main-vulkan.cpp vulkan-game.cpp crash-logger.cpp logger.cpp vulkan-utils.cpp utils.cpp game-gui-sdl.cpp $(GUI_SRC_FILES)
+HEADER_FILES = vulkan-game.hpp crash-logger.hpp logger.hpp vulkan-utils.hpp utils.hpp game-gui-sdl.hpp game-gui.hpp graphics-pipeline_vulkan.hpp $(GUI_HEADER_FILES)
 
 vulkangame: $(SRC_FILES) $(HEADER_FILES)

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]);

vulkan-game.hpp

@@ -3 +3 @@
 
 #include <chrono>
+#include <map>
 
 #define GLM_FORCE_RADIANS
@@ -16 +17 @@
 #include "game-gui-sdl.hpp"
 
+#include "gui/screen.hpp"
+#include "gui/main-screen.hpp"
+
 using namespace glm;
 using namespace std::chrono;
-
-// TODO: Switch from union to std::variant
 
 #ifdef NDEBUG
@@ -195 +197 @@
       void run(int width, int height, unsigned char guiFlags);
 
+      void goToScreen(Screen* screen);
+      void quitGame();
+
+      map<ScreenType, Screen*> screens;
+      Screen* currentScreen;
+
+      TTF_Font* proggyFont;
+
       GraphicsPipeline_Vulkan<OverlayVertex, void*> overlayPipeline;
 
@@ -219 +229 @@
       const int EXPLOSION_PARTICLE_COUNT = 300;
       const vec3 LASER_COLOR = vec3(0.2f, 1.0f, 0.2f);
+
+      bool quit;
 
       vec3 cam_pos;