diff options
Diffstat (limited to 'advanced_opengl/6.cubemaps')
| -rwxr-xr-x | advanced_opengl/6.cubemaps/build.sh | 2 | ||||
| -rwxr-xr-x | advanced_opengl/6.cubemaps/cubemaps | bin | 1288192 -> 1288160 bytes | |||
| -rw-r--r-- | advanced_opengl/6.cubemaps/shaders/cube.vs | 2 | ||||
| -rw-r--r-- | advanced_opengl/6.cubemaps/shaders/reflection.vs | 4 | ||||
| -rw-r--r-- | advanced_opengl/6.cubemaps/shaders/refraction.fs | 2 | ||||
| -rw-r--r-- | advanced_opengl/6.cubemaps/shaders/refraction.vs | 4 | ||||
| -rw-r--r-- | advanced_opengl/6.cubemaps/shaders/skybox.vs | 2 |
7 files changed, 8 insertions, 8 deletions
diff --git a/advanced_opengl/6.cubemaps/build.sh b/advanced_opengl/6.cubemaps/build.sh index bf1d66c..9bda0bc 100755 --- a/advanced_opengl/6.cubemaps/build.sh +++ b/advanced_opengl/6.cubemaps/build.sh @@ -2,4 +2,4 @@ . ../../config TARGET='cubemaps' set -x -gcc -o $TARGET $CFLAGS $INCLUDE $LFLAGS $TARGET.c $LIBS && ./$TARGET +gcc -o $TARGET $CFLAGS $INCLUDE $LFLAGS $TARGET.c $LIBS diff --git a/advanced_opengl/6.cubemaps/cubemaps b/advanced_opengl/6.cubemaps/cubemaps Binary files differindex 661279d..bdf54f5 100755 --- a/advanced_opengl/6.cubemaps/cubemaps +++ b/advanced_opengl/6.cubemaps/cubemaps 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; } |