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

Timestamp:

Apr 10, 2021, 1:31:20 AM (3 years ago)

Author:

Dmitry Portnoy <dportnoy@…>

Branches:

feature/imgui-sdl

Children:

b8efa56

Parents:

a00eb06

Message:

In VulkanGame, change the ship pipeline to use ModelVertex

File:

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

vulkan-game.cpp

@@ -174 +174 @@
    modelPipeline.createDescriptorSets(swapChainImages);
 
-   shipPipeline.addAttribute(VK_FORMAT_R32G32B32_SFLOAT, offset_of(&ShipVertex::pos));
-   shipPipeline.addAttribute(VK_FORMAT_R32G32B32_SFLOAT, offset_of(&ShipVertex::color));
-   shipPipeline.addAttribute(VK_FORMAT_R32G32B32_SFLOAT, offset_of(&ShipVertex::normal));
-   shipPipeline.addAttribute(VK_FORMAT_R32_UINT, offset_of(&ShipVertex::objIndex));
+   // START UNREVIEWED SECTION
+   shipPipeline.addAttribute(VK_FORMAT_R32G32B32_SFLOAT, offset_of(&ModelVertex::pos));
+   shipPipeline.addAttribute(VK_FORMAT_R32G32B32_SFLOAT, offset_of(&ModelVertex::color));
+   shipPipeline.addAttribute(VK_FORMAT_R32G32_SFLOAT, offset_of(&ModelVertex::texCoord));
+   shipPipeline.addAttribute(VK_FORMAT_R32G32B32_SFLOAT, offset_of(&ModelVertex::normal));
+   shipPipeline.addAttribute(VK_FORMAT_R32_UINT, offset_of(&ModelVertex::objIndex));
 
    createBufferSet(sizeof(UBO_VP_mats), VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT,
@@ -188 +190 @@
    // 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
-   SceneObject<ShipVertex, SSBO_ModelObject>& ship = addObject(shipObjects, shipPipeline,
-      addObjectIndex<ShipVertex>(shipObjects.size(),
-         addVertexNormals<ShipVertex>({
+   SceneObject<ModelVertex, SSBO_ModelObject>& ship = addObject(shipObjects, shipPipeline,
+      addObjectIndex<ModelVertex>(shipObjects.size(),
+         addVertexNormals<ModelVertex>({
 
             //back
@@ -482 +484 @@
    explosionPipeline.createDescriptorSets(swapChainImages);
 
+   // END UNREVIEWED SECTION
+
    currentRenderScreenFn = &VulkanGame::renderMainScreen;
 
@@ -582 +586 @@
       { 0, 0, (int)swapChainExtent.width, (int)swapChainExtent.height }, swapChainImages, 24, 24, 10);
 
-   shipPipeline = GraphicsPipeline_Vulkan<ShipVertex, SSBO_ModelObject>(
+   shipPipeline = GraphicsPipeline_Vulkan<ModelVertex, SSBO_ModelObject>(
       VK_PRIMITIVE_TOPOLOGY_TRIANGLE_LIST, physicalDevice, device, renderPass,
       { 0, 0, (int)swapChainExtent.width, (int)swapChainExtent.height }, swapChainImages, 138, 138, 10);
@@ -723 +727 @@
                      translate(mat4(1.0f), vec3(0.0f, 0.0f, zOffset));
                   texturedSquare.modified = true;
+               // START UNREVIEWED SECTION
                } else if (e.key.keycode == SDL_SCANCODE_Z && leftLaserIdx == -1) {
                   // TODO: When I start actually removing objects from the object vectors,
@@ -745 +750 @@
 
                   rightLaserIdx = laserObjects.size() - 1;
+               // END UNREVIEWED SECTION
                } else {
                   cout << "Key event detected" << endl;
@@ -750 +756 @@
                break;
             case UI_EVENT_KEYUP:
+               // START UNREVIEWED SECTION
                if (e.key.keycode == SDL_SCANCODE_Z && leftLaserIdx != -1) {
                   laserObjects[leftLaserIdx].ssbo.deleted = true;
@@ -769 +776 @@
                   }
                }
+               // END UNREVIEWED SECTION
                break;
             case UI_EVENT_WINDOW:
@@ -792 +800 @@
       // Check which keys are held down
 
-      SceneObject<ShipVertex, SSBO_ModelObject>& ship = shipObjects[0];
+      SceneObject<ModelVertex, SSBO_ModelObject>& ship = shipObjects[0];
 
       if (gui->keyPressed(SDL_SCANCODE_LEFT)) {
@@ -836 +844 @@
             shouldRecreateSwapChain = false;
          }
-      }
+      }// REVIEWED TO THIS POINT
 
       updateScene();