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/6.cubemaps/shaders/cube.frag       | 12 ++++++++++++
 advanced_opengl/6.cubemaps/shaders/cube.fs         | 13 -------------
 advanced_opengl/6.cubemaps/shaders/cube.vert       | 16 ++++++++++++++++
 advanced_opengl/6.cubemaps/shaders/cube.vs         | 17 -----------------
 advanced_opengl/6.cubemaps/shaders/reflection.frag | 16 ++++++++++++++++
 advanced_opengl/6.cubemaps/shaders/reflection.fs   | 17 -----------------
 advanced_opengl/6.cubemaps/shaders/reflection.vert | 18 ++++++++++++++++++
 advanced_opengl/6.cubemaps/shaders/reflection.vs   | 19 -------------------
 advanced_opengl/6.cubemaps/shaders/refraction.frag | 17 +++++++++++++++++
 advanced_opengl/6.cubemaps/shaders/refraction.fs   | 18 ------------------
 advanced_opengl/6.cubemaps/shaders/refraction.vert | 18 ++++++++++++++++++
 advanced_opengl/6.cubemaps/shaders/refraction.vs   | 19 -------------------
 advanced_opengl/6.cubemaps/shaders/skybox.frag     | 12 ++++++++++++
 advanced_opengl/6.cubemaps/shaders/skybox.fs       | 13 -------------
 advanced_opengl/6.cubemaps/shaders/skybox.vert     | 15 +++++++++++++++
 advanced_opengl/6.cubemaps/shaders/skybox.vs       | 16 ----------------
 16 files changed, 124 insertions(+), 132 deletions(-)
 create mode 100644 advanced_opengl/6.cubemaps/shaders/cube.frag
 delete mode 100644 advanced_opengl/6.cubemaps/shaders/cube.fs
 create mode 100644 advanced_opengl/6.cubemaps/shaders/cube.vert
 delete mode 100644 advanced_opengl/6.cubemaps/shaders/cube.vs
 create mode 100644 advanced_opengl/6.cubemaps/shaders/reflection.frag
 delete mode 100644 advanced_opengl/6.cubemaps/shaders/reflection.fs
 create mode 100644 advanced_opengl/6.cubemaps/shaders/reflection.vert
 delete mode 100644 advanced_opengl/6.cubemaps/shaders/reflection.vs
 create mode 100644 advanced_opengl/6.cubemaps/shaders/refraction.frag
 delete mode 100644 advanced_opengl/6.cubemaps/shaders/refraction.fs
 create mode 100644 advanced_opengl/6.cubemaps/shaders/refraction.vert
 delete mode 100644 advanced_opengl/6.cubemaps/shaders/refraction.vs
 create mode 100644 advanced_opengl/6.cubemaps/shaders/skybox.frag
 delete mode 100644 advanced_opengl/6.cubemaps/shaders/skybox.fs
 create mode 100644 advanced_opengl/6.cubemaps/shaders/skybox.vert
 delete mode 100644 advanced_opengl/6.cubemaps/shaders/skybox.vs

(limited to 'advanced_opengl/6.cubemaps/shaders')

