Changeset 0fe8433 in opengl-game for vulkan-game.hpp

Timestamp:

Dec 24, 2019, 2:57:03 AM (5 years ago)

Author:

Dmitry Portnoy <dmp1488@…>

Branches:

feature/imgui-sdl, master, points-test

Children:

3e8cc8b

Parents:

cd1cb0f

Message:

Create an addObject() method in VulkanGame (which wraps the old addObject() method in GraphicsPipeline_Vulkan), and move the list of objects and other code to manage objects from the pipeline to the VulkanGame class

File:

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

vulkan-game.hpp

@@ -40 +40 @@
 };
 
+// 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
+template<class VertexType>
+struct SceneObject {
+   vector<VertexType> vertices;
+   vector<uint16_t> indices;
+
+   mat4 model_base;
+   mat4 model_transform;
+};
+
 struct UBO_VP_mats {
    alignas(16) mat4 view;
@@ -65 +76 @@
       vec3 cam_pos;
 
-      UBO_VP_mats object_VP_mats;
-      SBO_SceneObject so_Object;
-
-      UBO_VP_mats ship_VP_mats;
-      SBO_SceneObject so_Ship;
-
       GameGui* gui;
-
-      GraphicsPipeline_Vulkan<ModelVertex> modelPipeline;
-      GraphicsPipeline_Vulkan<OverlayVertex> overlayPipeline;
-      GraphicsPipeline_Vulkan<ShipVertex> shipPipeline;
 
       SDL_version sdlVersion;
@@ -107 +108 @@
       VkSampler textureSampler;
 
-      // TODO: I should probably rename the uniformBuffer* and storageBuffer*
-      // variables to better reflect the data they hold
-
-      vector<VkBuffer> uniformBuffers_scenePipeline;
-      vector<VkDeviceMemory> uniformBuffersMemory_scenePipeline;
-
-      vector<VkDescriptorBufferInfo> uniformBufferInfoList_scenePipeline;
-
-      vector<VkBuffer> storageBuffers_scenePipeline;
-      vector<VkDeviceMemory> storageBuffersMemory_scenePipeline;
-
-      vector<VkDescriptorBufferInfo> storageBufferInfoList_scenePipeline;
-
-      vector<VkBuffer> uniformBuffers_shipPipeline;
-      vector<VkDeviceMemory> uniformBuffersMemory_shipPipeline;
-
-      vector<VkDescriptorBufferInfo> uniformBufferInfoList_shipPipeline;
-
-      vector<VkBuffer> storageBuffers_shipPipeline;
-      vector<VkDeviceMemory> storageBuffersMemory_shipPipeline;
-
-      vector<VkDescriptorBufferInfo> storageBufferInfoList_shipPipeline;
-
       VulkanImage floorTextureImage;
       VkDescriptorImageInfo floorTextureImageDescriptor;
@@ -148 +126 @@
 
       bool framebufferResized;
+
+      // TODO: I should probably rename the uniformBuffer* and storageBuffer*
+      // variables to better reflect the data they hold
+
+      GraphicsPipeline_Vulkan<OverlayVertex> overlayPipeline;
+
+      vector<SceneObject<OverlayVertex>> overlayObjects;
+
+      // TODO: Rename all the variables related to modelPipeline to use the same pipelie name
+
+      GraphicsPipeline_Vulkan<ModelVertex> modelPipeline;
+
+      vector<SceneObject<ModelVertex>> modelObjects;
+
+      vector<VkBuffer> uniformBuffers_scenePipeline;
+      vector<VkDeviceMemory> uniformBuffersMemory_scenePipeline;
+
+      vector<VkDescriptorBufferInfo> uniformBufferInfoList_scenePipeline;
+
+      vector<VkBuffer> storageBuffers_scenePipeline;
+      vector<VkDeviceMemory> storageBuffersMemory_scenePipeline;
+
+      vector<VkDescriptorBufferInfo> storageBufferInfoList_scenePipeline;
+
+      UBO_VP_mats object_VP_mats;
+      SBO_SceneObject so_Object;
+
+      GraphicsPipeline_Vulkan<ShipVertex> shipPipeline;
+
+      vector<SceneObject<ShipVertex>> shipObjects;
+
+      vector<VkBuffer> uniformBuffers_shipPipeline;
+      vector<VkDeviceMemory> uniformBuffersMemory_shipPipeline;
+
+      vector<VkDescriptorBufferInfo> uniformBufferInfoList_shipPipeline;
+
+      vector<VkBuffer> storageBuffers_shipPipeline;
+      vector<VkDeviceMemory> storageBuffersMemory_shipPipeline;
+
+      vector<VkDescriptorBufferInfo> storageBufferInfoList_shipPipeline;
+
+      UBO_VP_mats ship_VP_mats;
+      SBO_SceneObject so_Ship;
 
       bool initWindow(int width, int height, unsigned char guiFlags);
@@ -181 +202 @@
 
       template<class VertexType>
+      void addObject(vector<SceneObject<VertexType>>& objects, GraphicsPipeline_Vulkan<VertexType>& pipeline,
+         const vector<VertexType>& vertices, vector<uint16_t> indices);
+
+      template<class VertexType>
       vector<VertexType> addVertexNormals(vector<VertexType> vertices);
 
@@ -205 +230 @@
             void* pUserData);
 };
+
+template<class VertexType>
+void VulkanGame::addObject(vector<SceneObject<VertexType>>& objects, GraphicsPipeline_Vulkan<VertexType>& pipeline,
+      const vector<VertexType>& vertices, vector<uint16_t> indices) {
+   size_t numVertices = pipeline.getNumVertices();
+
+   for (uint16_t& idx : indices) {
+      idx += numVertices;
+   }
+
+   objects.push_back({ vertices, indices, mat4(1.0f), mat4(1.0f) });
+
+   pipeline.addVertices(vertices, indices, commandPool, graphicsQueue);
+}
 
 template<class VertexType>