Changeset 7c929fc in opengl-game for vulkan-game.cpp

Timestamp:

Dec 6, 2019, 4:21:54 AM (5 years ago)

Author:

Dmitry Portnoy <dmp1488@…>

Branches:

feature/imgui-sdl, master, points-test

Children:

60578ce

Parents:

2b40f48

Message:

In VulkanGame, make lighting work correctly in the ship shader before the MVP matrices are applied

File:

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

vulkan-game.cpp

@@ -502 +502 @@
 
    // z-range is 0 to 1, with +1 pointing into the screen
-   shipPipeline.addObject(addVertexNormals<ShipVertex>({
+   shipPipeline.addObject(
+      addObjectIndex<ShipVertex>(shipPipeline.getObjects().size(),
+      addVertexNormals<ShipVertex>({
          {{  0.5f,  -0.5f,   0.5f}, {0.0f, 0.6f, 0.0f}},
          {{ -0.5f,  -0.5f,   0.5f}, {0.0f, 0.6f, 0.0f}},
@@ -516 +518 @@
          {{ -0.3f,   0.3f,   0.3f}, {0.0f, 0.0f, 0.7f}},
          {{  0.3f,   0.3f,   0.3f}, {0.0f, 0.0f, 0.7f}},
-   }), {
+      })), {
          0,   1,   2,   3,   4,   5,
          6,   7,   8,   9,   10,   11,
-   }, commandPool, graphicsQueue);
+      }, commandPool, graphicsQueue);
 
    shipPipeline.createDescriptorSetLayout();