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

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.hpp (modified) (11 diffs)

vulkan-game.hpp

@@ -11 +11 @@
 #include <glm/gtc/matrix_transform.hpp>
 
+#include "vulkan-utils.hpp"
+#include "graphics-pipeline_vulkan.hpp"
+
 #include "game-gui-sdl.hpp"
-#include "graphics-pipeline_vulkan.hpp"
-
-#include "vulkan-utils.hpp"
 
 using namespace glm;
 using namespace std::chrono;
+
+// TODO: Switch from union to std::variant
 
 #ifdef NDEBUG
@@ -193 +195 @@
       void run(int width, int height, unsigned char guiFlags);
 
+      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;
+
    private:
       // TODO: Make these consts static
+      // Also, maybe move them into consts.hpp
 
       const int MAX_FRAMES_IN_FLIGHT;
@@ -207 +222 @@
       vec3 cam_pos;
 
+      // TODO: Good place to start using smart pointers
       GameGui* gui;
 
@@ -237 +253 @@
       VulkanImage depthImage;
 
-      VkSampler textureSampler;
-
-      VulkanImage sdlOverlayImage;
-      VkDescriptorImageInfo sdlOverlayImageDescriptor;
-
-      VulkanImage floorTextureImage;
-      VkDescriptorImageInfo floorTextureImageDescriptor;
-
-      VulkanImage laserTextureImage;
-      VkDescriptorImageInfo laserTextureImageDescriptor;
-
-      TTF_Font* font;
-      SDL_Texture* fontSDLTexture;
-
-      SDL_Texture* imageSDLTexture;
-
       vector<VkSemaphore> imageAvailableSemaphores;
       vector<VkSemaphore> renderFinishedSemaphores;
@@ -261 +261 @@
       bool framebufferResized;
 
+      VkSampler textureSampler;
+
+      VulkanImage sdlOverlayImage;
+      VkDescriptorImageInfo sdlOverlayImageDescriptor;
+
+      VulkanImage floorTextureImage;
+      VkDescriptorImageInfo floorTextureImageDescriptor;
+
+      VulkanImage laserTextureImage;
+      VkDescriptorImageInfo laserTextureImageDescriptor;
+
+      TTF_Font* font;
+      SDL_Texture* fontSDLTexture;
+
+      SDL_Texture* imageSDLTexture;
+
       mat4 viewMat, projMat;
-
-      GraphicsPipeline_Vulkan<OverlayVertex, void*> overlayPipeline;
-      vector<SceneObject<OverlayVertex, void*>> overlayObjects;
 
       // TODO: Maybe make the ubo objects part of the pipeline class since there's only one ubo
@@ -274 +287 @@
       // if there is a need to add other uniform variables to one or more of the shaders
 
-      GraphicsPipeline_Vulkan<ModelVertex, SSBO_ModelObject> modelPipeline;
+      vector<SceneObject<OverlayVertex, void*>> overlayObjects;
+
       vector<SceneObject<ModelVertex, SSBO_ModelObject>> modelObjects;
 
@@ -283 +297 @@
       UBO_VP_mats object_VP_mats;
 
-      GraphicsPipeline_Vulkan<ShipVertex, SSBO_ModelObject> shipPipeline;
       vector<SceneObject<ShipVertex, SSBO_ModelObject>> shipObjects;
 
@@ -292 +305 @@
       UBO_VP_mats ship_VP_mats;
 
-      GraphicsPipeline_Vulkan<AsteroidVertex, SSBO_Asteroid> asteroidPipeline;
       vector<SceneObject<AsteroidVertex, SSBO_Asteroid>> asteroidObjects;
 
@@ -301 +313 @@
       UBO_VP_mats asteroid_VP_mats;
 
-      GraphicsPipeline_Vulkan<LaserVertex, SSBO_Laser> laserPipeline;
       vector<SceneObject<LaserVertex, SSBO_Laser>> laserObjects;
 
@@ -310 +321 @@
       UBO_VP_mats laser_VP_mats;
 
-      GraphicsPipeline_Vulkan<ExplosionVertex, SSBO_Explosion> explosionPipeline;
       vector<SceneObject<ExplosionVertex, SSBO_Explosion>> explosionObjects;
 
@@ -336 +346 @@
       EffectOverTime<AsteroidVertex, SSBO_Asteroid>* rightLaserEffect = nullptr;
 
-      bool initWindow(int width, int height, unsigned char guiFlags);
+      bool initUI(int width, int height, unsigned char guiFlags);
       void initVulkan();
       void initGraphicsPipelines();