Changeset 8dcbf62 in opengl-game for sdl-game.hpp

Timestamp:

Jun 8, 2021, 11:19:16 PM (3 years ago)

Author:

Dmitry Portnoy <dportnoy@…>

Branches:

feature/imgui-sdl

Children:

6bac215

Parents:

8aa4888

git-author:

Dmitry Portnoy <dportnoy@…> (06/08/21 20:38:16)

git-committer:

Dmitry Portnoy <dportnoy@…> (06/08/21 23:19:16)

Message:

Add some functionality to VulkanBuffer, and modify VulkanGame::addObject() to call VulkanBuffer::add()

File:

• sdl-game.hpp (modified) (4 diffs)

sdl-game.hpp

@@ -311 +311 @@
                                                    GraphicsPipeline_Vulkan<VertexType>& pipeline,
                                                    const vector<VertexType>& vertices, vector<uint16_t> indices,
-                                                   SSBOType ssbo);
+                                                   VulkanBuffer<SSBOType>& objectBuffer, SSBOType ssbo);
 
       template<class VertexType>
@@ -399 +399 @@
                                                          GraphicsPipeline_Vulkan<VertexType>& pipeline,
                                                          const vector<VertexType>& vertices, vector<uint16_t> indices,
-                                                         SSBOType ssbo) {
+                                                         VulkanBuffer<SSBOType>& objectBuffer, 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
@@ -409 +409 @@
 
    objects.push_back({ vertices, indices, ssbo, mat4(1.0f), mat4(1.0f), false });
+   objectBuffer.add(ssbo);
 
    SceneObject<VertexType, SSBOType>& obj = objects.back();
@@ -415 +416 @@
    // with a boolean being passed in here, so that I don't have to rely on checking the specific object
    // type
+   // TODO: Actually, I've already defined a no-op centerObject method for explosions
+   // Maybe I should do the same for lasers and remove this conditional altogether
    if (!is_same_v<VertexType, LaserVertex> && !is_same_v<VertexType, ExplosionVertex>) {
       centerObject(obj);