From d7bd9a3dbd3486a4b0615dc9f30a890ff6d04ec6 Mon Sep 17 00:00:00 2001 From: jvech Date: Mon, 29 Aug 2022 09:12:18 -0500 Subject: feat: 3D support added --- shaders/fragment.fsh | 9 +++++++++ shaders/fragment.vsh | 9 --------- shaders/vertex.vsh | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) create mode 100644 shaders/fragment.fsh delete mode 100644 shaders/fragment.vsh (limited to 'shaders') diff --git a/shaders/fragment.fsh b/shaders/fragment.fsh new file mode 100644 index 0000000..2d87daa --- /dev/null +++ b/shaders/fragment.fsh @@ -0,0 +1,9 @@ +# version 330 core + +in vec3 vertexColor; +out vec4 FragColor; + +void main() +{ + FragColor = vec4(vertexColor, 0.0f); +} diff --git a/shaders/fragment.vsh b/shaders/fragment.vsh deleted file mode 100644 index 38bc00d..0000000 --- a/shaders/fragment.vsh +++ /dev/null @@ -1,9 +0,0 @@ -# version 330 core - -in vec3 vertexColor; -out vec4 FragColor; - -void main() -{ - FragColor = vec4(vertexColor, 1.0); -} diff --git a/shaders/vertex.vsh b/shaders/vertex.vsh index 220041d..987dc3b 100644 --- a/shaders/vertex.vsh +++ b/shaders/vertex.vsh @@ -2,12 +2,12 @@ layout (location = 0) in vec3 aPos; layout (location = 1) in vec3 aColor; -uniform mat4 trans; +uniform mat4 model, view, proj; out vec3 vertexColor; void main() { - gl_Position = trans * vec4(aPos, 1.0f); + gl_Position = proj * view * model * vec4(aPos, 1.0f); vertexColor = aColor; } -- cgit v1.2.3-70-g09d2