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/9.instancing/shaders/default.frag      | 12 ++++++++++++
 advanced_opengl/9.instancing/shaders/default.fs        | 13 -------------
 advanced_opengl/9.instancing/shaders/default.vert      | 17 +++++++++++++++++
 advanced_opengl/9.instancing/shaders/default.vs        | 18 ------------------
 .../9.instancing/shaders/instanced_arrays.frag         | 10 ++++++++++
 .../9.instancing/shaders/instanced_arrays.fs           | 11 -----------
 .../9.instancing/shaders/instanced_arrays.vert         | 13 +++++++++++++
 .../9.instancing/shaders/instanced_arrays.vs           | 14 --------------
 .../9.instancing/shaders/instanced_mat4.frag           | 13 +++++++++++++
 advanced_opengl/9.instancing/shaders/instanced_mat4.fs | 14 --------------
 .../9.instancing/shaders/instanced_mat4.vert           | 15 +++++++++++++++
 advanced_opengl/9.instancing/shaders/instanced_mat4.vs | 16 ----------------
 .../9.instancing/shaders/instancing_uniform_array.frag | 10 ++++++++++
 .../9.instancing/shaders/instancing_uniform_array.fs   | 11 -----------
 .../9.instancing/shaders/instancing_uniform_array.vert | 13 +++++++++++++
 .../9.instancing/shaders/instancing_uniform_array.vs   | 14 --------------
 16 files changed, 103 insertions(+), 111 deletions(-)
 create mode 100644 advanced_opengl/9.instancing/shaders/default.frag
 delete mode 100644 advanced_opengl/9.instancing/shaders/default.fs
 create mode 100644 advanced_opengl/9.instancing/shaders/default.vert
 delete mode 100644 advanced_opengl/9.instancing/shaders/default.vs
 create mode 100644 advanced_opengl/9.instancing/shaders/instanced_arrays.frag
 delete mode 100644 advanced_opengl/9.instancing/shaders/instanced_arrays.fs
 create mode 100644 advanced_opengl/9.instancing/shaders/instanced_arrays.vert
 delete mode 100644 advanced_opengl/9.instancing/shaders/instanced_arrays.vs
 create mode 100644 advanced_opengl/9.instancing/shaders/instanced_mat4.frag
 delete mode 100644 advanced_opengl/9.instancing/shaders/instanced_mat4.fs
 create mode 100644 advanced_opengl/9.instancing/shaders/instanced_mat4.vert
 delete mode 100644 advanced_opengl/9.instancing/shaders/instanced_mat4.vs
 create mode 100644 advanced_opengl/9.instancing/shaders/instancing_uniform_array.frag
 delete mode 100644 advanced_opengl/9.instancing/shaders/instancing_uniform_array.fs
 create mode 100644 advanced_opengl/9.instancing/shaders/instancing_uniform_array.vert
 delete mode 100644 advanced_opengl/9.instancing/shaders/instancing_uniform_array.vs

(limited to 'advanced_opengl/9.instancing/shaders')

