Changes in / [cf727ca:2b40f48] in opengl-game

Files:

• shaders/ship.frag (modified) (1 diff)
• shaders/ship.vert (modified) (1 diff)
• vulkan-game.cpp (modified) (2 diffs)

shaders/ship.frag

@@ -43 +43 @@
    vec3 Is = Ls * Ks * specular_factor;
 
-   outColor = vec4(Is + Id + Ia, 1.0);
+   //outColor = vec4(Is + Id + Ia, 1.0);
+   outColor = vec4(color, 1.0);
 }

shaders/ship.vert

@@ -40 +40 @@
    light_position_eye = vec3(ubo.view * vec4(light_position_world, 1.0));
 
-   gl_Position = ubo.proj * vec4(position_eye, 1.0);
+   //gl_Position = ubo.proj * vec4(position_eye, 1.0);
+   gl_Position = vec4(vertex_position, 1.0);
 }

vulkan-game.cpp

@@ -269 +269 @@
    // 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(),
@@ -498 +499 @@
          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();