Changeset 0fe8433 in opengl-game for graphics-pipeline_vulkan.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:

• graphics-pipeline_vulkan.hpp (modified) (7 diffs)

graphics-pipeline_vulkan.hpp

@@ -29 +29 @@
    vector<VkDescriptorBufferInfo>* bufferDataList;
    VkDescriptorImageInfo* imageData;
-};
-
-// 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;
 };
 
@@ -50 +39 @@
       ~GraphicsPipeline_Vulkan();
 
+      size_t getNumVertices();
+
       void updateRenderPass(VkRenderPass renderPass);
 
@@ -66 +57 @@
       void createRenderCommands(VkCommandBuffer& commandBuffer, uint32_t currentImage);
 
-      vector<SceneObject<VertexType>>& getObjects();
-      void addObject(const vector<VertexType>& vertices, vector<uint16_t> indices, VkCommandPool commandPool,
+      void addVertices(const vector<VertexType>& vertices, vector<uint16_t> indices, VkCommandPool commandPool,
          VkQueue graphicsQueue);
 
@@ -100 +90 @@
       VkDeviceMemory indexBufferMemory;
 
-      // TODO: The objects vector isn't used at all in this class, except in the method that returns
-      // the number of objects. Move this vector and the SceneObject declaration into VulkanGame, esp.
-      // since I'll be adding other object-specific fields such as transforms to SceneObject later
-      vector<SceneObject<VertexType>> objects;
-
       VkShaderModule createShaderModule(const vector<char>& code);
       vector<char> readFile(const string& filename);
@@ -151 +136 @@
 template<class VertexType>
 GraphicsPipeline_Vulkan<VertexType>::~GraphicsPipeline_Vulkan() {
+}
+
+template<class VertexType>
+size_t GraphicsPipeline_Vulkan<VertexType>::getNumVertices() {
+   return numVertices;
 }
 
@@ -422 +412 @@
 
 template<class VertexType>
-vector<SceneObject<VertexType>>& GraphicsPipeline_Vulkan<VertexType>::getObjects() {
-   return objects;
-}
-
-template<class VertexType>
-void GraphicsPipeline_Vulkan<VertexType>::addObject(const vector<VertexType>& vertices, vector<uint16_t> indices,
+void GraphicsPipeline_Vulkan<VertexType>::addVertices(const vector<VertexType>& vertices, vector<uint16_t> indices,
       VkCommandPool commandPool, VkQueue graphicsQueue) {
 
@@ -436 +421 @@
       resizeIndexBuffer(commandPool, graphicsQueue);
    }
-
-   for (uint16_t& idx : indices) {
-      idx += numVertices;
-   }
-   objects.push_back({ vertices, indices, mat4(1.0f), mat4(1.0f) });
 
    VulkanUtils::copyDataToBuffer(device, physicalDevice, commandPool, vertices, vertexBuffer, numVertices,