diff options
author | pryazha <pryadeiniv@mail.ru> | 2025-02-19 22:26:48 +0500 |
---|---|---|
committer | pryazha <pryadeiniv@mail.ru> | 2025-02-19 22:26:48 +0500 |
commit | f9ad6fa902c1167d7622ee7af2617d14b62bee21 (patch) | |
tree | 9d78792cf360ed871616a9ea66c4237018292aa7 /advanced_opengl/4.face_culling/shaders | |
parent | 926cbd0d49890772f911e6a6bedb7835605ced89 (diff) |
quite a lot of changes that I, of course, are not going to describe;)
Diffstat (limited to 'advanced_opengl/4.face_culling/shaders')
-rw-r--r-- | advanced_opengl/4.face_culling/shaders/face_culling.frag (renamed from advanced_opengl/4.face_culling/shaders/face_culling.fs) | 3 | ||||
-rw-r--r-- | advanced_opengl/4.face_culling/shaders/face_culling.vert (renamed from advanced_opengl/4.face_culling/shaders/face_culling.vs) | 7 |
2 files changed, 4 insertions, 6 deletions
diff --git a/advanced_opengl/4.face_culling/shaders/face_culling.fs b/advanced_opengl/4.face_culling/shaders/face_culling.frag index f58c5d3..71892a7 100644 --- a/advanced_opengl/4.face_culling/shaders/face_culling.fs +++ b/advanced_opengl/4.face_culling/shaders/face_culling.frag @@ -6,8 +6,7 @@ in vec2 tex_coords; uniform sampler2D texture1; -void -main(void) +void main(void) { frag_color = texture(texture1, tex_coords); } diff --git a/advanced_opengl/4.face_culling/shaders/face_culling.vs b/advanced_opengl/4.face_culling/shaders/face_culling.vert index 62e71a2..68b8fe2 100644 --- a/advanced_opengl/4.face_culling/shaders/face_culling.vs +++ b/advanced_opengl/4.face_culling/shaders/face_culling.vert @@ -4,13 +4,12 @@ layout(location = 1) in vec2 atex_coords; uniform mat4 model; uniform mat4 view; -uniform mat4 projection; +uniform mat4 proj; out vec2 tex_coords; -void -main(void) +void main(void) { - gl_Position = projection*view*model*vec4(apos, 1.0); + gl_Position = proj*view*model*vec4(apos, 1.0); tex_coords = atex_coords; } |