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

Timestamp:

Dec 19, 2019, 4:37:03 PM (5 years ago)

Author:

Dmitry Portnoy <dmitry.portnoy@…>

Branches:

feature/imgui-sdl, master, points-test

Children:

cd1cb0f

Parents:

60578ce

Message:

Finish copying the ship pipeline to VulkanGame

File:

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

vulkan-game.cpp

@@ -267 +267 @@
    // 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(
+      centerObject<ShipVertex>(
       addObjectIndex<ShipVertex>(shipPipeline.getObjects().size(),
       addVertexNormals<ShipVertex>({
@@ -466 +466 @@
          {{  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,
@@ -497 +497 @@
          135, 136, 137,
       }, commandPool, graphicsQueue);
-   */
-
-   // z-range is 0 to 1, with +1 pointing into the screen
-   shipPipeline.addObject(
-      addObjectIndex<ShipVertex>(shipPipeline.getObjects().size(),
-      addVertexNormals<ShipVertex>({
-         {{  40.0f,   40.0f,  72.0f}, {0.0f, 0.6f, 0.0f}},
-         {{ -40.0f,   40.0f,  80.0f}, {0.0f, 0.6f, 0.0f}},
-         {{ -40.0f,  -40.0f,  80.0f}, {0.0f, 0.6f, 0.0f}},
-         {{  40.0f,   40.0f,  72.0f}, {0.0f, 0.6f, 0.0f}},
-         {{ -40.0f,  -40.0f,  80.0f}, {0.0f, 0.6f, 0.0f}},
-         {{  40.0f,  -40.0f,  72.0f}, {0.0f, 0.6f, 0.0f}},
-
-         {{   8.0f,    8.0f,  34.0f}, {0.0f, 0.0f, 0.7f}},
-         {{  -8.0f,    8.0f,  30.0f}, {0.0f, 0.0f, 0.7f}},
-         {{  -8.0f,   -8.0f,  30.0f}, {0.0f, 0.0f, 0.7f}},
-         {{   8.0f,    8.0f,  34.0f}, {0.0f, 0.0f, 0.7f}},
-         {{  -8.0f,   -8.0f,  30.0f}, {0.0f, 0.0f, 0.7f}},
-         {{   8.0f,   -8.0f,  34.0f}, {0.0f, 0.0f, 0.7f}},
-      })), {
-         0,   1,   2,   3,   4,   5,
-         6,   7,   8,   9,   10,   11,
-      }, commandPool, graphicsQueue);
 
    shipPipeline.createDescriptorSetLayout();
@@ -549 +526 @@
 
    float cam_yaw = 0.0f;
-   float cam_pitch = 0.0f; // -50.0f;
+   float cam_pitch = -50.0f;
 
    mat4 yaw_mat = rotate(mat4(1.0f), radians(-cam_yaw), vec3(0.0f, 1.0f, 0.0f));