Changeset b8efa56 in opengl-game for shaders

Timestamp:

Apr 10, 2021, 1:46:51 AM (3 years ago)

Author:

Dmitry Portnoy <dportnoy@…>

Branches:

feature/imgui-sdl

Children:

4a777d2

Parents:

8d92284

git-author:

Dmitry Portnoy <dportnoy@…> (04/10/21 01:46:46)

git-committer:

Dmitry Portnoy <dportnoy@…> (04/10/21 01:46:51)

Message:

In VulkanGame, change the asteroid pipeline to use ModelVertex

Location:

shaders

Files:

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

shaders/asteroid.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;
@@ -52 +53 @@
    // specular intensity
    vec3 Is = Ls * Ks * specular_factor;
-   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, 1.0);

shaders/asteroid.vert

@@ -19 +19 @@
 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 position
@@ -40 +42 @@
    color = (vertex_color * hp_percent) + (damage_color * (1.0 - hp_percent));
 
+   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));