Changeset 3b84bb6 in opengl-game for vulkan-game.cpp

Timestamp:

Feb 25, 2020, 6:51:02 PM (5 years ago)

Author:

Dmitry Portnoy <dmitry.portnoy@…>

Branches:

feature/imgui-sdl, master, points-test

Children:

44f23af

Parents:

2da64ef

Message:

In VulkanGame, call centerObject() on all objects when they are created and move that call inside VulkanGame::addObject(), rename GraphicsPipeline_Vulkan::addVertices() to addObject, add start adding generic support for objects to be added after pipeline creation is complete

File:

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

vulkan-game.cpp

@@ -208 +208 @@
       }, {
          0, 1, 2, 2, 3, 0
-      }, {});
+      }, {}, false);
 
    overlayPipeline.createDescriptorSetLayout();
@@ -240 +240 @@
       }, {
          mat4(1.0f)
-      });
+      }, false);
 
    addObject(modelObjects, modelPipeline,
@@ -252 +252 @@
       }, {
          mat4(1.0f)
-      });
+      }, false);
 
    modelPipeline.createDescriptorSetLayout();
@@ -274 +274 @@
    // the same data. Add an option to make some pipelines not use indexing
    addObject(shipObjects, shipPipeline,
-      centerObject<ShipVertex>(
       addObjectIndex<ShipVertex>(shipObjects.size(),
       addVertexNormals<ShipVertex>({
@@ -473 +472 @@
          {{  1.5f,   0.0f,   0.0f}, {0.0f, 0.0f, 0.3f}},
          {{  1.3f,   0.0f,  -0.3f}, {0.0f, 0.0f, 0.3f}},
-      }))), {
+      })), {
            0,   1,   2,   3,   4,   5,
            6,   7,   8,   9,  10,  11,
@@ -505 +504 @@
       }, {
          mat4(1.0f)
-      });
+      }, false);
 
    shipPipeline.createDescriptorSetLayout();
@@ -619 +618 @@
                   float zOffset = -2.0f + (0.5f * modelObjects.size());
 
-                  vkDeviceWaitIdle(device);
-                  vkFreeCommandBuffers(device, commandPool, static_cast<uint32_t>(commandBuffers.size()), commandBuffers.data());
-
                   addObject(modelObjects, modelPipeline,
                      addObjectIndex<ModelVertex>(modelObjects.size(), {
@@ -632 +628 @@
                      }, {
                         mat4(1.0f)
-                     });
-
-                  createCommandBuffers();
+                     }, true);
                } else if (e.key.keycode == SDL_SCANCODE_Z) {
-                  vkDeviceWaitIdle(device);
-                  vkFreeCommandBuffers(device, commandPool, static_cast<uint32_t>(commandBuffers.size()), commandBuffers.data());
-
                   addObject(asteroidObjects, asteroidPipeline,
                      addObjectIndex<AsteroidVertex>(asteroidObjects.size(),
@@ -701 +692 @@
                         10.0f,
                         0
-                     });
+                     }, true);
 
                   // translate(mat4(1.0f), vec3(getRandomNum(-1.3f, 1.3f), -1.2f, getRandomNum(-5.5f, -4.5f))) *
@@ -710 +701 @@
 
                   updateObject(asteroidObjects, asteroidPipeline, asteroidObjects.size() - 1);
-                  createCommandBuffers();
                } else {
                   cout << "Key event detected" << endl;
@@ -750 +740 @@
       }
 
+      if (gui->keyPressed(SDL_SCANCODE_X)) {
+         if (asteroidObjects.size() > 0 && !asteroidObjects[0].ssbo.deleted) {
+            updateObject(asteroidObjects, asteroidPipeline, 0);
+         }
+      }
+
       renderUI();
       renderScene();