Changeset 1abebc1 in opengl-game for vulkan-game.hpp

Timestamp:

May 19, 2021, 4:49:43 PM (4 years ago)

Author:

Dmitry Portnoy <dportnoy@…>

Branches:

feature/imgui-sdl

Children:

c163d81

Parents:

a3cefaa

Message:

Remove the storageBuffers parameter from addObject() since it is no longer used, rename StorageBufferSet, resizeStorageBufferSet(), and updateStorageuffer() to BufferSet, resizeBufferSet(), and updateBufferSet() respectively, and change updateObject() to just take a SceneObject reference.

File:

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

vulkan-game.hpp

@@ -103 +103 @@
 // has a VkBuffer, VkDeviceMemory, and VkDescriptorBufferInfo
 // TODO: Maybe change the structure here since VkDescriptorBufferInfo already stores a reference to the VkBuffer
-struct StorageBufferSet {
+struct BufferSet {
    vector<VkBuffer> buffers;
    vector<VkDeviceMemory> memory;
@@ -317 +317 @@
       GraphicsPipeline_Vulkan<ExplosionVertex> explosionPipeline;
 
-      StorageBufferSet storageBuffers_modelPipeline;
+      BufferSet storageBuffers_modelPipeline;
       VulkanBuffer<SSBO_ModelObject> objects_modelPipeline;
 
-      StorageBufferSet storageBuffers_shipPipeline;
+      BufferSet storageBuffers_shipPipeline;
       VulkanBuffer<SSBO_ModelObject> objects_shipPipeline;
 
-      StorageBufferSet storageBuffers_asteroidPipeline;
+      BufferSet storageBuffers_asteroidPipeline;
       VulkanBuffer<SSBO_Asteroid> objects_asteroidPipeline;
 
-      StorageBufferSet storageBuffers_laserPipeline;
+      BufferSet storageBuffers_laserPipeline;
       VulkanBuffer<SSBO_Laser> objects_laserPipeline;
 
-      StorageBufferSet storageBuffers_explosionPipeline;
+      BufferSet storageBuffers_explosionPipeline;
       VulkanBuffer<SSBO_Explosion> objects_explosionPipeline;
 
@@ -454 +454 @@
       // TODO: Remove the need for templating, which is only there so a GraphicsPupeline_Vulkan can be passed in
       template<class VertexType, class SSBOType>
-      void resizeStorageBufferSet(StorageBufferSet& set, VulkanBuffer<SSBOType>& buffer,
-                                  GraphicsPipeline_Vulkan<VertexType>& pipeline,
-                                  VkCommandPool commandPool, VkQueue graphicsQueue);
+      void resizeBufferSet(BufferSet& set, VulkanBuffer<SSBOType>& buffer,
+                           GraphicsPipeline_Vulkan<VertexType>& pipeline, VkCommandPool commandPool,
+                           VkQueue graphicsQueue);
 
       template<class SSBOType>
-      void updateStorageBuffer(StorageBufferSet& storageBufferSet, size_t objIndex, SSBOType& ssbo);
+      void updateBufferSet(BufferSet& set, size_t objIndex, SSBOType& ssbo);
 
       // TODO: Since addObject() returns a reference to the new object now,
@@ -467 +467 @@
                                                    GraphicsPipeline_Vulkan<VertexType>& pipeline,
                                                    const vector<VertexType>& vertices, vector<uint16_t> indices,
-                                                   SSBOType ssbo, StorageBufferSet& storageBuffers);
+                                                   SSBOType ssbo);
 
       template<class VertexType>
@@ -479 +479 @@
 
       template<class VertexType, class SSBOType>
-      void updateObject(vector<SceneObject<VertexType, SSBOType>>& objects,
-            GraphicsPipeline_Vulkan<VertexType>& pipeline, size_t index);
+      void updateObject(SceneObject<VertexType, SSBOType>& obj);
 
       template<class VertexType, class SSBOType>
@@ -522 +521 @@
 
 template<class VertexType, class SSBOType>
-void VulkanGame::resizeStorageBufferSet(StorageBufferSet& set, VulkanBuffer<SSBOType>& buffer,
-                                        GraphicsPipeline_Vulkan<VertexType>& pipeline,
-                                        VkCommandPool commandPool, VkQueue graphicsQueue) {
+void VulkanGame::resizeBufferSet(BufferSet& set, VulkanBuffer<SSBOType>& buffer,
+                                 GraphicsPipeline_Vulkan<VertexType>& pipeline, VkCommandPool commandPool,
+                                 VkQueue graphicsQueue) {
    size_t numObjects = buffer.numObjects < buffer.capacity ? buffer.numObjects : buffer.capacity;
 
@@ -563 +562 @@
 // TODO: See if it makes sense to pass in the current swapchain index instead of updating all of them
 template<class SSBOType>
-void VulkanGame::updateStorageBuffer(StorageBufferSet& storageBufferSet, size_t objIndex, SSBOType& ssbo) {
-   for (size_t i = 0; i < storageBufferSet.memory.size(); i++) {
-      VulkanUtils::copyDataToMemory(device, ssbo, storageBufferSet.memory[i], objIndex * sizeof(SSBOType));
+void VulkanGame::updateBufferSet(BufferSet& set, size_t objIndex, SSBOType& ssbo) {
+   for (size_t i = 0; i < set.memory.size(); i++) {
+      VulkanUtils::copyDataToMemory(device, ssbo, set.memory[i], objIndex * sizeof(SSBOType));
    }
 }
@@ -576 +575 @@
                                                          GraphicsPipeline_Vulkan<VertexType>& pipeline,
                                                          const vector<VertexType>& vertices, vector<uint16_t> indices,
-                                                         SSBOType ssbo, StorageBufferSet& storageBuffers) {
+                                                         SSBOType ssbo) {
    // TODO: Use the model field of ssbo to set the object's model_base
    // currently, the passed in model is useless since it gets overridden in updateObject() anyway
@@ -684 +683 @@
 // TODO: Just pass in the single object instead of a list of all of them
 template<class VertexType, class SSBOType>
-void VulkanGame::updateObject(vector<SceneObject<VertexType, SSBOType>>& objects,
-      GraphicsPipeline_Vulkan<VertexType>& pipeline, size_t index) {
-   SceneObject<VertexType, SSBOType>& obj = objects[index];
-
+void VulkanGame::updateObject(SceneObject<VertexType, SSBOType>& obj) {
    obj.ssbo.model = obj.model_transform * obj.model_base;
    obj.center = vec3(obj.ssbo.model * vec4(0.0f, 0.0f, 0.0f, 1.0f));