Changeset e3bef3a in opengl-game for graphics-pipeline_vulkan.hpp

Timestamp:

Nov 12, 2019, 6:55:07 AM (5 years ago)

Author:

Dmitry Portnoy <dmp1488@…>

Branches:

feature/imgui-sdl, master, points-test

Children:

cd487fb

Parents:

5a23277

Message:

Finish the rewrite of the original vulkangame project

File:

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

graphics-pipeline_vulkan.hpp

@@ -4 +4 @@
 #include "graphics-pipeline.hpp"
 
+#include <iostream>
 #include <vector>
 
 #include <vulkan/vulkan.h>
+
+#include "vulkan-utils.hpp"
+
+using namespace std;
+
+// TODO: Remove any instances of cout and instead throw exceptions
 
 // TODO: Maybe change the name of this struct so I can call the list something other than descriptorInfoList
@@ -26 +33 @@
       void updateRenderPass(VkRenderPass renderPass);
 
-      template<class VertexType, class IndexType>
-      void bindData(const vector<VertexType>& vertices, const vector<IndexType>& indices,
+      template<class VertexType>
+      void bindData(const vector<VertexType>& vertices, const vector<uint16_t>& indices,
          VkCommandPool commandPool, VkQueue graphicsQueue);
 
@@ -48 +55 @@
 
       void createRenderCommands(VkCommandBuffer& commandBuffer, uint32_t currentImage);
+
+      template<class VertexType>
+      bool addObject(const vector<VertexType>& vertices, vector<uint16_t>& indices, VkCommandPool commandPool,
+         VkQueue graphicsQueue);
 
       void cleanup();
@@ -83 +94 @@
 };
 
-// TODO: Probably better to template the whole class and to also combine this function
-// and the constructor since I call this right after the constructor anyway
-template<class VertexType, class IndexType>
-void GraphicsPipeline_Vulkan::bindData(const vector<VertexType>& vertices, const vector<IndexType>& indices,
+// TODO: Probably better to template the whole class
+// TODO: Change the index type to uint32_t and check the Vulkan Tutorial loading model section as a reference
+
+// TODO: combine this function and the constructor since I call this right after the constructor anyway
+template<class VertexType>
+void GraphicsPipeline_Vulkan::bindData(const vector<VertexType>& vertices, const vector<uint16_t>& indices,
       VkCommandPool commandPool, VkQueue graphicsQueue) {
    numVertices = vertices.size();
@@ -94 +107 @@
    numIndices = indices.size();
    indexCapacity = numIndices * 2;
-   createIndexBuffer(indices.data(), sizeof(IndexType), commandPool, graphicsQueue);
+   createIndexBuffer(indices.data(), sizeof(uint16_t), commandPool, graphicsQueue);
+}
+
+template<class VertexType>
+bool GraphicsPipeline_Vulkan::addObject(const vector<VertexType>& vertices, vector<uint16_t>& indices,
+      VkCommandPool commandPool, VkQueue graphicsQueue) {
+   cout << "Adding object to pipeline..." << endl;
+
+   if (numVertices + vertices.size() > vertexCapacity) {
+      cout << "ERROR: Need to resize vertex buffers" << endl;
+   } else if (numIndices + indices.size() > indexCapacity) {
+      cout << "ERROR: Need to resize index buffers" << endl;
+   } else {
+      cout << "Added object to scene" << endl;
+
+      for (uint16_t& idx : indices) {
+         idx += numVertices;
+      }
+
+      VulkanUtils::copyDataToBuffer(device, physicalDevice, commandPool, vertices, vertexBuffer, numVertices,
+         graphicsQueue);
+      numVertices += vertices.size();
+
+      VulkanUtils::copyDataToBuffer(device, physicalDevice, commandPool, indices, indexBuffer, numIndices,
+         graphicsQueue);
+      numIndices += indices.size();
+
+      return true;
+   }
+
+   return false;
 }