projects
/
opengl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update assignment 5 report
[opengl.git]
/
vertex.glsl
diff --git
a/vertex.glsl
b/vertex.glsl
index 3bf0a4836bbe79ba552fb749ef5bbf12ba322266..341b26a1771d0a0d164b2310f50703427ca9cfe0 100644
(file)
--- a/
vertex.glsl
+++ b/
vertex.glsl
@@
-1,12
+1,23
@@
#version 330
in vec3 vPosition;
in vec4 vColor;
#version 330
in vec3 vPosition;
in vec4 vColor;
+in vec3 vNormal;
+in vec2 vTexCoord;
uniform mat4 model;
uniform mat4 view;
uniform mat4 projection;
out vec4 color;
uniform mat4 model;
uniform mat4 view;
uniform mat4 projection;
out vec4 color;
+out vec3 normal;
+out vec3 fragPos;
+out vec3 normalEye;
+out vec2 texCoord;
void main() {
void main() {
- gl_Position = projection * view * model * vec4(vPosition, 1.f);
+ vec4 pos = model * vec4(vPosition, 1.f);
+ gl_Position = projection * view * pos;
+ fragPos = vec3(pos);
color = vColor;
color = vColor;
+ normal = mat3(transpose(inverse(model))) * vNormal;
+ normalEye = vec3(view * vec4(normal, 0.0));
+ texCoord = vTexCoord;
}
}