Changeset 20e4c2b in opengl-game for vulkan-game.hpp

Timestamp:

Mar 9, 2021, 2:59:40 AM (4 years ago)

Author:

Dmitry Portnoy <dportnoy@…>

Branches:

feature/imgui-sdl

Children:

187b0f5

Parents:

40eb092

Message:

In VulkanGame, use ImGui for the UI instead of using SDL to draw elements onto an overlay, and remove everything associated with the overlay pipeline

File:

• vulkan-game.hpp (modified) (12 diffs)

vulkan-game.hpp

@@ -7 +7 @@
 #include <vector>
 
+#include <vulkan/vulkan.h>
+
+#include <SDL2/SDL.h>
+#include <SDL2/SDL_ttf.h>
+
 #define GLM_FORCE_RADIANS
 #define GLM_FORCE_DEPTH_ZERO_TO_ONE // Since, in Vulkan, the depth range is 0 to 1 instead of -1 to 1
@@ -14 +19 @@
 #include <glm/gtc/matrix_transform.hpp>
 
-#include <vulkan/vulkan.h>
-
-#include <SDL2/SDL.h>
-#include <SDL2/SDL_ttf.h>
-
 #include "IMGUI/imgui_impl_vulkan.h"
 
@@ -26 +26 @@
 
 #include "game-gui-sdl.hpp"
-
-#include "gui/screen.hpp"
 
 using namespace glm;
@@ -196 +194 @@
 };
 
+enum UIValueType {
+   UIVALUE_INT,
+   UIVALUE_DOUBLE,
+};
+
+struct UIValue {
+   UIValueType type;
+   string label;
+   void* value;
+
+   UIValue(UIValueType _type, string _label, void* _value) : type(_type), label(_label), value(_value) {}
+};
+
 class VulkanGame {
    public:
@@ -203 +214 @@
       void run(int width, int height, unsigned char guiFlags);
 
-      void goToScreen(Screen* screen);
-      void quitGame();
-
-      map<ScreenType, Screen*> screens;
-      Screen* currentScreen;
-
-      TTF_Font* lazyFont;
-      TTF_Font* proggyFont;
-
-      int score;
-      float fps;
-
-      GraphicsPipeline_Vulkan<OverlayVertex, void*> overlayPipeline;
-
       GraphicsPipeline_Vulkan<ModelVertex, SSBO_ModelObject> modelPipeline;
-
       GraphicsPipeline_Vulkan<ShipVertex, SSBO_ModelObject> shipPipeline;
-
       GraphicsPipeline_Vulkan<AsteroidVertex, SSBO_Asteroid> asteroidPipeline;
-
       GraphicsPipeline_Vulkan<LaserVertex, SSBO_Laser> laserPipeline;
-
       GraphicsPipeline_Vulkan<ExplosionVertex, SSBO_Explosion> explosionPipeline;
 
@@ -250 +243 @@
       SDL_version sdlVersion;
       SDL_Window* window = nullptr;
-      SDL_Renderer* renderer = nullptr;
-
-      SDL_Texture* uiOverlay = nullptr;
 
       VkInstance instance;
@@ -299 +289 @@
       VkSampler textureSampler;
 
-      VulkanImage sdlOverlayImage;
-      VkDescriptorImageInfo sdlOverlayImageDescriptor;
-
       VulkanImage floorTextureImage;
       VkDescriptorImageInfo floorTextureImageDescriptor;
@@ -318 +305 @@
       // if there is a need to add other uniform variables to one or more of the shaders
 
-      vector<SceneObject<OverlayVertex, void*>> overlayObjects;
-
       vector<SceneObject<ModelVertex, SSBO_ModelObject>> modelObjects;
 
@@ -361 +346 @@
 
       vector<BaseEffectOverTime*> effects;
+
+      float shipSpeed = 0.5f;
+      float asteroidSpeed = 2.0f;
+
+      float spawnRate_asteroid = 0.5;
+      float lastSpawn_asteroid;
+
+      unsigned int leftLaserIdx = -1;
+      EffectOverTime<AsteroidVertex, SSBO_Asteroid>* leftLaserEffect = nullptr;
+
+      unsigned int rightLaserIdx = -1;
+      EffectOverTime<AsteroidVertex, SSBO_Asteroid>* rightLaserEffect = nullptr;
+
+      /*** High-level vars ***/
+
+      void (VulkanGame::* currentRenderScreenFn)();
+
+      map<string, vector<UIValue>> valueLists;
+
+      int score;
+      float fps;
 
       // TODO: Make a separate TImer class
@@ -369 +375 @@
       int frameCount;
 
-      float shipSpeed = 0.5f;
-      float asteroidSpeed = 2.0f;
-
-      float spawnRate_asteroid = 0.5;
-      float lastSpawn_asteroid;
-
-      unsigned int leftLaserIdx = -1;
-      EffectOverTime<AsteroidVertex, SSBO_Asteroid>* leftLaserEffect = nullptr;
-
-      unsigned int rightLaserIdx = -1;
-      EffectOverTime<AsteroidVertex, SSBO_Asteroid>* rightLaserEffect = nullptr;
+      /*** Functions ***/
 
       bool initUI(int width, int height, unsigned char guiFlags);
@@ -385 +381 @@
       void initGraphicsPipelines();
       void initMatrices();
-      void mainLoop();
+      void renderLoop();
       void updateScene();
       void cleanup();
@@ -458 +454 @@
 
       void cleanupSwapChain();
+
+      /*** High-level functions ***/
+
+      void renderMainScreen();
+      void renderGameScreen();
+
+      void initGuiValueLists(map<string, vector<UIValue>>& valueLists);
+      void renderGuiValueList(vector<UIValue>& values);
+
+      void goToScreen(void (VulkanGame::* renderScreenFn)());
+      void quitGame();
 };