summaryrefslogtreecommitdiff
path: root/advanced_opengl/7.uniform_buffer
diff options
context:
space:
mode:
authorpryazha <pryadeiniv@mail.ru>2025-02-06 12:38:09 +0500
committerpryazha <pryadeiniv@mail.ru>2025-02-06 12:38:09 +0500
commit926cbd0d49890772f911e6a6bedb7835605ced89 (patch)
treeea27e2c84e32ab6d8d29af9e61cd432e30a46bc6 /advanced_opengl/7.uniform_buffer
parentbf1c59565096ac9774493846cfb15e259d3b0e66 (diff)
change
Diffstat (limited to 'advanced_opengl/7.uniform_buffer')
-rwxr-xr-xadvanced_opengl/7.uniform_buffer/build.sh2
-rw-r--r--advanced_opengl/7.uniform_buffer/shaders/color_cube.fs2
-rw-r--r--advanced_opengl/7.uniform_buffer/shaders/color_cube.vs2
-rw-r--r--advanced_opengl/7.uniform_buffer/shaders/cube.vs2
-rw-r--r--advanced_opengl/7.uniform_buffer/shaders/skybox.vs2
-rwxr-xr-xadvanced_opengl/7.uniform_buffer/uniform_bufferbin1288480 -> 1288448 bytes
6 files changed, 5 insertions, 5 deletions
diff --git a/advanced_opengl/7.uniform_buffer/build.sh b/advanced_opengl/7.uniform_buffer/build.sh
index d5620a3..54642df 100755
--- a/advanced_opengl/7.uniform_buffer/build.sh
+++ b/advanced_opengl/7.uniform_buffer/build.sh
@@ -2,4 +2,4 @@
. ../../config
TARGET='uniform_buffer'
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/7.uniform_buffer/shaders/color_cube.fs b/advanced_opengl/7.uniform_buffer/shaders/color_cube.fs
index 8aa5add..fbbafbf 100644
--- a/advanced_opengl/7.uniform_buffer/shaders/color_cube.fs
+++ b/advanced_opengl/7.uniform_buffer/shaders/color_cube.fs
@@ -5,5 +5,5 @@ out vec4 frag_color;
void
main(void)
{
- frag_color = vec4(1.0f, 0.0f, 0.0f, 1.0f);
+ frag_color = vec4(1.0, 0.0, 0.0, 1.0);
}
diff --git a/advanced_opengl/7.uniform_buffer/shaders/color_cube.vs b/advanced_opengl/7.uniform_buffer/shaders/color_cube.vs
index 630242d..17a3448 100644
--- a/advanced_opengl/7.uniform_buffer/shaders/color_cube.vs
+++ b/advanced_opengl/7.uniform_buffer/shaders/color_cube.vs
@@ -12,5 +12,5 @@ uniform mat4 model;
void
main(void)
{
- gl_Position = projection*view*model*vec4(apos, 1.0f);
+ gl_Position = projection*view*model*vec4(apos, 1.0);
}
diff --git a/advanced_opengl/7.uniform_buffer/shaders/cube.vs b/advanced_opengl/7.uniform_buffer/shaders/cube.vs
index cb0b7bf..054164d 100644
--- a/advanced_opengl/7.uniform_buffer/shaders/cube.vs
+++ b/advanced_opengl/7.uniform_buffer/shaders/cube.vs
@@ -16,6 +16,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/7.uniform_buffer/shaders/skybox.vs b/advanced_opengl/7.uniform_buffer/shaders/skybox.vs
index 36a07ed..03b2171 100644
--- a/advanced_opengl/7.uniform_buffer/shaders/skybox.vs
+++ b/advanced_opengl/7.uniform_buffer/shaders/skybox.vs
@@ -14,6 +14,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;
}
diff --git a/advanced_opengl/7.uniform_buffer/uniform_buffer b/advanced_opengl/7.uniform_buffer/uniform_buffer
index e2b3e42..57aa64d 100755
--- a/advanced_opengl/7.uniform_buffer/uniform_buffer
+++ b/advanced_opengl/7.uniform_buffer/uniform_buffer
Binary files differ