Changeset 1abebc1 in opengl-game for sdl-game.cpp

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:

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

sdl-game.cpp

@@ -133 +133 @@
             {{-0.5f,  0.5f,  0.0f}, {1.0f, 1.0f, 1.0f}, {0.0f, 0.0f}, {1.0f, 0.0f, 0.0f}, 0},
             {{-0.5f, -0.5f,  0.0f}, {1.0f, 0.0f, 0.0f}, {0.0f, 1.0f}, {1.0f, 0.0f, 0.0f}, 0}
-         })), {
-            0, 1, 2, 3, 4, 5
+         })),
+      {
+         0, 1, 2, 3, 4, 5
       }, {
          mat4(1.0f)
-      }, storageBuffers_modelPipeline);
+      });
 
    objects_modelPipeline.numObjects++;
@@ -158 +159 @@
       }, {
          mat4(1.0f)
-      }, storageBuffers_modelPipeline);
+      });
 
    objects_modelPipeline.numObjects++;
@@ -378 +379 @@
                               {{-0.5f,  0.5f,  0.0f}, {1.0f, 1.0f, 1.0f}, {0.0f, 0.0f}, {1.0f, 0.0f, 0.0f}, 0},
                               {{-0.5f, -0.5f,  0.0f}, {1.0f, 0.0f, 0.0f}, {0.0f, 1.0f}, {1.0f, 0.0f, 0.0f}, 0}
-                           })), {
-                              0, 1, 2, 3, 4, 5
+                           })),
+                        {
+                           0, 1, 2, 3, 4, 5
                         }, {
                            mat4(1.0f)
-                        }, storageBuffers_modelPipeline);
+                        });
 
                   objects_modelPipeline.numObjects++;
@@ -462 +464 @@
    // TODO: Probably move the resizing to the VulkanBuffer class
    if (objects_modelPipeline.numObjects > objects_modelPipeline.capacity) {
-      resizeStorageBufferSet(storageBuffers_modelPipeline, objects_modelPipeline, modelPipeline, resourceCommandPool,
-                             graphicsQueue);
+      // TODO: Also resize the dynamic ubo
+      resizeBufferSet(storageBuffers_modelPipeline, objects_modelPipeline, modelPipeline, resourceCommandPool,
+                      graphicsQueue);
    }
 
    for (size_t i = 0; i < modelObjects.size(); i++) {
       if (modelObjects[i].modified) {
-         updateObject(modelObjects, modelPipeline, i);
-         updateStorageBuffer(storageBuffers_modelPipeline, i, modelObjects[i].ssbo);
+         updateObject(modelObjects[i]);
+         updateBufferSet(storageBuffers_modelPipeline, i, modelObjects[i].ssbo);
+
       }
    }