8 files changed, 16 insertions, 24 deletions
diff --git a/advanced_opengl/6.cubemaps/shaders/cube.fs b/advanced_opengl/6.cubemaps/shaders/cube.frag
index f58c5d3..71892a7 100644
--- a/advanced_opengl/6.cubemaps/shaders/cube.fs
+++ b/advanced_opengl/6.cubemaps/shaders/cube.frag
@@ -6,8 +6,7 @@ in vec2 tex_coords;
 
 uniform sampler2D texture1;
 
-void
-main(void)
+void main(void)
 {
     frag_color = texture(texture1, tex_coords);
 }
diff --git a/advanced_opengl/6.cubemaps/shaders/cube.vs b/advanced_opengl/6.cubemaps/shaders/cube.vert
index aea5c2c..2436f35 100644
--- a/advanced_opengl/6.cubemaps/shaders/cube.vs
+++ b/advanced_opengl/6.cubemaps/shaders/cube.vert
@@ -5,13 +5,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;
 }
diff --git a/advanced_opengl/6.cubemaps/shaders/reflection.fs b/advanced_opengl/6.cubemaps/shaders/reflection.frag
index 3723ea9..72b1c0d 100644
--- a/advanced_opengl/6.cubemaps/shaders/reflection.fs
+++ b/advanced_opengl/6.cubemaps/shaders/reflection.frag
@@ -8,8 +8,7 @@ out vec4 frag_color;
 uniform vec3 camera_pos;
 uniform samplerCube skybox;
 
-void
-main(void)
+void main(void)
 {
     vec3 i = pos-camera_pos;
     vec3 r = reflect(i, normalize(normal));
diff --git a/advanced_opengl/6.cubemaps/shaders/refraction.vs b/advanced_opengl/6.cubemaps/shaders/reflection.vert
index c9a0698..d7070f2 100644
--- a/advanced_opengl/6.cubemaps/shaders/refraction.vs
+++ b/advanced_opengl/6.cubemaps/shaders/reflection.vert
@@ -8,12 +8,11 @@ out vec3 normal;
 
 uniform mat4 model;
 uniform mat4 view;
-uniform mat4 projection;
+uniform mat4 proj;
 
-void
-main(void)
+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);
+    gl_Position = proj*view*model*vec4(apos, 1.0);
 }
diff --git a/advanced_opengl/6.cubemaps/shaders/refraction.fs b/advanced_opengl/6.cubemaps/shaders/refraction.frag
index ef8c415..fa01b2c 100644
--- a/advanced_opengl/6.cubemaps/shaders/refraction.fs
+++ b/advanced_opengl/6.cubemaps/shaders/refraction.frag
@@ -8,8 +8,7 @@ out vec4 frag_color;
 uniform vec3 camera_pos;
 uniform samplerCube skybox;
 
-void
-main(void)
+void main(void)
 {
     float ratio = 1.0/1.52;
     vec3 i = pos-camera_pos;
diff --git a/advanced_opengl/6.cubemaps/shaders/reflection.vs b/advanced_opengl/6.cubemaps/shaders/refraction.vert
index c9a0698..d7070f2 100644
--- a/advanced_opengl/6.cubemaps/shaders/reflection.vs
+++ b/advanced_opengl/6.cubemaps/shaders/refraction.vert
@@ -8,12 +8,11 @@ out vec3 normal;
 
 uniform mat4 model;
 uniform mat4 view;
-uniform mat4 projection;
+uniform mat4 proj;
 
-void
-main(void)
+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);
+    gl_Position = proj*view*model*vec4(apos, 1.0);
 }
diff --git a/advanced_opengl/6.cubemaps/shaders/skybox.fs b/advanced_opengl/6.cubemaps/shaders/skybox.frag
index bf69c8b..22be301 100644
--- a/advanced_opengl/6.cubemaps/shaders/skybox.fs
+++ b/advanced_opengl/6.cubemaps/shaders/skybox.frag
@@ -6,8 +6,7 @@ out vec4 frag_color;
 
 uniform samplerCube skybox;
 
-void
-main(void)
+void main(void)
 {
     frag_color = texture(skybox, tex_coords);
 }
diff --git a/advanced_opengl/6.cubemaps/shaders/skybox.vs b/advanced_opengl/6.cubemaps/shaders/skybox.vert
index c790148..c7d91c9 100644
--- a/advanced_opengl/6.cubemaps/shaders/skybox.vs
+++ b/advanced_opengl/6.cubemaps/shaders/skybox.vert
@@ -5,12 +5,11 @@ layout(location = 0) in vec3 apos;
 out vec3 tex_coords;
 
 uniform mat4 view;
-uniform mat4 projection;
+uniform mat4 proj;
 
-void
-main(void)
+void main(void)
 {
     tex_coords = apos;
-    vec4 pos = projection*view*vec4(apos, 1.0);
+    vec4 pos = proj*view*vec4(apos, 1.0);
     gl_Position = pos.xyww;
 }