summaryrefslogtreecommitdiff
path: root/advanced_opengl/6.cubemaps/shaders
diff options
context:
space:
mode:
Diffstat (limited to 'advanced_opengl/6.cubemaps/shaders')
-rw-r--r--advanced_opengl/6.cubemaps/shaders/cube.vs2
-rw-r--r--advanced_opengl/6.cubemaps/shaders/reflection.vs4
-rw-r--r--advanced_opengl/6.cubemaps/shaders/refraction.fs2
-rw-r--r--advanced_opengl/6.cubemaps/shaders/refraction.vs4
-rw-r--r--advanced_opengl/6.cubemaps/shaders/skybox.vs2
5 files changed, 7 insertions, 7 deletions
diff --git a/advanced_opengl/6.cubemaps/shaders/cube.vs b/advanced_opengl/6.cubemaps/shaders/cube.vs
index 3c11932..aea5c2c 100644
--- a/advanced_opengl/6.cubemaps/shaders/cube.vs
+++ b/advanced_opengl/6.cubemaps/shaders/cube.vs
@@ -12,6 +12,6 @@ out vec2 tex_coords;
void
main(void)
{
- gl_Position = projection*view*model*vec4(apos, 1.0f);
+ gl_Position = projection*view*model*vec4(apos, 1.0);
tex_coords = atex_coords;
}
diff --git a/advanced_opengl/6.cubemaps/shaders/reflection.vs b/advanced_opengl/6.cubemaps/shaders/reflection.vs
index 34ad142..c9a0698 100644
--- a/advanced_opengl/6.cubemaps/shaders/reflection.vs
+++ b/advanced_opengl/6.cubemaps/shaders/reflection.vs
@@ -13,7 +13,7 @@ uniform mat4 projection;
void
main(void)
{
- pos = vec3(model*vec4(apos, 1.0f));
+ pos = vec3(model*vec4(apos, 1.0));
normal = mat3(transpose(inverse(model)))*anormal;
- gl_Position = projection*view*model*vec4(apos, 1.0f);
+ gl_Position = projection*view*model*vec4(apos, 1.0);
}
diff --git a/advanced_opengl/6.cubemaps/shaders/refraction.fs b/advanced_opengl/6.cubemaps/shaders/refraction.fs
index 8a8a8c5..ef8c415 100644
--- a/advanced_opengl/6.cubemaps/shaders/refraction.fs
+++ b/advanced_opengl/6.cubemaps/shaders/refraction.fs
@@ -11,7 +11,7 @@ uniform samplerCube skybox;
void
main(void)
{
- float ratio = 1.0f/1.52f;
+ 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.vs b/advanced_opengl/6.cubemaps/shaders/refraction.vs
index 34ad142..c9a0698 100644
--- a/advanced_opengl/6.cubemaps/shaders/refraction.vs
+++ b/advanced_opengl/6.cubemaps/shaders/refraction.vs
@@ -13,7 +13,7 @@ uniform mat4 projection;
void
main(void)
{
- pos = vec3(model*vec4(apos, 1.0f));
+ pos = vec3(model*vec4(apos, 1.0));
normal = mat3(transpose(inverse(model)))*anormal;
- gl_Position = projection*view*model*vec4(apos, 1.0f);
+ gl_Position = projection*view*model*vec4(apos, 1.0);
}
diff --git a/advanced_opengl/6.cubemaps/shaders/skybox.vs b/advanced_opengl/6.cubemaps/shaders/skybox.vs
index 4259dc1..c790148 100644
--- a/advanced_opengl/6.cubemaps/shaders/skybox.vs
+++ b/advanced_opengl/6.cubemaps/shaders/skybox.vs
@@ -11,6 +11,6 @@ void
main(void)
{
tex_coords = apos;
- vec4 pos = projection*view*vec4(apos, 1.0f);
+ vec4 pos = projection*view*vec4(apos, 1.0);
gl_Position = pos.xyww;
}