Changeset 8dcbf62 in opengl-game for vulkan-game.cpp

Timestamp:

Jun 8, 2021, 11:19:16 PM (3 years ago)

Author:

Dmitry Portnoy <dportnoy@…>

Branches:

feature/imgui-sdl

Children:

6bac215

Parents:

8aa4888

git-author:

Dmitry Portnoy <dportnoy@…> (06/08/21 20:38:16)

git-committer:

Dmitry Portnoy <dportnoy@…> (06/08/21 23:19:16)

Message:

Add some functionality to VulkanBuffer, and modify VulkanGame::addObject() to call VulkanBuffer::add()

File:

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

vulkan-game.cpp

@@ -160 +160 @@
       {
          0, 1, 2, 3, 4, 5
-      }, {
+      }, objects_modelPipeline, {
          mat4(1.0f)
       });
-
-   objects_modelPipeline.numObjects++;
 
    texturedSquare->model_base =
@@ -182 +180 @@
       {
          0, 1, 2, 3, 4, 5
-      }, {
+      }, objects_modelPipeline, {
          mat4(1.0f)
       });
-
-   objects_modelPipeline.numObjects++;
 
    texturedSquare->model_base =
@@ -445 +441 @@
          132, 133, 134,
          135, 136, 137,
-      }, {
+      }, objects_shipPipeline, {
          mat4(1.0f)
       });
-
-   objects_shipPipeline.numObjects++;
 
    ship.model_base =
@@ -781 +775 @@
                         {
                            0, 1, 2, 3, 4, 5
-                        }, {
+                        }, objects_modelPipeline, {
                            mat4(1.0f)
                         });
-
-                  objects_modelPipeline.numObjects++;
 
                   texturedSquare.model_base =
@@ -1063 +1055 @@
                24, 25, 26, 27, 28, 29,
                30, 31, 32, 33, 34, 35,
-            }, {
+            }, objects_asteroidPipeline, {
                mat4(1.0f),
                10.0f,
                false
             });
-
-      objects_asteroidPipeline.numObjects++;
 
       // This accounts for the scaling in model_base.
@@ -1551 +1541 @@
 void VulkanGame::createImageResources() {
    VulkanUtils::createDepthImage(device, physicalDevice, resourceCommandPool, findDepthFormat(), swapChainExtent,
-      depthImage, graphicsQueue);
+                                 depthImage, graphicsQueue);
 
    createTextureSampler();
@@ -1979 +1969 @@
           4, 5, 1, 4, 1, 0,
           6, 7, 5, 6, 5, 4
-      }, {
+      }, objects_laserPipeline, {
          mat4(1.0f),
          color,
          false
       });
-
-   objects_laserPipeline.numObjects++;
 
    float xAxisRotation = asin(ray.y / length);
@@ -2187 +2175 @@
    iota(indices.begin(), indices.end(), 0);
 
-   SceneObject<ExplosionVertex, SSBO_Explosion>& explosion = addObject(
-      explosionObjects, explosionPipeline, addObjectIndex(explosionObjects.size(), vertices), indices, {
+   SceneObject<ExplosionVertex, SSBO_Explosion>& explosion = addObject(explosionObjects, explosionPipeline,
+      addObjectIndex(explosionObjects.size(), vertices), indices, objects_explosionPipeline, {
          mat4(1.0f),
          cur_time,
@@ -2195 +2183 @@
       });
 
-   objects_explosionPipeline.numObjects++;
-
    explosion.model_base = model_mat;
    explosion.model_transform = mat4(1.0f);
@@ -2216 +2202 @@
    // and resizing the window is a common reason to recreate the swapchain
    VulkanUtils::createDepthImage(device, physicalDevice, resourceCommandPool, findDepthFormat(), swapChainExtent,
-      depthImage, graphicsQueue);
+                                 depthImage, graphicsQueue);
 
    createRenderPass();