Changeset e1308e8 in opengl-game for vulkan-game.cpp

Timestamp:

Nov 27, 2019, 6:39:18 PM (5 years ago)

Author:

Dmitry Portnoy <dmp1488@…>

Branches:

feature/imgui-sdl, master, points-test

Children:

055750a

Parents:

06d959f

Message:

In VulkanGame, add normals to the ship pipeline and get lighting to work

File:

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

vulkan-game.cpp

@@ -248 +248 @@
    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));
 
    createUniformBuffers<UBO_MvpMat>(uniformBuffers_shipPipeline, uniformBuffersMemory_shipPipeline, uniformBufferInfoList_shipPipeline);
@@ -254 +255 @@
       VK_SHADER_STAGE_VERTEX_BIT, &uniformBufferInfoList_shipPipeline);
 
-   shipPipeline.addObject({
+   // 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(addVertexNormals<ShipVertex>({
          //back
          {{ -0.5f,   0.3f,   0.0f}, {0.0f, 0.0f, 0.3f}},
@@ -450 +453 @@
          {{  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,