diff --git a/advanced_opengl/6.cubemaps/shaders/cube.frag b/advanced_opengl/6.cubemaps/shaders/cube.frag
new file mode 100644
index 0000000..71892a7
--- /dev/null
+++ b/advanced_opengl/6.cubemaps/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/6.cubemaps/shaders/cube.fs b/advanced_opengl/6.cubemaps/shaders/cube.fs
deleted file mode 100644
index f58c5d3..0000000
--- a/advanced_opengl/6.cubemaps/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/6.cubemaps/shaders/cube.vert b/advanced_opengl/6.cubemaps/shaders/cube.vert
new file mode 100644
index 0000000..2436f35
--- /dev/null
+++ b/advanced_opengl/6.cubemaps/shaders/cube.vert
@@ -0,0 +1,16 @@
+#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/6.cubemaps/shaders/cube.vs b/advanced_opengl/6.cubemaps/shaders/cube.vs
deleted file mode 100644
index aea5c2c..0000000
--- a/advanced_opengl/6.cubemaps/shaders/cube.vs
+++ /dev/null
@@ -1,17 +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/6.cubemaps/shaders/reflection.frag b/advanced_opengl/6.cubemaps/shaders/reflection.frag
new file mode 100644
index 0000000..72b1c0d
--- /dev/null
+++ b/advanced_opengl/6.cubemaps/shaders/reflection.frag
@@ -0,0 +1,16 @@
+#version 330 core
+
+in vec3 pos;
+in vec3 normal;
+
+out vec4 frag_color;
+
+uniform vec3 camera_pos;
+uniform samplerCube skybox;
+
+void main(void)
+{
+    vec3 i = pos-camera_pos;
+    vec3 r = reflect(i, normalize(normal));
+    frag_color = texture(skybox, r);
+}
diff --git a/advanced_opengl/6.cubemaps/shaders/reflection.fs b/advanced_opengl/6.cubemaps/shaders/reflection.fs
deleted file mode 100644
index 3723ea9..0000000
--- a/advanced_opengl/6.cubemaps/shaders/reflection.fs
+++ /dev/null
@@ -1,17 +0,0 @@
-#version 330 core
-
-in vec3 pos;
-in vec3 normal;
-
-out vec4 frag_color;
-
-uniform vec3 camera_pos;
-uniform samplerCube skybox;
-
-void
-main(void)
-{
-    vec3 i = pos-camera_pos;
-    vec3 r = reflect(i, normalize(normal));
-    frag_color = texture(skybox, r);
-}
diff --git a/advanced_opengl/6.cubemaps/shaders/reflection.vert b/advanced_opengl/6.cubemaps/shaders/reflection.vert
new file mode 100644
index 0000000..d7070f2
--- /dev/null
+++ b/advanced_opengl/6.cubemaps/shaders/reflection.vert
@@ -0,0 +1,18 @@
+#version 330 core
+
+layout(location = 0) in vec3 apos;
+layout(location = 1) in vec3 anormal;
+
+out vec3 pos;
+out vec3 normal;
+
+uniform mat4 model;
+uniform mat4 view;
+uniform mat4 proj;
+
+void main(void)
+{
+    pos = vec3(model*vec4(apos, 1.0));
+    normal = mat3(transpose(inverse(model)))*anormal;
+    gl_Position = proj*view*model*vec4(apos, 1.0);
+}
diff --git a/advanced_opengl/6.cubemaps/shaders/reflection.vs b/advanced_opengl/6.cubemaps/shaders/reflection.vs
deleted file mode 100644
index c9a0698..0000000
--- a/advanced_opengl/6.cubemaps/shaders/reflection.vs
+++ /dev/null
@@ -1,19 +0,0 @@
-#version 330 core
-
-layout(location = 0) in vec3 apos;
-layout(location = 1) in vec3 anormal;
-
-out vec3 pos;
-out vec3 normal;
-
-uniform mat4 model;
-uniform mat4 view;
-uniform mat4 projection;
-
-void
-main(void)
-{
-    pos = vec3(model*vec4(apos, 1.0));
-    normal = mat3(transpose(inverse(model)))*anormal;
-    gl_Position = projection*view*model*vec4(apos, 1.0);
-}
diff --git a/advanced_opengl/6.cubemaps/shaders/refraction.frag b/advanced_opengl/6.cubemaps/shaders/refraction.frag
new file mode 100644
index 0000000..fa01b2c
--- /dev/null
+++ b/advanced_opengl/6.cubemaps/shaders/refraction.frag
@@ -0,0 +1,17 @@
+#version 330 core
+
+in vec3 pos;
+in vec3 normal;
+
+out vec4 frag_color;
+
+uniform vec3 camera_pos;
+uniform samplerCube skybox;
+
+void main(void)
+{
+    float ratio = 1.0/1.52;
+    vec3 i = pos-camera_pos;
+    vec3 r = refract(i, normalize(normal), ratio);
+    frag_color = texture(skybox, r);
+}
diff --git a/advanced_opengl/6.cubemaps/shaders/refraction.fs b/advanced_opengl/6.cubemaps/shaders/refraction.fs
deleted file mode 100644
index ef8c415..0000000
--- a/advanced_opengl/6.cubemaps/shaders/refraction.fs
+++ /dev/null
@@ -1,18 +0,0 @@
-#version 330 core
-
-in vec3 pos;
-in vec3 normal;
-
-out vec4 frag_color;
-
-uniform vec3 camera_pos;
-uniform samplerCube skybox;
-
-void
-main(void)
-{
-    float ratio = 1.0/1.52;
-    vec3 i = pos-camera_pos;
-    vec3 r = refract(i, normalize(normal), ratio);
-    frag_color = texture(skybox, r);
-}
diff --git a/advanced_opengl/6.cubemaps/shaders/refraction.vert b/advanced_opengl/6.cubemaps/shaders/refraction.vert
new file mode 100644
index 0000000..d7070f2
--- /dev/null
+++ b/advanced_opengl/6.cubemaps/shaders/refraction.vert
@@ -0,0 +1,18 @@
+#version 330 core
+
+layout(location = 0) in vec3 apos;
+layout(location = 1) in vec3 anormal;
+
+out vec3 pos;
+out vec3 normal;
+
+uniform mat4 model;
+uniform mat4 view;
+uniform mat4 proj;
+
+void main(void)
+{
+    pos = vec3(model*vec4(apos, 1.0));
+    normal = mat3(transpose(inverse(model)))*anormal;
+    gl_Position = proj*view*model*vec4(apos, 1.0);
+}
diff --git a/advanced_opengl/6.cubemaps/shaders/refraction.vs b/advanced_opengl/6.cubemaps/shaders/refraction.vs
deleted file mode 100644
index c9a0698..0000000
--- a/advanced_opengl/6.cubemaps/shaders/refraction.vs
+++ /dev/null
@@ -1,19 +0,0 @@
-#version 330 core
-
-layout(location = 0) in vec3 apos;
-layout(location = 1) in vec3 anormal;
-
-out vec3 pos;
-out vec3 normal;
-
-uniform mat4 model;
-uniform mat4 view;
-uniform mat4 projection;
-
-void
-main(void)
-{
-    pos = vec3(model*vec4(apos, 1.0));
-    normal = mat3(transpose(inverse(model)))*anormal;
-    gl_Position = projection*view*model*vec4(apos, 1.0);
-}
diff --git a/advanced_opengl/6.cubemaps/shaders/skybox.frag b/advanced_opengl/6.cubemaps/shaders/skybox.frag
new file mode 100644
index 0000000..22be301
--- /dev/null
+++ b/advanced_opengl/6.cubemaps/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/6.cubemaps/shaders/skybox.fs b/advanced_opengl/6.cubemaps/shaders/skybox.fs
deleted file mode 100644
index bf69c8b..0000000
--- a/advanced_opengl/6.cubemaps/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/6.cubemaps/shaders/skybox.vert b/advanced_opengl/6.cubemaps/shaders/skybox.vert
new file mode 100644
index 0000000..c7d91c9
--- /dev/null
+++ b/advanced_opengl/6.cubemaps/shaders/skybox.vert
@@ -0,0 +1,15 @@
+#version 330 core
+
+layout(location = 0) in vec3 apos;
+
+out vec3 tex_coords;
+
+uniform mat4 view;
+uniform mat4 proj;
+
+void main(void)
+{
+    tex_coords = apos;
+    vec4 pos = proj*view*vec4(apos, 1.0);
+    gl_Position = pos.xyww;
+}
diff --git a/advanced_opengl/6.cubemaps/shaders/skybox.vs b/advanced_opengl/6.cubemaps/shaders/skybox.vs
deleted file mode 100644
index c790148..0000000
--- a/advanced_opengl/6.cubemaps/shaders/skybox.vs
+++ /dev/null
@@ -1,16 +0,0 @@
-#version 330 core
-
-layout(location = 0) in vec3 apos;
-
-out vec3 tex_coords;
-
-uniform mat4 view;
-uniform mat4 projection;
-
-void
-main(void)
-{
-    tex_coords = apos;
-    vec4 pos = projection*view*vec4(apos, 1.0);
-    gl_Position = pos.xyww;
-}
-- 
cgit v1.2.3