Changeset 4994692 in opengl-game for vulkan-game.hpp

Timestamp:

Apr 19, 2020, 1:23:02 AM (5 years ago)

Author:

Dmitry Portnoy <dmitry.portnoy@…>

Branches:

feature/imgui-sdl, master, points-test

Children:

5ba732a

Parents:

6385d0f

Message:

Change VulkanGame::addObject() to return a reference to the newly-created object

File:

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

vulkan-game.hpp

@@ -51 +51 @@
 };
 
+struct UBO_VP_mats {
+   alignas(16) mat4 view;
+   alignas(16) mat4 proj;
+};
+
+struct SSBO_ModelObject {
+   alignas(16) mat4 model;
+};
+
+struct SSBO_Asteroid {
+   alignas(16) mat4 model;
+   alignas(4) float hp;
+   alignas(4) unsigned int deleted;
+};
+
 // TODO: Change the index type to uint32_t and check the Vulkan Tutorial loading model section as a reference
 // TODO: Create a typedef for index type so I can easily change uin16_t to something else later
+// TODO: Maybe create a typedef for each of the templated SceneObject types
 template<class VertexType, class SSBOType>
 struct SceneObject {
@@ -61 +77 @@
    mat4 model_base;
    mat4 model_transform;
+
+   // TODO: Figure out if I should make child classes that have these fields instead of putting them in the
+   // parent class
    vec3 center; // currently only matters for asteroids
    float radius; // currently only matters for asteroids
 };
 
-struct UBO_VP_mats {
-   alignas(16) mat4 view;
-   alignas(16) mat4 proj;
-};
-
-struct SSBO_ModelObject {
-   alignas(16) mat4 model;
-};
-
-struct SSBO_Asteroid {
-   alignas(16) mat4 model;
-   alignas(4) float hp;
-   alignas(4) unsigned int deleted;
-};
-
-// Have to figure out how to include an optional ssbo parameter for each object
+// TODO: Have to figure out how to include an optional ssbo parameter for each object
 // Could probably use the same approach to make indices optional
+// Figure out if there are sufficient use cases to make either of these optional or is it fine to make
+// them mamdatory
 
 class VulkanGame {
@@ -131 +137 @@
       VkSampler textureSampler;
 
+      VulkanImage sdlOverlayImage;
+      VkDescriptorImageInfo sdlOverlayImageDescriptor;
+
       VulkanImage floorTextureImage;
       VkDescriptorImageInfo floorTextureImageDescriptor;
-
-      VulkanImage sdlOverlayImage;
-      VkDescriptorImageInfo sdlOverlayImageDescriptor;
 
       TTF_Font* font;
@@ -230 +236 @@
       void createSyncObjects();
 
+      // TODO: Since addObject() returns a reference to the new object now,
+      // stop using objects.back() to access the object that was just created
       template<class VertexType, class SSBOType>
-      void addObject(vector<SceneObject<VertexType, SSBOType>>& objects,
-         GraphicsPipeline_Vulkan<VertexType, SSBOType>& pipeline,
-         const vector<VertexType>& vertices, vector<uint16_t> indices, SSBOType ssbo,
-         bool pipelinesCreated);
+      SceneObject<VertexType, SSBOType>& addObject(
+            vector<SceneObject<VertexType, SSBOType>>& objects,
+            GraphicsPipeline_Vulkan<VertexType, SSBOType>& pipeline,
+            const vector<VertexType>& vertices, vector<uint16_t> indices, SSBOType ssbo,
+            bool pipelinesCreated);
 
       template<class VertexType, class SSBOType>
       void updateObject(vector<SceneObject<VertexType, SSBOType>>& objects,
-         GraphicsPipeline_Vulkan<VertexType, SSBOType>& pipeline, size_t index);
+            GraphicsPipeline_Vulkan<VertexType, SSBOType>& pipeline, size_t index);
 
       template<class VertexType>
@@ -250 +259 @@
 
       void createBufferSet(VkDeviceSize bufferSize, VkBufferUsageFlags flags,
-         vector<VkBuffer>& buffers, vector<VkDeviceMemory>& buffersMemory, vector<VkDescriptorBufferInfo>& bufferInfoList);
+            vector<VkBuffer>& buffers, vector<VkDeviceMemory>& buffersMemory,
+            vector<VkDescriptorBufferInfo>& bufferInfoList);
 
       void recreateSwapChain();
@@ -272 +282 @@
 // to account for scaling
 template<class VertexType, class SSBOType>
-void VulkanGame::addObject(vector<SceneObject<VertexType, SSBOType>>& objects,
+SceneObject<VertexType, SSBOType>& VulkanGame::addObject(
+      vector<SceneObject<VertexType, SSBOType>>& objects,
       GraphicsPipeline_Vulkan<VertexType, SSBOType>& pipeline,
       const vector<VertexType>& vertices, vector<uint16_t> indices, SSBOType ssbo,
@@ -289 +300 @@
    centerObject(obj);
 
-   bool storageBufferResized = pipeline.addObject(obj.vertices, obj.indices, obj.ssbo, commandPool, graphicsQueue);
+   bool storageBufferResized = pipeline.addObject(obj.vertices, obj.indices, obj.ssbo,
+      this->commandPool, this->graphicsQueue);
 
    if (pipelinesCreated) {
@@ -307 +319 @@
       createCommandBuffers();
    }
+
+   return obj;
 }