summaryrefslogtreecommitdiff
path: root/advanced_opengl/2.stencil/shaders
diff options
context:
space:
mode:
Diffstat (limited to 'advanced_opengl/2.stencil/shaders')
-rw-r--r--advanced_opengl/2.stencil/shaders/outline.frag (renamed from advanced_opengl/2.stencil/shaders/outline.fs)3
-rw-r--r--advanced_opengl/2.stencil/shaders/stencil.frag (renamed from advanced_opengl/2.stencil/shaders/stencil.fs)0
-rw-r--r--advanced_opengl/2.stencil/shaders/stencil.vert (renamed from advanced_opengl/2.stencil/shaders/stencil.vs)7
3 files changed, 4 insertions, 6 deletions
diff --git a/advanced_opengl/2.stencil/shaders/outline.fs b/advanced_opengl/2.stencil/shaders/outline.frag
index 542143e..b4a31df 100644
--- a/advanced_opengl/2.stencil/shaders/outline.fs
+++ b/advanced_opengl/2.stencil/shaders/outline.frag
@@ -2,8 +2,7 @@
out vec4 frag_color;
-void
-main(void)
+void main(void)
{
frag_color = vec4(0.76, 0.47, 0.84, 1.0);
}
diff --git a/advanced_opengl/2.stencil/shaders/stencil.fs b/advanced_opengl/2.stencil/shaders/stencil.frag
index ff7dd9b..ff7dd9b 100644
--- a/advanced_opengl/2.stencil/shaders/stencil.fs
+++ b/advanced_opengl/2.stencil/shaders/stencil.frag
diff --git a/advanced_opengl/2.stencil/shaders/stencil.vs b/advanced_opengl/2.stencil/shaders/stencil.vert
index 62e71a2..68b8fe2 100644
--- a/advanced_opengl/2.stencil/shaders/stencil.vs
+++ b/advanced_opengl/2.stencil/shaders/stencil.vert
@@ -4,13 +4,12 @@ layout(location = 1) in vec2 atex_coords;
uniform mat4 model;
uniform mat4 view;
-uniform mat4 projection;
+uniform mat4 proj;
out vec2 tex_coords;
-void
-main(void)
+void main(void)
{
- gl_Position = projection*view*model*vec4(apos, 1.0);
+ gl_Position = proj*view*model*vec4(apos, 1.0);
tex_coords = atex_coords;
}