Changes in vulkan-game.cpp [cf727ca:785333b] in opengl-game

File:

• vulkan-game.cpp (modified) (4 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 +268 @@
    // 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(
-      addObjectIndex<ShipVertex>(shipPipeline.getObjects().size(),
-      addVertexNormals<ShipVertex>({
+   /*
+   shipPipeline.addObject(addVertexNormals<ShipVertex>({
          //back
          {{ -0.5f,   0.3f,   0.0f}, {0.0f, 0.0f, 0.3f}},
@@ -467 +465 @@
          {{  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,
@@ -498 +496 @@
          135, 136, 137,
       }, commandPool, graphicsQueue);
+   */
+
+   // z-range is 0 to 1, with +1 pointing into the screen
+   shipPipeline.addObject(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}},
+         {{ -0.5f,   0.5f,   0.5f}, {0.0f, 0.6f, 0.0f}},
+         {{  0.5f,  -0.5f,   0.5f}, {0.0f, 0.6f, 0.0f}},
+         {{ -0.5f,   0.5f,   0.5f}, {0.0f, 0.6f, 0.0f}},
+         {{  0.5f,   0.5f,   0.5f}, {0.0f, 0.6f, 0.0f}},
+
+         {{  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.3f,   0.3f,   0.3f}, {0.0f, 0.0f, 0.7f}},
+         {{  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.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);
 
    shipPipeline.createDescriptorSetLayout();