projects
/
opengl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Assignment 2
[opengl.git]
/
vertex.glsl
diff --git
a/vertex.glsl
b/vertex.glsl
index 6333f5488b26232a0aec08ba8219fd88723e3422..3bf0a4836bbe79ba552fb749ef5bbf12ba322266 100644
(file)
--- a/
vertex.glsl
+++ b/
vertex.glsl
@@
-1,9
+1,12
@@
#version 330
in vec3 vPosition;
in vec4 vColor;
#version 330
in vec3 vPosition;
in vec4 vColor;
+uniform mat4 model;
+uniform mat4 view;
+uniform mat4 projection;
out vec4 color;
void main() {
out vec4 color;
void main() {
- gl_Position =
vec4(vPosition, 1.0
);
+ gl_Position =
projection * view * model * vec4(vPosition, 1.f
);
color = vColor;
}
color = vColor;
}