From f9ad6fa902c1167d7622ee7af2617d14b62bee21 Mon Sep 17 00:00:00 2001
From: pryazha <pryadeiniv@mail.ru>
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/3.blending/shaders/blending.frag | 12 ++++++++++++
 advanced_opengl/3.blending/shaders/blending.fs   | 13 -------------
 advanced_opengl/3.blending/shaders/blending.vert | 15 +++++++++++++++
 advanced_opengl/3.blending/shaders/blending.vs   | 16 ----------------
 advanced_opengl/3.blending/shaders/grass.frag    | 15 +++++++++++++++
 advanced_opengl/3.blending/shaders/grass.fs      | 17 -----------------
 6 files changed, 42 insertions(+), 46 deletions(-)
 create mode 100644 advanced_opengl/3.blending/shaders/blending.frag
 delete mode 100644 advanced_opengl/3.blending/shaders/blending.fs
 create mode 100644 advanced_opengl/3.blending/shaders/blending.vert
 delete mode 100644 advanced_opengl/3.blending/shaders/blending.vs
 create mode 100644 advanced_opengl/3.blending/shaders/grass.frag
 delete mode 100644 advanced_opengl/3.blending/shaders/grass.fs

(limited to 'advanced_opengl/3.blending/shaders')

diff --git a/advanced_opengl/3.blending/shaders/blending.frag b/advanced_opengl/3.blending/shaders/blending.frag
new file mode 100644
index 0000000..71892a7
--- /dev/null
+++ b/advanced_opengl/3.blending/shaders/blending.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/3.blending/shaders/blending.fs b/advanced_opengl/3.blending/shaders/blending.fs
deleted file mode 100644
index f58c5d3..0000000
--- a/advanced_opengl/3.blending/shaders/blending.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/3.blending/shaders/blending.vert b/advanced_opengl/3.blending/shaders/blending.vert
new file mode 100644
index 0000000..68b8fe2
--- /dev/null
+++ b/advanced_opengl/3.blending/shaders/blending.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/3.blending/shaders/blending.vs b/advanced_opengl/3.blending/shaders/blending.vs
deleted file mode 100644
index 62e71a2..0000000
--- a/advanced_opengl/3.blending/shaders/blending.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;
-}
diff --git a/advanced_opengl/3.blending/shaders/grass.frag b/advanced_opengl/3.blending/shaders/grass.frag
new file mode 100644
index 0000000..85c806f
--- /dev/null
+++ b/advanced_opengl/3.blending/shaders/grass.frag
@@ -0,0 +1,15 @@
+#version 330 core
+
+out vec4 frag_color;
+
+in vec2 tex_coords;
+
+uniform sampler2D texture1;
+
+void main(void)
+{
+    vec4 tex_color = texture(texture1, tex_coords);
+    if (tex_color.a <= 0.2)
+        discard;
+    frag_color = tex_color;
+}
diff --git a/advanced_opengl/3.blending/shaders/grass.fs b/advanced_opengl/3.blending/shaders/grass.fs
deleted file mode 100644
index cecb0ce..0000000
--- a/advanced_opengl/3.blending/shaders/grass.fs
+++ /dev/null
@@ -1,17 +0,0 @@
-#version 330 core
-
-out vec4 frag_color;
-
-in vec2 tex_coords;
-
-uniform sampler2D texture1;
-
-void
-main(void)
-{
-    vec4 tex_color = texture(texture1, tex_coords);
-    if (tex_color.a <= 0.2) {
-        discard;
-    }
-    frag_color = tex_color;
-}
-- 
cgit v1.2.3