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

---
 .../8.geometry_shader/shaders/base.frag            | 10 +++++
 advanced_opengl/8.geometry_shader/shaders/base.fs  | 11 ------
 .../8.geometry_shader/shaders/base.geom            | 26 +++++++++++++
 advanced_opengl/8.geometry_shader/shaders/base.gs  | 27 -------------
 .../8.geometry_shader/shaders/base.vert            | 13 +++++++
 advanced_opengl/8.geometry_shader/shaders/base.vs  | 14 -------
 .../8.geometry_shader/shaders/basic.frag           | 12 ++++++
 advanced_opengl/8.geometry_shader/shaders/basic.fs | 13 -------
 .../8.geometry_shader/shaders/basic.vert           | 15 ++++++++
 advanced_opengl/8.geometry_shader/shaders/basic.vs | 16 --------
 .../8.geometry_shader/shaders/explosion.frag       | 12 ++++++
 .../8.geometry_shader/shaders/explosion.fs         | 13 -------
 .../8.geometry_shader/shaders/explosion.geom       | 41 ++++++++++++++++++++
 .../8.geometry_shader/shaders/explosion.gs         | 44 ----------------------
 .../8.geometry_shader/shaders/explosion.vert       | 17 +++++++++
 .../8.geometry_shader/shaders/explosion.vs         | 18 ---------
 .../8.geometry_shader/shaders/normals.frag         |  8 ++++
 .../8.geometry_shader/shaders/normals.fs           |  9 -----
 .../8.geometry_shader/shaders/normals.geom         | 42 +++++++++++++++++++++
 .../8.geometry_shader/shaders/normals.gs           | 44 ----------------------
 .../8.geometry_shader/shaders/normals.vert         | 17 +++++++++
 .../8.geometry_shader/shaders/normals.vs           | 18 ---------
 22 files changed, 213 insertions(+), 227 deletions(-)
 create mode 100644 advanced_opengl/8.geometry_shader/shaders/base.frag
 delete mode 100644 advanced_opengl/8.geometry_shader/shaders/base.fs
 create mode 100644 advanced_opengl/8.geometry_shader/shaders/base.geom
 delete mode 100644 advanced_opengl/8.geometry_shader/shaders/base.gs
 create mode 100644 advanced_opengl/8.geometry_shader/shaders/base.vert
 delete mode 100644 advanced_opengl/8.geometry_shader/shaders/base.vs
 create mode 100644 advanced_opengl/8.geometry_shader/shaders/basic.frag
 delete mode 100644 advanced_opengl/8.geometry_shader/shaders/basic.fs
 create mode 100644 advanced_opengl/8.geometry_shader/shaders/basic.vert
 delete mode 100644 advanced_opengl/8.geometry_shader/shaders/basic.vs
 create mode 100644 advanced_opengl/8.geometry_shader/shaders/explosion.frag
 delete mode 100644 advanced_opengl/8.geometry_shader/shaders/explosion.fs
 create mode 100644 advanced_opengl/8.geometry_shader/shaders/explosion.geom
 delete mode 100644 advanced_opengl/8.geometry_shader/shaders/explosion.gs
 create mode 100644 advanced_opengl/8.geometry_shader/shaders/explosion.vert
 delete mode 100644 advanced_opengl/8.geometry_shader/shaders/explosion.vs
 create mode 100644 advanced_opengl/8.geometry_shader/shaders/normals.frag
 delete mode 100644 advanced_opengl/8.geometry_shader/shaders/normals.fs
 create mode 100644 advanced_opengl/8.geometry_shader/shaders/normals.geom
 delete mode 100644 advanced_opengl/8.geometry_shader/shaders/normals.gs
 create mode 100644 advanced_opengl/8.geometry_shader/shaders/normals.vert
 delete mode 100644 advanced_opengl/8.geometry_shader/shaders/normals.vs

(limited to 'advanced_opengl/8.geometry_shader/shaders')

