From f9ad6fa902c1167d7622ee7af2617d14b62bee21 Mon Sep 17 00:00:00 2001 From: pryazha Date: Wed, 19 Feb 2025 22:26:48 +0500 Subject: quite a lot of changes that I, of course, are not going to describe;) --- advanced_opengl/4.face_culling/shaders/face_culling.frag | 12 ++++++++++++ advanced_opengl/4.face_culling/shaders/face_culling.fs | 13 ------------- advanced_opengl/4.face_culling/shaders/face_culling.vert | 15 +++++++++++++++ advanced_opengl/4.face_culling/shaders/face_culling.vs | 16 ---------------- 4 files changed, 27 insertions(+), 29 deletions(-) create mode 100644 advanced_opengl/4.face_culling/shaders/face_culling.frag delete mode 100644 advanced_opengl/4.face_culling/shaders/face_culling.fs create mode 100644 advanced_opengl/4.face_culling/shaders/face_culling.vert delete mode 100644 advanced_opengl/4.face_culling/shaders/face_culling.vs (limited to 'advanced_opengl/4.face_culling/shaders') diff --git a/advanced_opengl/4.face_culling/shaders/face_culling.frag b/advanced_opengl/4.face_culling/shaders/face_culling.frag new file mode 100644 index 0000000..71892a7 --- /dev/null +++ b/advanced_opengl/4.face_culling/shaders/face_culling.frag @@ -0,0 +1,12 @@ +#version 330 core + +out vec4 frag_color; + +in vec2 tex_coords; + +uniform sampler2D texture1; + +void main(void) +{ + frag_color = texture(texture1, tex_coords); +} diff --git a/advanced_opengl/4.face_culling/shaders/face_culling.fs b/advanced_opengl/4.face_culling/shaders/face_culling.fs deleted file mode 100644 index f58c5d3..0000000 --- a/advanced_opengl/4.face_culling/shaders/face_culling.fs +++ /dev/null @@ -1,13 +0,0 @@ -#version 330 core - -out vec4 frag_color; - -in vec2 tex_coords; - -uniform sampler2D texture1; - -void -main(void) -{ - frag_color = texture(texture1, tex_coords); -} diff --git a/advanced_opengl/4.face_culling/shaders/face_culling.vert b/advanced_opengl/4.face_culling/shaders/face_culling.vert new file mode 100644 index 0000000..68b8fe2 --- /dev/null +++ b/advanced_opengl/4.face_culling/shaders/face_culling.vert @@ -0,0 +1,15 @@ +#version 330 core +layout(location = 0) in vec3 apos; +layout(location = 1) in vec2 atex_coords; + +uniform mat4 model; +uniform mat4 view; +uniform mat4 proj; + +out vec2 tex_coords; + +void main(void) +{ + gl_Position = proj*view*model*vec4(apos, 1.0); + tex_coords = atex_coords; +} diff --git a/advanced_opengl/4.face_culling/shaders/face_culling.vs b/advanced_opengl/4.face_culling/shaders/face_culling.vs deleted file mode 100644 index 62e71a2..0000000 --- a/advanced_opengl/4.face_culling/shaders/face_culling.vs +++ /dev/null @@ -1,16 +0,0 @@ -#version 330 core -layout(location = 0) in vec3 apos; -layout(location = 1) in vec2 atex_coords; - -uniform mat4 model; -uniform mat4 view; -uniform mat4 projection; - -out vec2 tex_coords; - -void -main(void) -{ - gl_Position = projection*view*model*vec4(apos, 1.0); - tex_coords = atex_coords; -} -- cgit v1.2.3