Changeset a00eb06 in opengl-game for shaders

Timestamp:

Apr 10, 2021, 12:58:17 AM (3 years ago)

Author:

Dmitry Portnoy <dportnoy@…>

Branches:

feature/imgui-sdl

Children:

8d92284

Parents:

914bb99

git-author:

Dmitry Portnoy <dportnoy@…> (04/10/21 00:49:42)

git-committer:

Dmitry Portnoy <dportnoy@…> (04/10/21 00:58:17)

Message:

In VulkanGame, add a normal varying attribute to ModelVertex

Location:

shaders

Files:

• model.frag (modified) (1 diff)
• model.vert (modified) (1 diff)

shaders/model.frag

@@ -6 +6 @@
 layout(location = 0) in vec3 fragColor;
 layout(location = 1) in vec2 fragTexCoord;
+layout(location = 2) in vec3 normal_eye;
 
 layout(location = 0) out vec4 outColor;
 
 void main() {
-   outColor = vec4(fragColor * texture(texSampler, fragTexCoord).rgb, 1.0);
+   outColor = vec4(fragColor * texture(texSampler, fragTexCoord).rgb, 1.0) + vec4(normal_eye, 0.0) - vec4(normal_eye, 0.0);
 }

shaders/model.vert

@@ -15 +15 @@
 } sbo;
 
+layout (binding = 2) uniform UboInstance {
+        mat4 model;
+} uboInstance;
+
 layout(location = 0) in vec3 inPosition;
 layout(location = 1) in vec3 inColor;
 layout(location = 2) in vec2 inTexCoord;
-layout(location = 3) in uint obj_index;
+layout(location = 3) in vec3 vertex_normal;
+layout(location = 4) in uint obj_index;
 
 layout(location = 0) out vec3 fragColor;
 layout(location = 1) out vec2 fragTexCoord;
+layout(location = 2) out vec3 normal_eye;
 
 void main() {
+   // 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)));
+
    fragColor = inColor;
    fragTexCoord = inTexCoord;