diff options
Diffstat (limited to 'shaders')
-rw-r--r-- | shaders/fragment.vsh | 7 | ||||
-rw-r--r-- | shaders/vertex.vsh | 8 |
2 files changed, 9 insertions, 6 deletions
diff --git a/shaders/fragment.vsh b/shaders/fragment.vsh index fcb48a4..38bc00d 100644 --- a/shaders/fragment.vsh +++ b/shaders/fragment.vsh @@ -1,8 +1,9 @@ -#version 330 core -in vec4 vertexColor; +# version 330 core + +in vec3 vertexColor; out vec4 FragColor; void main() { - FragColor = vertexColor; + FragColor = vec4(vertexColor, 1.0); } diff --git a/shaders/vertex.vsh b/shaders/vertex.vsh index d195db3..220041d 100644 --- a/shaders/vertex.vsh +++ b/shaders/vertex.vsh @@ -1,11 +1,13 @@ # version 330 core layout (location = 0) in vec3 aPos; +layout (location = 1) in vec3 aColor; +uniform mat4 trans; -out vec4 vertexColor; +out vec3 vertexColor; void main() { - gl_Position = vec4(aPos.x, aPos.y, aPos.z, 1.0f); - vertexColor = vec4(0.2, 0.7, 0.2, 0.8); + gl_Position = trans * vec4(aPos, 1.0f); + vertexColor = aColor; } |