diff --git a/advanced_opengl/8.geometry_shader/shaders/base.frag b/advanced_opengl/8.geometry_shader/shaders/base.frag
new file mode 100644
index 0000000..70d5585
--- /dev/null
+++ b/advanced_opengl/8.geometry_shader/shaders/base.frag
@@ -0,0 +1,10 @@
+#version 330 core
+
+in vec3 fcolor;
+
+out vec4 frag_color;
+
+void main(void)
+{
+    frag_color = vec4(fcolor, 1.0);
+}
diff --git a/advanced_opengl/8.geometry_shader/shaders/base.fs b/advanced_opengl/8.geometry_shader/shaders/base.fs
deleted file mode 100644
index 73897db..0000000
--- a/advanced_opengl/8.geometry_shader/shaders/base.fs
+++ /dev/null
@@ -1,11 +0,0 @@
-#version 330 core
-
-in vec3 fcolor;
-
-out vec4 frag_color;
-
-void
-main(void)
-{
-    frag_color = vec4(fcolor, 1.0);
-}
diff --git a/advanced_opengl/8.geometry_shader/shaders/base.geom b/advanced_opengl/8.geometry_shader/shaders/base.geom
new file mode 100644
index 0000000..10d5c45
--- /dev/null
+++ b/advanced_opengl/8.geometry_shader/shaders/base.geom
@@ -0,0 +1,26 @@
+#version 330 core
+layout(points) in;
+layout(triangle_strip, max_vertices = 5) out;
+
+in VS_OUT {
+    vec3 color;
+} gs_in[];
+
+out vec3 fcolor;
+
+void main(void)
+{
+    fcolor = gs_in[0].color;
+    gl_Position = gl_in[0].gl_Position+vec4(-0.2, -0.2, 0.0, 0.0);
+    EmitVertex();
+    gl_Position = gl_in[0].gl_Position+vec4(0.2, -0.2, 0.0, 0.0);
+    EmitVertex();
+    gl_Position = gl_in[0].gl_Position+vec4(-0.2, 0.2, 0.0, 0.0);
+    EmitVertex();
+    gl_Position = gl_in[0].gl_Position+vec4(0.2, 0.2, 0.0, 0.0);
+    EmitVertex();
+    fcolor = vec3(1.0, 1.0, 1.0);
+    gl_Position = gl_in[0].gl_Position+vec4(0.0, 0.4, 0.0, 0.0);
+    EmitVertex();
+    EndPrimitive();
+}
diff --git a/advanced_opengl/8.geometry_shader/shaders/base.gs b/advanced_opengl/8.geometry_shader/shaders/base.gs
deleted file mode 100644
index 6b140c5..0000000
--- a/advanced_opengl/8.geometry_shader/shaders/base.gs
+++ /dev/null
@@ -1,27 +0,0 @@
-#version 330 core
-layout(points) in;
-layout(triangle_strip, max_vertices = 5) out;
-
-in VS_OUT {
-    vec3 color;
-} gs_in[];
-
-out vec3 fcolor;
-
-void
-main(void)
-{
-    fcolor = gs_in[0].color;
-    gl_Position = gl_in[0].gl_Position+vec4(-0.2, -0.2, 0.0, 0.0);
-    EmitVertex();
-    gl_Position = gl_in[0].gl_Position+vec4(0.2, -0.2, 0.0, 0.0);
-    EmitVertex();
-    gl_Position = gl_in[0].gl_Position+vec4(-0.2, 0.2, 0.0, 0.0);
-    EmitVertex();
-    gl_Position = gl_in[0].gl_Position+vec4(0.2, 0.2, 0.0, 0.0);
-    EmitVertex();
-    fcolor = vec3(1.0, 1.0, 1.0);
-    gl_Position = gl_in[0].gl_Position+vec4(0.0, 0.4, 0.0, 0.0);
-    EmitVertex();
-    EndPrimitive();
-}
diff --git a/advanced_opengl/8.geometry_shader/shaders/base.vert b/advanced_opengl/8.geometry_shader/shaders/base.vert
new file mode 100644
index 0000000..5178f92
--- /dev/null
+++ b/advanced_opengl/8.geometry_shader/shaders/base.vert
@@ -0,0 +1,13 @@
+#version 330 core
+layout(location = 0) in vec2 apos;
+layout(location = 1) in vec3 acolor;
+
+out VS_OUT {
+    vec3 color;
+} vs_out;
+
+void main(void)
+{
+    vs_out.color = acolor;
+    gl_Position = vec4(apos, 0.0, 1.0);
+}
diff --git a/advanced_opengl/8.geometry_shader/shaders/base.vs b/advanced_opengl/8.geometry_shader/shaders/base.vs
deleted file mode 100644
index 9ad9e7a..0000000
--- a/advanced_opengl/8.geometry_shader/shaders/base.vs
+++ /dev/null
@@ -1,14 +0,0 @@
-#version 330 core
-layout(location = 0) in vec2 apos;
-layout(location = 1) in vec3 acolor;
-
-out VS_OUT {
-    vec3 color;
-} vs_out;
-
-void
-main(void)
-{
-    vs_out.color = acolor;
-    gl_Position = vec4(apos, 0.0, 1.0);
-}
diff --git a/advanced_opengl/8.geometry_shader/shaders/basic.frag b/advanced_opengl/8.geometry_shader/shaders/basic.frag
new file mode 100644
index 0000000..09244b5
--- /dev/null
+++ b/advanced_opengl/8.geometry_shader/shaders/basic.frag
@@ -0,0 +1,12 @@
+#version 330 core
+
+in vec2 tex_coords;
+
+out vec4 frag_color;
+
+uniform sampler2D texture1;
+
+void main(void)
+{
+    frag_color = texture(texture1, tex_coords);
+}
diff --git a/advanced_opengl/8.geometry_shader/shaders/basic.fs b/advanced_opengl/8.geometry_shader/shaders/basic.fs
deleted file mode 100644
index bdd4b9a..0000000
--- a/advanced_opengl/8.geometry_shader/shaders/basic.fs
+++ /dev/null
@@ -1,13 +0,0 @@
-#version 330 core
-
-in vec2 tex_coords;
-
-out vec4 frag_color;
-
-uniform sampler2D texture1;
-
-void
-main(void)
-{
-    frag_color = texture(texture1, tex_coords);
-}
diff --git a/advanced_opengl/8.geometry_shader/shaders/basic.vert b/advanced_opengl/8.geometry_shader/shaders/basic.vert
new file mode 100644
index 0000000..10ce805
--- /dev/null
+++ b/advanced_opengl/8.geometry_shader/shaders/basic.vert
@@ -0,0 +1,15 @@
+#version 330 core
+layout(location = 0) in vec3 apos;
+layout(location = 2) in vec2 atex_coords;
+
+out vec2 tex_coords;
+
+uniform mat4 model;
+uniform mat4 view;
+uniform mat4 proj;
+
+void main(void)
+{
+    gl_Position = proj*view*model*vec4(apos, 1.0);
+    tex_coords = atex_coords;
+}
diff --git a/advanced_opengl/8.geometry_shader/shaders/basic.vs b/advanced_opengl/8.geometry_shader/shaders/basic.vs
deleted file mode 100644
index 77e8b70..0000000
--- a/advanced_opengl/8.geometry_shader/shaders/basic.vs
+++ /dev/null
@@ -1,16 +0,0 @@
-#version 330 core
-layout(location = 0) in vec3 apos;
-layout(location = 2) in vec2 atex_coords;
-
-out vec2 tex_coords;
-
-uniform mat4 model;
-uniform mat4 view;
-uniform mat4 projection;
-
-void
-main(void)
-{
-    gl_Position = projection*view*model*vec4(apos, 1.0);
-    tex_coords = atex_coords;
-}
diff --git a/advanced_opengl/8.geometry_shader/shaders/explosion.frag b/advanced_opengl/8.geometry_shader/shaders/explosion.frag
new file mode 100644
index 0000000..b751460
--- /dev/null
+++ b/advanced_opengl/8.geometry_shader/shaders/explosion.frag
@@ -0,0 +1,12 @@
+#version 330 core
+
+in vec2 ftex_coords;
+
+out vec4 frag_color;
+
+uniform sampler2D texture0;
+
+void main(void)
+{
+    frag_color = texture(texture0, ftex_coords);
+}
diff --git a/advanced_opengl/8.geometry_shader/shaders/explosion.fs b/advanced_opengl/8.geometry_shader/shaders/explosion.fs
deleted file mode 100644
index 70e7151..0000000
--- a/advanced_opengl/8.geometry_shader/shaders/explosion.fs
+++ /dev/null
@@ -1,13 +0,0 @@
-#version 330 core
-
-in vec2 ftex_coords;
-
-out vec4 frag_color;
-
-uniform sampler2D texture0;
-
-void
-main(void)
-{
-    frag_color = texture(texture0, ftex_coords);
-}
diff --git a/advanced_opengl/8.geometry_shader/shaders/explosion.geom b/advanced_opengl/8.geometry_shader/shaders/explosion.geom
new file mode 100644
index 0000000..e708591
--- /dev/null
+++ b/advanced_opengl/8.geometry_shader/shaders/explosion.geom
@@ -0,0 +1,41 @@
+#version 330 core
+layout(triangles) in;
+layout(triangle_strip, max_vertices = 3) out;
+
+in VS_OUT {
+    vec2 gtex_coords;
+} gs_in[];
+
+out vec2 ftex_coords;
+
+uniform float time;
+
+vec3 get_normal(void)
+{
+    vec3 a = vec3(gl_in[0].gl_Position)-vec3(gl_in[1].gl_Position);
+    vec3 b = vec3(gl_in[2].gl_Position)-vec3(gl_in[1].gl_Position);
+    return(normalize(cross(a, b)));
+}
+
+vec4 explode(vec4 position, vec3 normal)
+{
+    float magnitude = 0.2;
+    vec3 direction = normal*magnitude*((sin(time)+1.0)/2.0);
+    vec4 result = position+vec4(direction, 0.0);
+    return(result);
+}
+
+void main(void)
+{
+    vec3 normal = get_normal();
+    gl_Position = explode(gl_in[0].gl_Position, normal);
+    ftex_coords = gs_in[0].gtex_coords;
+    EmitVertex();
+    gl_Position = explode(gl_in[1].gl_Position, normal);
+    ftex_coords = gs_in[1].gtex_coords;
+    EmitVertex();
+    gl_Position = explode(gl_in[2].gl_Position, normal);
+    ftex_coords = gs_in[2].gtex_coords;
+    EmitVertex();
+    EndPrimitive();
+}
diff --git a/advanced_opengl/8.geometry_shader/shaders/explosion.gs b/advanced_opengl/8.geometry_shader/shaders/explosion.gs
deleted file mode 100644
index 3498878..0000000
--- a/advanced_opengl/8.geometry_shader/shaders/explosion.gs
+++ /dev/null
@@ -1,44 +0,0 @@
-#version 330 core
-layout(triangles) in;
-layout(triangle_strip, max_vertices = 3) out;
-
-in VS_OUT {
-    vec2 gtex_coords;
-} gs_in[];
-
-out vec2 ftex_coords;
-
-uniform float time;
-
-vec3
-get_normal(void)
-{
-    vec3 a = vec3(gl_in[0].gl_Position)-vec3(gl_in[1].gl_Position);
-    vec3 b = vec3(gl_in[2].gl_Position)-vec3(gl_in[1].gl_Position);
-    return(normalize(cross(a, b)));
-}
-
-vec4
-explode(vec4 position, vec3 normal)
-{
-    float magnitude = 0.2;
-    vec3 direction = normal*magnitude*((sin(time)+1.0)/2.0);
-    vec4 result = position+vec4(direction, 0.0);
-    return(result);
-}
-
-void
-main(void)
-{
-    vec3 normal = get_normal();
-    gl_Position = explode(gl_in[0].gl_Position, normal);
-    ftex_coords = gs_in[0].gtex_coords;
-    EmitVertex();
-    gl_Position = explode(gl_in[1].gl_Position, normal);
-    ftex_coords = gs_in[1].gtex_coords;
-    EmitVertex();
-    gl_Position = explode(gl_in[2].gl_Position, normal);
-    ftex_coords = gs_in[2].gtex_coords;
-    EmitVertex();
-    EndPrimitive();
-}
diff --git a/advanced_opengl/8.geometry_shader/shaders/explosion.vert b/advanced_opengl/8.geometry_shader/shaders/explosion.vert
new file mode 100644
index 0000000..a79b432
--- /dev/null
+++ b/advanced_opengl/8.geometry_shader/shaders/explosion.vert
@@ -0,0 +1,17 @@
+#version 330 core
+layout(location = 0) in vec3 apos;
+layout(location = 1) in vec2 atex_coords;
+
+out VS_OUT {
+    vec2 gtex_coords;
+} vs_out;
+
+uniform mat4 proj;
+uniform mat4 view;
+uniform mat4 model;
+
+void main(void)
+{
+    vs_out.gtex_coords = atex_coords;
+    gl_Position = proj*view*model*vec4(apos, 1.0);
+}
diff --git a/advanced_opengl/8.geometry_shader/shaders/explosion.vs b/advanced_opengl/8.geometry_shader/shaders/explosion.vs
deleted file mode 100644
index 46abd27..0000000
--- a/advanced_opengl/8.geometry_shader/shaders/explosion.vs
+++ /dev/null
@@ -1,18 +0,0 @@
-#version 330 core
-layout(location = 0) in vec3 apos;
-layout(location = 1) in vec2 atex_coords;
-
-out VS_OUT {
-    vec2 gtex_coords;
-} vs_out;
-
-uniform mat4 projection;
-uniform mat4 view;
-uniform mat4 model;
-
-void
-main(void)
-{
-    vs_out.gtex_coords = atex_coords;
-    gl_Position = projection*view*model*vec4(apos, 1.0);
-}
diff --git a/advanced_opengl/8.geometry_shader/shaders/normals.frag b/advanced_opengl/8.geometry_shader/shaders/normals.frag
new file mode 100644
index 0000000..d40d866
--- /dev/null
+++ b/advanced_opengl/8.geometry_shader/shaders/normals.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/8.geometry_shader/shaders/normals.fs b/advanced_opengl/8.geometry_shader/shaders/normals.fs
deleted file mode 100644
index fbbafbf..0000000
--- a/advanced_opengl/8.geometry_shader/shaders/normals.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/8.geometry_shader/shaders/normals.geom b/advanced_opengl/8.geometry_shader/shaders/normals.geom
new file mode 100644
index 0000000..f0e1a75
--- /dev/null
+++ b/advanced_opengl/8.geometry_shader/shaders/normals.geom
@@ -0,0 +1,42 @@
+#version 330 core
+layout(triangles) in;
+layout(line_strip, max_vertices = 6) out;
+
+in VS_OUT {
+    vec3 normal;
+} gs_in[];
+
+uniform mat4 proj;
+
+const float MAGNITUDE = 0.4;
+
+void generate_line(int index)
+{
+    gl_Position = proj*gl_in[index].gl_Position;
+    EmitVertex();
+    gl_Position = proj*(gl_in[index].gl_Position+
+                              vec4(gs_in[index].normal, 0.0)*MAGNITUDE);
+    EmitVertex();
+    EndPrimitive();
+}
+
+void main(void)
+{
+    /*
+    vec4 center = (gl_in[0].gl_Position+
+                   gl_in[1].gl_Position+
+                   gl_in[2].gl_Position)/3.0;
+    vec4 end = center+vec4(((gs_in[0].normal+
+                             gs_in[1].normal+
+                             gs_in[2].normal)/3.0),
+                           0.0)*MAGNITUDE;
+    gl_Position = proj*center;
+    EmitVertex();
+    gl_Position = proj*end;
+    EmitVertex();
+    EndPrimitive();
+    */
+    generate_line(0);
+    generate_line(1);
+    generate_line(2);
+}
diff --git a/advanced_opengl/8.geometry_shader/shaders/normals.gs b/advanced_opengl/8.geometry_shader/shaders/normals.gs
deleted file mode 100644
index 3720a5f..0000000
--- a/advanced_opengl/8.geometry_shader/shaders/normals.gs
+++ /dev/null
@@ -1,44 +0,0 @@
-#version 330 core
-layout(triangles) in;
-layout(line_strip, max_vertices = 6) out;
-
-in VS_OUT {
-    vec3 normal;
-} gs_in[];
-
-uniform mat4 projection;
-
-const float MAGNITUDE = 0.4;
-
-void
-generate_line(int index)
-{
-    gl_Position = projection*gl_in[index].gl_Position;
-    EmitVertex();
-    gl_Position = projection*(gl_in[index].gl_Position+
-                              vec4(gs_in[index].normal, 0.0)*MAGNITUDE);
-    EmitVertex();
-    EndPrimitive();
-}
-
-void
-main(void)
-{
-    /*
-    vec4 center = (gl_in[0].gl_Position+
-                   gl_in[1].gl_Position+
-                   gl_in[2].gl_Position)/3.0;
-    vec4 end = center+vec4(((gs_in[0].normal+
-                             gs_in[1].normal+
-                             gs_in[2].normal)/3.0),
-                           0.0)*MAGNITUDE;
-    gl_Position = projection*center;
-    EmitVertex();
-    gl_Position = projection*end;
-    EmitVertex();
-    EndPrimitive();
-    */
-    generate_line(0);
-    generate_line(1);
-    generate_line(2);
-}
diff --git a/advanced_opengl/8.geometry_shader/shaders/normals.vert b/advanced_opengl/8.geometry_shader/shaders/normals.vert
new file mode 100644
index 0000000..14f7d8b
--- /dev/null
+++ b/advanced_opengl/8.geometry_shader/shaders/normals.vert
@@ -0,0 +1,17 @@
+#version 330 core
+layout(location = 0) in vec3 apos;
+layout(location = 1) in vec3 anormal;
+
+out VS_OUT {
+    vec3 normal;
+} vs_out;
+
+uniform mat4 view;
+uniform mat4 model;
+
+void main(void)
+{
+    mat3 normal_matrix = mat3(transpose(inverse(view*model)));
+    vs_out.normal = normalize(normal_matrix*anormal);
+    gl_Position = view*model*vec4(apos, 1.0);
+}
diff --git a/advanced_opengl/8.geometry_shader/shaders/normals.vs b/advanced_opengl/8.geometry_shader/shaders/normals.vs
deleted file mode 100644
index 3b728e5..0000000
--- a/advanced_opengl/8.geometry_shader/shaders/normals.vs
+++ /dev/null
@@ -1,18 +0,0 @@
-#version 330 core
-layout(location = 0) in vec3 apos;
-layout(location = 1) in vec3 anormal;
-
-out VS_OUT {
-    vec3 normal;
-} vs_out;
-
-uniform mat4 view;
-uniform mat4 model;
-
-void
-main(void)
-{
-    mat3 normal_matrix = mat3(transpose(inverse(view*model)));
-    vs_out.normal = normalize(normal_matrix*anormal);
-    gl_Position = view*model*vec4(apos, 1.0);
-}
-- 
cgit v1.2.3