Changeset aa00bf2 in opengl-game for shaders/ship.frag

Timestamp:

Nov 22, 2019, 8:51:26 PM (5 years ago)

Author:

Dmitry Portnoy <dmitry.portnoy@…>

Branches:

feature/imgui-sdl, master, points-test

Children:

3782d66

Parents:

f97c5e7

git-author:

Dmitry Portnoy <dmitry.portnoy@…> (11/22/19 20:49:26)

git-committer:

Dmitry Portnoy <dmitry.portnoy@…> (11/22/19 20:51:26)

Message:

Re-enable some of the logic to render lights in the ship shader for vulkangame

File:

• shaders/ship.frag (modified) (4 diffs)

shaders/ship.frag

@@ -5 +5 @@
 layout(location = 0) in vec3 position_eye;
 layout(location = 1) in vec3 color;
+layout(location = 2) in vec3 light_position_eye;
+layout(location = 3) in vec3 light2_position_eye;
 
 layout(location = 0) out vec4 outColor;
@@ -26 +28 @@
    vec3 Ia2 = La * Ka;
 
-   //vec3 direction_to_light_eye = normalize(light_position_eye - position_eye);
+   vec3 direction_to_light_eye = normalize(light_position_eye - position_eye);
    //float dot_prod = max(dot(direction_to_light_eye, normal_eye), 0.0);
 
@@ -32 +34 @@
    //vec3 Id = Ld * color * dot_prod;
 
-   //vec3 direction_to_light2_eye = normalize(light2_position_eye - position_eye);
+   vec3 direction_to_light2_eye = normalize(light2_position_eye - position_eye);
    //float dot_prod2 = max(dot(direction_to_light2_eye, normal_eye), 0.0);
 
@@ -52 +54 @@
    //vec3 Is2 = Ls * Ks * specular_factor2;
 
-   //frag_color = vec4((Is + Id + Ia + Is2 + Id2 + Ia2)/2, 1.0);
+   //outColor = vec4((Is + Id + Ia + Is2 + Id2 + Ia2)/2, 1.0);
    outColor = vec4(color, 1.0);
 }