Changeset 2b40f48 in opengl-game for vulkan-game.cpp

Timestamp:

Dec 5, 2019, 5:48:59 PM (5 years ago)

Author:

Dmitry Portnoy <dmitry.portnoy@…>

Branches:

feature/imgui-sdl, master, points-test

Children:

7c929fc

Parents:

785333b (diff), cf727ca (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into hotfix/ship-shader-lights

File:

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

vulkan-game.cpp

@@ -255 +255 @@
    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));
 
    createBufferSet(sizeof(UBO_VP_mats), VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT,
@@ -269 +270 @@
    // the same data. Add an option to make some pipelines not use indexing
    /*
-   shipPipeline.addObject(addVertexNormals<ShipVertex>({
+   shipPipeline.addObject(
+      addObjectIndex<ShipVertex>(shipPipeline.getObjects().size(),
+      addVertexNormals<ShipVertex>({
          //back
          {{ -0.5f,   0.3f,   0.0f}, {0.0f, 0.0f, 0.3f}},
@@ -465 +468 @@
          {{  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,