Changeset 699e83a in opengl-game

Timestamp:

Jun 10, 2020, 9:18:21 PM (4 years ago)

Author:

Dmitry Portnoy <dmitry.portnoy@…>

Branches:

feature/imgui-sdl, master

Children:

f809ae6

Parents:

e1f88a9

Message:

Add a GameScreen class to render the main gameplay

Files:

• gui/game-screen.cpp (added)
• gui/game-screen.hpp (added)
• gui/panel.cpp (added)
• gui/panel.hpp (added)
• makefile (modified) (1 diff)
• vulkan-game.cpp (modified) (4 diffs)
• vulkan-game.hpp (modified) (1 diff)

makefile

@@ -59 +59 @@
         $(CC) $(CXX_FLAGS) -o $@ $^ $(LIB_FLAGS) -DGAMEGUI_INCLUDE_VULKAN
 
-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
+GUI_SRC_FILES = gui/screen.cpp gui/main-screen.cpp gui/game-screen.cpp gui/ui-element.cpp gui/button.cpp gui/panel.cpp
+GUI_HEADER_FILES = gui/screen.hpp gui/main-screen.hpp gui/game-screen.hpp gui/ui-element.hpp gui/button.hpp gui/panel.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)

vulkan-game.cpp

@@ -10 +10 @@
 
 #include "utils.hpp"
+
+#include "gui/main-screen.hpp"
+#include "gui/game-screen.hpp"
 
 using namespace std;
@@ -46 +49 @@
    }
 
+   // TODO: Maybe make a struct of properties to share with each screen instead of passing
+   // in all of VulkanGame
    screens[SCREEN_MAIN] = new MainScreen(*renderer, *this);
+   screens[SCREEN_GAME] = new GameScreen(*renderer, *this);
 
    currentScreen = screens[SCREEN_MAIN];
@@ -1144 +1150 @@
 
    delete screens[SCREEN_MAIN];
+   delete screens[SCREEN_GAME];
 
    // TODO: Check if any of these functions accept null parameters
@@ -1620 +1627 @@
 
       vkCmdBeginRenderPass(commandBuffers[i], &renderPassInfo, VK_SUBPASS_CONTENTS_INLINE);
-
-      /*
-      modelPipeline.createRenderCommands(commandBuffers[i], i);
-      shipPipeline.createRenderCommands(commandBuffers[i], i);
-      asteroidPipeline.createRenderCommands(commandBuffers[i], i);
-      laserPipeline.createRenderCommands(commandBuffers[i], i);
-      explosionPipeline.createRenderCommands(commandBuffers[i], i);
-
-      // Always render this pipeline last
-      overlayPipeline.createRenderCommands(commandBuffers[i], i);
-      */
 
       currentScreen->createRenderCommands(commandBuffers[i], i);

vulkan-game.hpp

@@ -18 +18 @@
 
 #include "gui/screen.hpp"
-#include "gui/main-screen.hpp"
 
 using namespace glm;