Changeset 7c929fc in opengl-game

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

Files:

• scene-notes.txt (modified) (1 diff)
• shaders/ship.frag (modified) (3 diffs)
• shaders/ship.vert (modified) (1 diff)
• vulkan-game.cpp (modified) (2 diffs)
• vulkan-game.hpp (modified) (1 diff)

scene-notes.txt

@@ -2 +2 @@
 In vulkan, it is upper left, so I set the projection matrix [1][1] cell to -1 to flip the y-axis and make it match opengl
 
-+z goes into the screen
++z goes into the screen (in Vulkan)

shaders/ship.frag

@@ -15 +15 @@
 
 // reflectance of the object surface
+// TODO: Eventually, I might want to move these properties into an ssbo so they differ per object
 vec3 Ks = vec3(1.0, 1.0, 1.0);
-vec3 Kd = vec3(1.0, 0.5, 0.0);
+vec3 Kd = color;
 vec3 Ka = vec3(0.2, 0.2, 0.2);
 float specular_exponent = 100.0; // specular 'power'
@@ -31 +32 @@
 
    // diffuse intensity
-   vec3 Id = Ld * color * dot_prod;
-   //vec3 Id = Ld * Kd * dot_prod;
+   vec3 Id = Ld * Kd * dot_prod;
 
    vec3 surface_to_viewer_eye = normalize(-position_eye);
@@ -43 +43 @@
    vec3 Is = Ls * Ks * specular_factor;
 
-   //outColor = vec4(Is + Id + Ia, 1.0);
-   outColor = vec4(color, 1.0);
+   outColor = vec4(Is + Id + Ia, 1.0);
 }

shaders/ship.vert

@@ -27 +27 @@
 // fixed point light position
 //vec3 light_position_world = vec3(0.0, 0.0, 2.0);
-vec3 light_position_world = vec3(0.4, 1.5, 0.8);
-//vec3 light_position_world = vec3(0.0, 1.0, -1.0);
+//vec3 light_position_world = vec3(0.4, 1.5, 0.8);
+vec3 light_position_world = vec3(0.4, 0.0, 0.2);
 
 // TODO: This does not account for scaling in the model matrix
 // Check Anton's book to see how to fix this
 void main() {
-   position_eye = vec3(ubo.view * sbo.objects[obj_index].model * vec4(vertex_position, 1.0));
+   //position_eye = vec3(ubo.view * sbo.objects[obj_index].model * vec4(vertex_position, 1.0));
+   position_eye = vec3(vec4(vertex_position, 1.0));
 
    // Using 0.0 instead of 1.0 means translations won't effect the normal
-   normal_eye = normalize(vec3(ubo.view * sbo.objects[obj_index].model * vec4(vertex_normal, 0.0)));
+   //normal_eye = normalize(vec3(ubo.view * sbo.objects[obj_index].model * vec4(vertex_normal, 0.0)));
+   normal_eye = normalize(vec3(vec4(vertex_normal, 0.0)));
    color = vertex_color;
-   light_position_eye = vec3(ubo.view * vec4(light_position_world, 1.0));
+   //light_position_eye = vec3(ubo.view * vec4(light_position_world, 1.0));
+   light_position_eye = vec3(vec4(light_position_world, 1.0));
 
    //gl_Position = ubo.proj * vec4(position_eye, 1.0);

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();

vulkan-game.hpp

@@ -204 +204 @@
 
       vec3 normal = normalize(cross(p2 - p1, p3 - p1));
-      normal.z = -normal.z;
+      //normal.z = -normal.z;
 
       // Add the same normal for all 3 vertices