summaryrefslogtreecommitdiff
path: root/advanced_opengl/3.blending
diff options
context:
space:
mode:
Diffstat (limited to 'advanced_opengl/3.blending')
-rwxr-xr-xadvanced_opengl/3.blending/blendingbin1287968 -> 1287936 bytes
-rwxr-xr-xadvanced_opengl/3.blending/build.sh2
-rw-r--r--advanced_opengl/3.blending/shaders/blending.vs2
3 files changed, 2 insertions, 2 deletions
diff --git a/advanced_opengl/3.blending/blending b/advanced_opengl/3.blending/blending
index 063ce51..40fe12a 100755
--- a/advanced_opengl/3.blending/blending
+++ b/advanced_opengl/3.blending/blending
Binary files differ
diff --git a/advanced_opengl/3.blending/build.sh b/advanced_opengl/3.blending/build.sh
index 1fb5c9c..51f3629 100755
--- a/advanced_opengl/3.blending/build.sh
+++ b/advanced_opengl/3.blending/build.sh
@@ -2,4 +2,4 @@
. ../../config
TARGET='blending'
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/3.blending/shaders/blending.vs b/advanced_opengl/3.blending/shaders/blending.vs
index d3d92d1..62e71a2 100644
--- a/advanced_opengl/3.blending/shaders/blending.vs
+++ b/advanced_opengl/3.blending/shaders/blending.vs
@@ -11,6 +11,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;
}