Changeset 8d92284 in opengl-game for shaders

Timestamp:

Apr 10, 2021, 1:31:20 AM (4 years ago)

Author:

Dmitry Portnoy <dportnoy@…>

Branches:

feature/imgui-sdl

Children:

b8efa56

Parents:

a00eb06

Message:

In VulkanGame, change the ship pipeline to use ModelVertex

Location:

shaders

Files:

• ship.frag (modified) (2 diffs)
• ship.vert (modified) (2 diffs)

shaders/ship.frag

@@ -4 +4 @@
 layout(location = 0) in vec3 position_eye;
 layout(location = 1) in vec3 color;
-layout(location = 2) in vec3 normal_eye;
-layout(location = 3) in vec3 light_position_eye;
-layout(location = 4) in vec3 light2_position_eye;
+layout(location = 2) in vec2 fragTexCoord;
+layout(location = 3) in vec3 normal_eye;
+layout(location = 4) in vec3 light_position_eye;
+layout(location = 5) in vec3 light2_position_eye;
 
 layout(location = 0) out vec4 frag_color;
@@ -55 +56 @@
 
    // specular intensity
-   vec3 Is2 = Ls * Ks * specular_factor2;
+   vec3 Is2 = Ls * Ks * specular_factor2 + vec3(fragTexCoord, 0.0) - vec3(fragTexCoord, 0.0);
 
    frag_color = vec4((Is + Id + Ia + Is2 + Id2 + Ia2) / 2.0, 1.0);

shaders/ship.vert

@@ -17 +17 @@
 layout(location = 0) in vec3 vertex_position;
 layout(location = 1) in vec3 vertex_color;
-layout(location = 2) in vec3 vertex_normal;
-layout(location = 3) in uint obj_index;
+layout(location = 2) in vec2 inTexCoord;
+layout(location = 3) in vec3 vertex_normal;
+layout(location = 4) in uint obj_index;
 
 layout(location = 0) out vec3 position_eye;
 layout(location = 1) out vec3 color;
-layout(location = 2) out vec3 normal_eye;
-layout(location = 3) out vec3 light_position_eye;
-layout(location = 4) out vec3 light2_position_eye;
+layout(location = 2) out vec2 fragTexCoord;
+layout(location = 3) out vec3 normal_eye;
+layout(location = 4) out vec3 light_position_eye;
+layout(location = 5) out vec3 light2_position_eye;
 
 // fixed point light positions
@@ -40 +42 @@
    color = vertex_color;
 
+   fragTexCoord = inTexCoord;
+
    light_position_eye = vec3(ubo.view * vec4(light_position_world, 1.0));
    light2_position_eye = vec3(ubo.view * vec4(light2_position_world, 1.0));