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;)

---
 .../7.uniform_buffer/shaders/color_cube.frag        |  8 ++++++++
 .../7.uniform_buffer/shaders/color_cube.fs          |  9 ---------
 .../7.uniform_buffer/shaders/color_cube.vert        | 15 +++++++++++++++
 .../7.uniform_buffer/shaders/color_cube.vs          | 16 ----------------
 advanced_opengl/7.uniform_buffer/shaders/cube.frag  | 12 ++++++++++++
 advanced_opengl/7.uniform_buffer/shaders/cube.fs    | 13 -------------
 advanced_opengl/7.uniform_buffer/shaders/cube.vert  | 20 ++++++++++++++++++++
 advanced_opengl/7.uniform_buffer/shaders/cube.vs    | 21 ---------------------
 .../7.uniform_buffer/shaders/skybox.frag            | 12 ++++++++++++
 advanced_opengl/7.uniform_buffer/shaders/skybox.fs  | 13 -------------
 .../7.uniform_buffer/shaders/skybox.vert            | 18 ++++++++++++++++++
 advanced_opengl/7.uniform_buffer/shaders/skybox.vs  | 19 -------------------
 12 files changed, 85 insertions(+), 91 deletions(-)
 create mode 100644 advanced_opengl/7.uniform_buffer/shaders/color_cube.frag
 delete mode 100644 advanced_opengl/7.uniform_buffer/shaders/color_cube.fs
 create mode 100644 advanced_opengl/7.uniform_buffer/shaders/color_cube.vert
 delete mode 100644 advanced_opengl/7.uniform_buffer/shaders/color_cube.vs
 create mode 100644 advanced_opengl/7.uniform_buffer/shaders/cube.frag
 delete mode 100644 advanced_opengl/7.uniform_buffer/shaders/cube.fs
 create mode 100644 advanced_opengl/7.uniform_buffer/shaders/cube.vert
 delete mode 100644 advanced_opengl/7.uniform_buffer/shaders/cube.vs
 create mode 100644 advanced_opengl/7.uniform_buffer/shaders/skybox.frag
 delete mode 100644 advanced_opengl/7.uniform_buffer/shaders/skybox.fs
 create mode 100644 advanced_opengl/7.uniform_buffer/shaders/skybox.vert
 delete mode 100644 advanced_opengl/7.uniform_buffer/shaders/skybox.vs

(limited to 'advanced_opengl/7.uniform_buffer/shaders')