diff --git a/advanced_opengl/9.instancing/shaders/default.frag b/advanced_opengl/9.instancing/shaders/default.frag
new file mode 100644
index 0000000..8ae5c3b
--- /dev/null
+++ b/advanced_opengl/9.instancing/shaders/default.frag
@@ -0,0 +1,12 @@
+#version 330 core
+
+in vec2 tex_coords;
+
+out vec4 frag_color;
+
+uniform sampler2D texture0;
+
+void main(void)
+{
+    frag_color = texture(texture0, tex_coords);
+}
diff --git a/advanced_opengl/9.instancing/shaders/default.fs b/advanced_opengl/9.instancing/shaders/default.fs
deleted file mode 100644
index c655ac8..0000000
--- a/advanced_opengl/9.instancing/shaders/default.fs
+++ /dev/null
@@ -1,13 +0,0 @@
-#version 330 core
-
-in vec2 tex_coords;
-
-out vec4 frag_color;
-
-uniform sampler2D texture0;
-
-void
-main(void)
-{
-    frag_color = texture(texture0, tex_coords);
-}
\ No newline at end of file
diff --git a/advanced_opengl/9.instancing/shaders/default.vert b/advanced_opengl/9.instancing/shaders/default.vert
new file mode 100644
index 0000000..87cb538
--- /dev/null
+++ b/advanced_opengl/9.instancing/shaders/default.vert
@@ -0,0 +1,17 @@
+#version 330 core
+layout(location = 0) in vec3 apos;
+layout(location = 1) in vec3 anormal;
+layout(location = 2) in vec2 atex_coords;
+
+out vec3 normal;
+out vec2 tex_coords;
+
+uniform mat4 proj;
+uniform mat4 view;
+uniform mat4 model;
+
+void main(void)
+{
+    tex_coords = atex_coords;
+    gl_Position = proj*view*model*vec4(apos, 1.0);
+}
diff --git a/advanced_opengl/9.instancing/shaders/default.vs b/advanced_opengl/9.instancing/shaders/default.vs
deleted file mode 100644
index 85d3c19..0000000
--- a/advanced_opengl/9.instancing/shaders/default.vs
+++ /dev/null
@@ -1,18 +0,0 @@
-#version 330 core
-layout(location = 0) in vec3 apos;
-layout(location = 1) in vec3 anormal;
-layout(location = 2) in vec2 atex_coords;
-
-out vec3 normal;
-out vec2 tex_coords;
-
-uniform mat4 projection;
-uniform mat4 view;
-uniform mat4 model;
-
-void
-main(void)
-{
-    tex_coords = atex_coords;
-    gl_Position = projection*view*model*vec4(apos, 1.0);
-}
diff --git a/advanced_opengl/9.instancing/shaders/instanced_arrays.frag b/advanced_opengl/9.instancing/shaders/instanced_arrays.frag
new file mode 100644
index 0000000..4865933
--- /dev/null
+++ b/advanced_opengl/9.instancing/shaders/instanced_arrays.frag
@@ -0,0 +1,10 @@
+#version 330 core
+
+in vec3 color;
+
+out vec4 frag_color;
+
+void main(void)
+{
+    frag_color = vec4(color, 1.0);
+}
diff --git a/advanced_opengl/9.instancing/shaders/instanced_arrays.fs b/advanced_opengl/9.instancing/shaders/instanced_arrays.fs
deleted file mode 100644
index a32e52e..0000000
--- a/advanced_opengl/9.instancing/shaders/instanced_arrays.fs
+++ /dev/null
@@ -1,11 +0,0 @@
-#version 330 core
-
-in vec3 color;
-
-out vec4 frag_color;
-
-void
-main(void)
-{
-    frag_color = vec4(color, 1.0);
-}
diff --git a/advanced_opengl/9.instancing/shaders/instanced_arrays.vert b/advanced_opengl/9.instancing/shaders/instanced_arrays.vert
new file mode 100644
index 0000000..ce3ea7d
--- /dev/null
+++ b/advanced_opengl/9.instancing/shaders/instanced_arrays.vert
@@ -0,0 +1,13 @@
+#version 330 core
+layout(location = 0) in vec2 apos;
+layout(location = 1) in vec3 acolor;
+layout(location = 2) in vec2 aoffset;
+
+out vec3 color;
+
+void main(void)
+{
+    color = acolor;
+    vec2 pos = apos*(gl_InstanceID/100.0);
+    gl_Position = vec4(pos+aoffset, 0.0, 1.0);
+}
diff --git a/advanced_opengl/9.instancing/shaders/instanced_arrays.vs b/advanced_opengl/9.instancing/shaders/instanced_arrays.vs
deleted file mode 100644
index 4ea0fe4..0000000
--- a/advanced_opengl/9.instancing/shaders/instanced_arrays.vs
+++ /dev/null
@@ -1,14 +0,0 @@
-#version 330 core
-layout(location = 0) in vec2 apos;
-layout(location = 1) in vec3 acolor;
-layout(location = 2) in vec2 aoffset;
-
-out vec3 color;
-
-void
-main(void)
-{
-    color = acolor;
-    vec2 pos = apos*(gl_InstanceID/100.0);
-    gl_Position = vec4(pos+aoffset, 0.0, 1.0);
-}
diff --git a/advanced_opengl/9.instancing/shaders/instanced_mat4.frag b/advanced_opengl/9.instancing/shaders/instanced_mat4.frag
new file mode 100644
index 0000000..3b96d36
--- /dev/null
+++ b/advanced_opengl/9.instancing/shaders/instanced_mat4.frag
@@ -0,0 +1,13 @@
+#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/9.instancing/shaders/instanced_mat4.fs b/advanced_opengl/9.instancing/shaders/instanced_mat4.fs
deleted file mode 100644
index ae625b2..0000000
--- a/advanced_opengl/9.instancing/shaders/instanced_mat4.fs
+++ /dev/null
@@ -1,14 +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/9.instancing/shaders/instanced_mat4.vert b/advanced_opengl/9.instancing/shaders/instanced_mat4.vert
new file mode 100644
index 0000000..835cc5d
--- /dev/null
+++ b/advanced_opengl/9.instancing/shaders/instanced_mat4.vert
@@ -0,0 +1,15 @@
+#version 330 core
+layout(location = 0) in vec3 apos;
+layout(location = 2) in vec2 atex_coords;
+layout(location = 3) in mat4 instance_matrix;
+
+out vec2 tex_coords;
+
+uniform mat4 proj;
+uniform mat4 view;
+
+void main(void)
+{
+    tex_coords = atex_coords;
+    gl_Position = proj*view*instance_matrix*vec4(apos, 1.0);
+}
diff --git a/advanced_opengl/9.instancing/shaders/instanced_mat4.vs b/advanced_opengl/9.instancing/shaders/instanced_mat4.vs
deleted file mode 100644
index c65be90..0000000
--- a/advanced_opengl/9.instancing/shaders/instanced_mat4.vs
+++ /dev/null
@@ -1,16 +0,0 @@
-#version 330 core
-layout(location = 0) in vec3 apos;
-layout(location = 2) in vec2 atex_coords;
-layout(location = 3) in mat4 instance_matrix;
-
-out vec2 tex_coords;
-
-uniform mat4 projection;
-uniform mat4 view;
-
-void
-main(void)
-{
-    tex_coords = atex_coords;
-    gl_Position = projection*view*instance_matrix*vec4(apos, 1.0);
-}
diff --git a/advanced_opengl/9.instancing/shaders/instancing_uniform_array.frag b/advanced_opengl/9.instancing/shaders/instancing_uniform_array.frag
new file mode 100644
index 0000000..4865933
--- /dev/null
+++ b/advanced_opengl/9.instancing/shaders/instancing_uniform_array.frag
@@ -0,0 +1,10 @@
+#version 330 core
+
+in vec3 color;
+
+out vec4 frag_color;
+
+void main(void)
+{
+    frag_color = vec4(color, 1.0);
+}
diff --git a/advanced_opengl/9.instancing/shaders/instancing_uniform_array.fs b/advanced_opengl/9.instancing/shaders/instancing_uniform_array.fs
deleted file mode 100644
index a32e52e..0000000
--- a/advanced_opengl/9.instancing/shaders/instancing_uniform_array.fs
+++ /dev/null
@@ -1,11 +0,0 @@
-#version 330 core
-
-in vec3 color;
-
-out vec4 frag_color;
-
-void
-main(void)
-{
-    frag_color = vec4(color, 1.0);
-}
diff --git a/advanced_opengl/9.instancing/shaders/instancing_uniform_array.vert b/advanced_opengl/9.instancing/shaders/instancing_uniform_array.vert
new file mode 100644
index 0000000..61b07a0
--- /dev/null
+++ b/advanced_opengl/9.instancing/shaders/instancing_uniform_array.vert
@@ -0,0 +1,13 @@
+#version 330 core
+layout(location = 0) in vec2 apos;
+layout(location = 1) in vec3 acolor;
+
+out vec3 color;
+
+uniform vec2 offsets[100];
+
+void main(void)
+{
+    color = acolor;
+    gl_Position = vec4(apos+offsets[gl_InstanceID], 0.0, 1.0);
+}
diff --git a/advanced_opengl/9.instancing/shaders/instancing_uniform_array.vs b/advanced_opengl/9.instancing/shaders/instancing_uniform_array.vs
deleted file mode 100644
index a77be31..0000000
--- a/advanced_opengl/9.instancing/shaders/instancing_uniform_array.vs
+++ /dev/null
@@ -1,14 +0,0 @@
-#version 330 core
-layout(location = 0) in vec2 apos;
-layout(location = 1) in vec3 acolor;
-
-out vec3 color;
-
-uniform vec2 offsets[100];
-
-void
-main(void)
-{
-    color = acolor;
-    gl_Position = vec4(apos+offsets[gl_InstanceID], 0.0, 1.0);
-}
-- 
cgit v1.2.3