Changeset 0fe8433 in opengl-game for vulkan-game.cpp

Timestamp:

Dec 24, 2019, 2:57:03 AM (5 years ago)

Author:

Dmitry Portnoy <dmp1488@…>

Branches:

feature/imgui-sdl, master, points-test

Children:

3e8cc8b

Parents:

cd1cb0f

Message:

Create an addObject() method in VulkanGame (which wraps the old addObject() method in GraphicsPipeline_Vulkan), and move the list of objects and other code to manage objects from the pipeline to the VulkanGame class

File:

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

vulkan-game.cpp

@@ -207 +207 @@
       VK_SHADER_STAGE_FRAGMENT_BIT, &floorTextureImageDescriptor);
 
-   modelPipeline.addObject({
+   addObject(modelObjects, modelPipeline,
+      {
          {{-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}},
@@ -214 +215 @@
       }, {
          0, 1, 2, 2, 3, 0
-      }, commandPool, graphicsQueue);
-
-   modelPipeline.addObject({
+      });
+
+   addObject(modelObjects, modelPipeline,
+      {
          {{-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}},
@@ -223 +225 @@
       }, {
          0, 1, 2, 2, 3, 0
-      }, commandPool, graphicsQueue);
+      });
 
    modelPipeline.createDescriptorSetLayout();
@@ -236 +238 @@
       VK_SHADER_STAGE_FRAGMENT_BIT, &sdlOverlayImageDescriptor);
 
-   overlayPipeline.addObject({
+   addObject(overlayObjects, overlayPipeline,
+      {
          {{-1.0f,  1.0f,  0.0f}, {0.0f, 1.0f}},
          {{ 1.0f,  1.0f,  0.0f}, {1.0f, 1.0f}},
@@ -243 +246 @@
       }, {
          0, 1, 2, 2, 3, 0
-      }, commandPool, graphicsQueue);
+      });
 
    overlayPipeline.createDescriptorSetLayout();
@@ -267 +270 @@
    // TODO: With the normals, indexing basically becomes pointless since no vertices will have exactly
    // the same data. Add an option to make some pipelines not use indexing
-   shipPipeline.addObject(
+   addObject(shipObjects, shipPipeline,
       centerObject<ShipVertex>(
-      addObjectIndex<ShipVertex>(shipPipeline.getObjects().size(),
+      addObjectIndex<ShipVertex>(shipObjects.size(),
       addVertexNormals<ShipVertex>({
          //back
@@ -496 +499 @@
          132, 133, 134,
          135, 136, 137,
-      }, commandPool, graphicsQueue);
+      });
 
    shipPipeline.createDescriptorSetLayout();
@@ -509 +512 @@
    createSyncObjects();
 
-   shipPipeline.getObjects()[0].model_base =
+   shipObjects[0].model_base =
       translate(mat4(1.0f), vec3(0.0f, -1.2f, 1.65f)) *
       scale(mat4(1.0f), vec3(0.1f, 0.1f, 0.1f));
@@ -575 +578 @@
                } else if (e.key.keycode == SDL_SCANCODE_SPACE) {
                   cout << "Adding a plane" << endl;
-                  float zOffset = -2.0f + (0.5f * modelPipeline.getObjects().size());
+                  float zOffset = -2.0f + (0.5f * modelObjects.size());
 
                   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}}
-                  }, {
-                     0, 1, 2, 2, 3, 0
-                  }, commandPool, graphicsQueue);
+                  addObject(modelObjects, modelPipeline,
+                     {
+                        {{-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}}
+                     }, {
+                        0, 1, 2, 2, 3, 0
+                     });
 
                   createCommandBuffers();
@@ -615 +619 @@
 
       if (gui->keyPressed(SDL_SCANCODE_LEFT)) {
-         transformObject(shipPipeline.getObjects()[0], translate(mat4(1.0f), vec3(-0.01f, 0.0f, 0.0f)));
+         transformObject(shipObjects[0], translate(mat4(1.0f), vec3(-0.01f, 0.0f, 0.0f)));
       } else if (gui->keyPressed(SDL_SCANCODE_RIGHT)) {
-         transformObject(shipPipeline.getObjects()[0], translate(mat4(1.0f), vec3(0.01f, 0.0f, 0.0f)));
+         transformObject(shipObjects[0], translate(mat4(1.0f), vec3(0.01f, 0.0f, 0.0f)));
       }
 
@@ -641 +645 @@
       rotate(mat4(1.0f), time * radians(90.0f), vec3(0.0f, 0.0f, 1.0f));
 
-   so_Ship.model = shipPipeline.getObjects()[0].model_transform * shipPipeline.getObjects()[0].model_base;
+   so_Ship.model = shipObjects[0].model_transform * shipObjects[0].model_base;
 
    VulkanUtils::copyDataToMemory(device, uniformBuffersMemory_scenePipeline[currentImage], object_VP_mats);