diff --git a/advanced_opengl/7.uniform_buffer/shaders/color_cube.frag b/advanced_opengl/7.uniform_buffer/shaders/color_cube.frag
new file mode 100644
index 0000000..d40d866
--- /dev/null
+++ b/advanced_opengl/7.uniform_buffer/shaders/color_cube.frag
@@ -0,0 +1,8 @@
+#version 330 core
+
+out vec4 frag_color;
+
+void main(void)
+{
+    frag_color = vec4(1.0, 0.0, 0.0, 1.0);
+}
diff --git a/advanced_opengl/7.uniform_buffer/shaders/color_cube.fs b/advanced_opengl/7.uniform_buffer/shaders/color_cube.fs
deleted file mode 100644
index fbbafbf..0000000
--- a/advanced_opengl/7.uniform_buffer/shaders/color_cube.fs
+++ /dev/null
@@ -1,9 +0,0 @@
-#version 330 core
-
-out vec4 frag_color;
-
-void
-main(void)
-{
-    frag_color = vec4(1.0, 0.0, 0.0, 1.0);
-}
diff --git a/advanced_opengl/7.uniform_buffer/shaders/color_cube.vert b/advanced_opengl/7.uniform_buffer/shaders/color_cube.vert
new file mode 100644
index 0000000..67226f8
--- /dev/null
+++ b/advanced_opengl/7.uniform_buffer/shaders/color_cube.vert
@@ -0,0 +1,15 @@
+#version 330 core
+layout(location = 0) in vec3 apos;
+
+layout(std140) uniform Matrices
+{
+    mat4 proj;
+    mat4 view;
+};
+
+uniform mat4 model;
+
+void main(void)
+{
+    gl_Position = proj*view*model*vec4(apos, 1.0);
+}
diff --git a/advanced_opengl/7.uniform_buffer/shaders/color_cube.vs b/advanced_opengl/7.uniform_buffer/shaders/color_cube.vs
deleted file mode 100644
index 17a3448..0000000
--- a/advanced_opengl/7.uniform_buffer/shaders/color_cube.vs
+++ /dev/null
@@ -1,16 +0,0 @@
-#version 330 core
-layout(location = 0) in vec3 apos;
-
-layout(std140) uniform Matrices
-{
-    mat4 projection;
-    mat4 view;
-};
-
-uniform mat4 model;
-
-void
-main(void)
-{
-    gl_Position = projection*view*model*vec4(apos, 1.0);
-}
diff --git a/advanced_opengl/7.uniform_buffer/shaders/cube.frag b/advanced_opengl/7.uniform_buffer/shaders/cube.frag
new file mode 100644
index 0000000..71892a7
--- /dev/null
+++ b/advanced_opengl/7.uniform_buffer/shaders/cube.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/7.uniform_buffer/shaders/cube.fs b/advanced_opengl/7.uniform_buffer/shaders/cube.fs
deleted file mode 100644
index f58c5d3..0000000
--- a/advanced_opengl/7.uniform_buffer/shaders/cube.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/7.uniform_buffer/shaders/cube.vert b/advanced_opengl/7.uniform_buffer/shaders/cube.vert
new file mode 100644
index 0000000..ec90f37
--- /dev/null
+++ b/advanced_opengl/7.uniform_buffer/shaders/cube.vert
@@ -0,0 +1,20 @@
+#version 330 core
+
+layout(location = 0) in vec3 apos;
+layout(location = 1) in vec2 atex_coords;
+
+layout(std140) uniform Matrices
+{
+    uniform mat4 proj;
+    uniform mat4 view;
+};
+
+uniform mat4 model;
+
+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/7.uniform_buffer/shaders/cube.vs b/advanced_opengl/7.uniform_buffer/shaders/cube.vs
deleted file mode 100644
index 054164d..0000000
--- a/advanced_opengl/7.uniform_buffer/shaders/cube.vs
+++ /dev/null
@@ -1,21 +0,0 @@
-#version 330 core
-
-layout(location = 0) in vec3 apos;
-layout(location = 1) in vec2 atex_coords;
-
-layout(std140) uniform Matrices
-{
-    uniform mat4 projection;
-    uniform mat4 view;
-};
-
-uniform mat4 model;
-
-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/7.uniform_buffer/shaders/skybox.frag b/advanced_opengl/7.uniform_buffer/shaders/skybox.frag
new file mode 100644
index 0000000..22be301
--- /dev/null
+++ b/advanced_opengl/7.uniform_buffer/shaders/skybox.frag
@@ -0,0 +1,12 @@
+#version 330 core
+
+in vec3 tex_coords;
+
+out vec4 frag_color;
+
+uniform samplerCube skybox;
+
+void main(void)
+{
+    frag_color = texture(skybox, tex_coords);
+}
diff --git a/advanced_opengl/7.uniform_buffer/shaders/skybox.fs b/advanced_opengl/7.uniform_buffer/shaders/skybox.fs
deleted file mode 100644
index bf69c8b..0000000
--- a/advanced_opengl/7.uniform_buffer/shaders/skybox.fs
+++ /dev/null
@@ -1,13 +0,0 @@
-#version 330 core
-
-in vec3 tex_coords;
-
-out vec4 frag_color;
-
-uniform samplerCube skybox;
-
-void
-main(void)
-{
-    frag_color = texture(skybox, tex_coords);
-}
diff --git a/advanced_opengl/7.uniform_buffer/shaders/skybox.vert b/advanced_opengl/7.uniform_buffer/shaders/skybox.vert
new file mode 100644
index 0000000..ddbeb21
--- /dev/null
+++ b/advanced_opengl/7.uniform_buffer/shaders/skybox.vert
@@ -0,0 +1,18 @@
+#version 330 core
+
+layout(location = 0) in vec3 apos;
+
+out vec3 tex_coords;
+
+layout(std140) uniform Matrices
+{
+    uniform mat4 proj;
+    uniform mat4 view;
+};
+
+void main(void)
+{
+    tex_coords = apos;
+    vec4 pos = proj*view*vec4(apos, 1.0);
+    gl_Position = pos.xyww;
+}
diff --git a/advanced_opengl/7.uniform_buffer/shaders/skybox.vs b/advanced_opengl/7.uniform_buffer/shaders/skybox.vs
deleted file mode 100644
index 03b2171..0000000
--- a/advanced_opengl/7.uniform_buffer/shaders/skybox.vs
+++ /dev/null
@@ -1,19 +0,0 @@
-#version 330 core
-
-layout(location = 0) in vec3 apos;
-
-out vec3 tex_coords;
-
-layout(std140) uniform Matrices
-{
-    uniform mat4 projection;
-    uniform mat4 view;
-};
-
-void
-main(void)
-{
-    tex_coords = apos;
-    vec4 pos = projection*view*vec4(apos, 1.0);
-    gl_Position = pos.xyww;
-}
-- 
cgit v1.2.3