Changeset b7fc3c2 in opengl-game for sdl-game.cpp

Timestamp:

Jun 10, 2021, 2:58:54 PM (4 years ago)

Author:

Dmitry Portnoy <dportnoy@…>

Branches:

feature/imgui-sdl

Children:

c1ec4f6

Parents:

bb76950

git-author:

Dmitry Portnoy <dportnoy@…> (06/10/21 14:53:52)

git-committer:

Dmitry Portnoy <dportnoy@…> (06/10/21 14:58:54)

Message:

Modify the VulkanBuffer class to take a range and to align data based on that rather than the size of an individual data item. Also, reorganize the code in VulkanGae::updateScene() in a more logical fashion, and remove VulkanGame::updateObject() and inline its functionality.

File:

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

sdl-game.cpp

@@ -92 +92 @@
    vkGetPhysicalDeviceProperties(physicalDevice, &deviceProperties);
 
-   objects_modelPipeline = VulkanBuffer<SSBO_ModelObject>(10, deviceProperties.limits.minUniformBufferOffsetAlignment);
+   objects_modelPipeline = VulkanBuffer<SSBO_ModelObject>(10, deviceProperties.limits.maxStorageBufferRange,
+                                                          deviceProperties.limits.minStorageBufferOffsetAlignment);
 
    initImGuiOverlay();
@@ -448 +449 @@
 
 void VulkanGame::updateScene() {
-   // Rotate the textured squares
-   for (SceneObject<ModelVertex, SSBO_ModelObject>& model : this->modelObjects) {
-      model.model_transform =
+   // TODO: Probably move the resizing to the VulkanBuffer class
+   if (objects_modelPipeline.resized) {
+      resizeBufferSet(storageBuffers_modelPipeline, objects_modelPipeline.memorySize(), resourceCommandPool,
+                      graphicsQueue, true);
+
+      objects_modelPipeline.resize();
+
+      modelPipeline.updateDescriptorInfo(1, &storageBuffers_modelPipeline.infoSet, swapChainImages.size());
+   }
+
+   for (size_t i = 0; i < modelObjects.size(); i++) {
+      SceneObject<ModelVertex, SSBO_ModelObject>& obj = modelObjects[i];
+      SSBO_ModelObject& objData = obj.ssbo;
+
+      // Rotate the textured squares
+      obj.model_transform =
          translate(mat4(1.0f), vec3(0.0f, -2.0f, -0.0f)) *
          rotate(mat4(1.0f), curTime * radians(90.0f), vec3(0.0f, 0.0f, 1.0f));
-      model.modified = true;
-   }
-
-   // TODO: Probably move the resizing to the VulkanBuffer class
-   if (objects_modelPipeline.resized) {
-      // TODO: Also resize the dynamic ubo
-      resizeBufferSet(storageBuffers_modelPipeline, objects_modelPipeline.capacity * sizeof(SSBO_ModelObject),
-                      resourceCommandPool, graphicsQueue, true);
-
-      objects_modelPipeline.resize();
-
-      modelPipeline.updateDescriptorInfo(1, &storageBuffers_modelPipeline.infoSet, swapChainImages.size());
-   }
-
-   for (size_t i = 0; i < modelObjects.size(); i++) {
-      if (modelObjects[i].modified) {
-         updateObject(modelObjects[i]);
-         updateBufferSet(storageBuffers_modelPipeline, i, modelObjects[i].ssbo);
+      obj.modified = true;
+
+      if (obj.modified) {
+         objData.model = obj.model_transform * obj.model_base;
+         obj.center = vec3(objData.model * vec4(0.0f, 0.0f, 0.0f, 1.0f));
+
+         obj.modified = false;
+
+         updateBufferSet(storageBuffers_modelPipeline, i, objData);
       }
    }