Changeset 5a0242e in opengl-game for vulkan-game.cpp

Timestamp:

Nov 17, 2019, 6:56:16 PM (5 years ago)

Author:

Dmitry Portnoy <dmp1488@…>

Branches:

feature/imgui-sdl, master, points-test

Children:

5ab1b20

Parents:

b8777b7

Message:

Refactor GraphicsPipeline_Vulkan to allow adding new data after creation:

• Create the initial vertex and index buffers in the constructor
• Add an addObject() method to add new vertex and index data and resize bufffers when needed
• Remove the bindData() function, since addObject() can replace it

File:

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

vulkan-game.cpp

@@ -194 +194 @@
    createUniformBuffers();
 
-   vector<ModelVertex> sceneVertices = {
-      {{-0.5f, -0.5f, -2.0f}, {1.0f, 0.0f, 0.0f}, {0.0f, 1.0f}},
-      {{ 0.5f, -0.5f, -2.0f}, {0.0f, 1.0f, 0.0f}, {1.0f, 1.0f}},
-      {{ 0.5f,  0.5f, -2.0f}, {0.0f, 0.0f, 1.0f}, {1.0f, 0.0f}},
-      {{-0.5f,  0.5f, -2.0f}, {1.0f, 1.0f, 1.0f}, {0.0f, 0.0f}},
-
-      {{-0.5f, -0.5f, -1.5f}, {1.0f, 0.0f, 0.0f}, {0.0f, 1.0f}},
-      {{ 0.5f, -0.5f, -1.5f}, {0.0f, 1.0f, 0.0f}, {1.0f, 1.0f}},
-      {{ 0.5f,  0.5f, -1.5f}, {0.0f, 0.0f, 1.0f}, {1.0f, 0.0f}},
-      {{-0.5f,  0.5f, -1.5f}, {1.0f, 1.0f, 1.0f}, {0.0f, 0.0f}}
-   };
-   vector<uint16_t> sceneIndices = {
-      0, 1, 2, 2, 3, 0,
-      4, 5, 6, 6, 7, 4
-   };
-
    modelPipeline = GraphicsPipeline_Vulkan<ModelVertex>(physicalDevice, device, renderPass,
-      { 0, 0, (int)swapChainExtent.width, (int)swapChainExtent.height }, sizeof(ModelVertex));
-
-   modelPipeline.bindData(sceneVertices, sceneIndices, commandPool, graphicsQueue);
+      { 0, 0, (int)swapChainExtent.width, (int)swapChainExtent.height }, 16, 24);
+
+   modelPipeline.addObject({
+         {{-0.5f, -0.5f, -2.0f}, {1.0f, 0.0f, 0.0f}, {0.0f, 1.0f}},
+         {{ 0.5f, -0.5f, -2.0f}, {0.0f, 1.0f, 0.0f}, {1.0f, 1.0f}},
+         {{ 0.5f,  0.5f, -2.0f}, {0.0f, 0.0f, 1.0f}, {1.0f, 0.0f}},
+         {{-0.5f,  0.5f, -2.0f}, {1.0f, 1.0f, 1.0f}, {0.0f, 0.0f}}
+      }, {
+         0, 1, 2, 2, 3, 0
+      }, commandPool, graphicsQueue);
+
+   modelPipeline.addObject({
+         {{-0.5f, -0.5f, -1.5f}, {1.0f, 0.0f, 0.0f}, {0.0f, 1.0f}},
+         {{ 0.5f, -0.5f, -1.5f}, {0.0f, 1.0f, 0.0f}, {1.0f, 1.0f}},
+         {{ 0.5f,  0.5f, -1.5f}, {0.0f, 0.0f, 1.0f}, {1.0f, 0.0f}},
+         {{-0.5f,  0.5f, -1.5f}, {1.0f, 1.0f, 1.0f}, {0.0f, 0.0f}}
+      }, {
+         0, 1, 2, 2, 3, 0
+      }, commandPool, graphicsQueue);
 
    modelPipeline.addAttribute(VK_FORMAT_R32G32B32_SFLOAT, offset_of(&ModelVertex::pos));
@@ -229 +229 @@
    modelPipeline.createDescriptorSets(swapChainImages);
 
-   vector<OverlayVertex> overlayVertices = {
-      {{-1.0f,  1.0f,  0.0f}, {0.0f, 1.0f}},
-      {{ 1.0f,  1.0f,  0.0f}, {1.0f, 1.0f}},
-      {{ 1.0f, -1.0f,  0.0f}, {1.0f, 0.0f}},
-      {{-1.0f, -1.0f,  0.0f}, {0.0f, 0.0f}}
-   };
-   vector<uint16_t> overlayIndices = {
-      0, 1, 2, 2, 3, 0
-   };
-
    overlayPipeline = GraphicsPipeline_Vulkan<OverlayVertex>(physicalDevice, device, renderPass,
-      { 0, 0, (int)swapChainExtent.width, (int)swapChainExtent.height }, sizeof(OverlayVertex));
-
-   overlayPipeline.bindData(overlayVertices, overlayIndices, commandPool, graphicsQueue);
+      { 0, 0, (int)swapChainExtent.width, (int)swapChainExtent.height }, 4, 6);
+
+   overlayPipeline.addObject({
+         {{-1.0f,  1.0f,  0.0f}, {0.0f, 1.0f}},
+         {{ 1.0f,  1.0f,  0.0f}, {1.0f, 1.0f}},
+         {{ 1.0f, -1.0f,  0.0f}, {1.0f, 0.0f}},
+         {{-1.0f, -1.0f,  0.0f}, {0.0f, 0.0f}}
+      }, {
+         0, 1, 2, 2, 3, 0
+      }, commandPool, graphicsQueue);
 
    overlayPipeline.addAttribute(VK_FORMAT_R32G32B32_SFLOAT, offset_of(&OverlayVertex::pos));
@@ -291 +288 @@
                   cout << "Adding a plane" << endl;
                   float zOffset = -2.0f + (0.5f * numPlanes);
-                  vector<ModelVertex> vertices = {
+
+                  vkDeviceWaitIdle(device);
+                  vkFreeCommandBuffers(device, commandPool, static_cast<uint32_t>(commandBuffers.size()), commandBuffers.data());
+
+                  modelPipeline.addObject({
                      {{-0.5f, -0.5f,  zOffset}, {1.0f, 0.0f, 0.0f}, {0.0f, 1.0f}},
                      {{ 0.5f, -0.5f,  zOffset}, {0.0f, 1.0f, 0.0f}, {1.0f, 1.0f}},
                      {{ 0.5f,  0.5f,  zOffset}, {0.0f, 0.0f, 1.0f}, {1.0f, 0.0f}},
                      {{-0.5f,  0.5f,  zOffset}, {1.0f, 1.0f, 1.0f}, {0.0f, 0.0f}}
-                  };
-                  vector<uint16_t> indices = {
+                  }, {
                      0, 1, 2, 2, 3, 0
-                  };
-
-                  // TODO: Encapsulate these lines into an addObject() function in vulkan-game
-
-                  vkDeviceWaitIdle(device);
-                  vkFreeCommandBuffers(device, commandPool, static_cast<uint32_t>(commandBuffers.size()), commandBuffers.data());
-
-                  modelPipeline.addObject(vertices, indices, commandPool, graphicsQueue);
+                  }, commandPool, graphicsQueue);
 
                   createCommandBuffers();
@@ -314 +307 @@
                   cout << "Key event detected" << endl;
                }
+               break;
+            case UI_EVENT_KEYUP:
                break;
             case UI_EVENT_MOUSEBUTTONDOWN: