From 6f9ab1f55fd54beab7f0999a69b80ef92fe63722 Mon Sep 17 00:00:00 2001 From: pryazha Date: Tue, 15 Jul 2025 16:15:26 +0500 Subject: finish ssao --- advanced_opengl/1.depth/build | 5 ----- advanced_opengl/1.depth/build.sh | 5 +++++ advanced_opengl/1.depth/depth.c | 4 ++-- advanced_opengl/10.antialiasing/build | 5 ----- advanced_opengl/10.antialiasing/build.sh | 5 +++++ advanced_opengl/2.stencil/build | 5 ----- advanced_opengl/2.stencil/build.sh | 5 +++++ advanced_opengl/3.blending/build | 5 ----- advanced_opengl/3.blending/build.sh | 5 +++++ advanced_opengl/4.face_culling/build | 5 ----- advanced_opengl/4.face_culling/build.sh | 5 +++++ advanced_opengl/4.face_culling/face_culling.c | 14 ++++++-------- advanced_opengl/5.framebuffers/build | 5 ----- advanced_opengl/5.framebuffers/build.sh | 5 +++++ advanced_opengl/6.cubemaps/build | 5 ----- advanced_opengl/6.cubemaps/build.sh | 5 +++++ advanced_opengl/7.uniform_buffer/build | 5 ----- advanced_opengl/7.uniform_buffer/build.sh | 5 +++++ advanced_opengl/8.geometry_shader/build | 5 ----- advanced_opengl/8.geometry_shader/build.sh | 5 +++++ advanced_opengl/9.instancing/build | 6 ------ advanced_opengl/9.instancing/build.sh | 6 ++++++ advanced_opengl/build | 9 --------- 23 files changed, 59 insertions(+), 70 deletions(-) delete mode 100755 advanced_opengl/1.depth/build create mode 100755 advanced_opengl/1.depth/build.sh delete mode 100755 advanced_opengl/10.antialiasing/build create mode 100755 advanced_opengl/10.antialiasing/build.sh delete mode 100755 advanced_opengl/2.stencil/build create mode 100755 advanced_opengl/2.stencil/build.sh delete mode 100755 advanced_opengl/3.blending/build create mode 100755 advanced_opengl/3.blending/build.sh delete mode 100755 advanced_opengl/4.face_culling/build create mode 100755 advanced_opengl/4.face_culling/build.sh delete mode 100755 advanced_opengl/5.framebuffers/build create mode 100755 advanced_opengl/5.framebuffers/build.sh delete mode 100755 advanced_opengl/6.cubemaps/build create mode 100755 advanced_opengl/6.cubemaps/build.sh delete mode 100755 advanced_opengl/7.uniform_buffer/build create mode 100755 advanced_opengl/7.uniform_buffer/build.sh delete mode 100755 advanced_opengl/8.geometry_shader/build create mode 100755 advanced_opengl/8.geometry_shader/build.sh delete mode 100755 advanced_opengl/9.instancing/build create mode 100755 advanced_opengl/9.instancing/build.sh delete mode 100755 advanced_opengl/build (limited to 'advanced_opengl') diff --git a/advanced_opengl/1.depth/build b/advanced_opengl/1.depth/build deleted file mode 100755 index 04fe803..0000000 --- a/advanced_opengl/1.depth/build +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh -. ../../config -TARGET='depth' -set -x -gcc -o $TARGET $CFLAGS $INCLUDE $LFLAGS $TARGET.c $LIBS diff --git a/advanced_opengl/1.depth/build.sh b/advanced_opengl/1.depth/build.sh new file mode 100755 index 0000000..04fe803 --- /dev/null +++ b/advanced_opengl/1.depth/build.sh @@ -0,0 +1,5 @@ +#!/bin/sh +. ../../config +TARGET='depth' +set -x +gcc -o $TARGET $CFLAGS $INCLUDE $LFLAGS $TARGET.c $LIBS diff --git a/advanced_opengl/1.depth/depth.c b/advanced_opengl/1.depth/depth.c index 71a7ffc..d469e82 100644 --- a/advanced_opengl/1.depth/depth.c +++ b/advanced_opengl/1.depth/depth.c @@ -1,5 +1,5 @@ -#include "GL/glew.h" -#include "GLFW/glfw3.h" +#include +#include #include "pwyazh.h" #include "pwyazh_GL.h" diff --git a/advanced_opengl/10.antialiasing/build b/advanced_opengl/10.antialiasing/build deleted file mode 100755 index 9d1011a..0000000 --- a/advanced_opengl/10.antialiasing/build +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh -. ../../config -set -x -gcc -o anti_aliasing_msaa $CFLAGS $INCLUDE $LFLAGS anti_aliasing_msaa.c $LIBS -gcc -o anti_aliasing_offscreen $CFLAGS $INCLUDE $LFLAGS anti_aliasing_offscreen.c $LIBS diff --git a/advanced_opengl/10.antialiasing/build.sh b/advanced_opengl/10.antialiasing/build.sh new file mode 100755 index 0000000..9d1011a --- /dev/null +++ b/advanced_opengl/10.antialiasing/build.sh @@ -0,0 +1,5 @@ +#!/bin/sh +. ../../config +set -x +gcc -o anti_aliasing_msaa $CFLAGS $INCLUDE $LFLAGS anti_aliasing_msaa.c $LIBS +gcc -o anti_aliasing_offscreen $CFLAGS $INCLUDE $LFLAGS anti_aliasing_offscreen.c $LIBS diff --git a/advanced_opengl/2.stencil/build b/advanced_opengl/2.stencil/build deleted file mode 100755 index c4aa562..0000000 --- a/advanced_opengl/2.stencil/build +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh -. ../../config -TARGET='stencil' -set -x -gcc -o $TARGET $CFLAGS $INCLUDE $LFLAGS $TARGET.c $LIBS diff --git a/advanced_opengl/2.stencil/build.sh b/advanced_opengl/2.stencil/build.sh new file mode 100755 index 0000000..c4aa562 --- /dev/null +++ b/advanced_opengl/2.stencil/build.sh @@ -0,0 +1,5 @@ +#!/bin/sh +. ../../config +TARGET='stencil' +set -x +gcc -o $TARGET $CFLAGS $INCLUDE $LFLAGS $TARGET.c $LIBS diff --git a/advanced_opengl/3.blending/build b/advanced_opengl/3.blending/build deleted file mode 100755 index 51f3629..0000000 --- a/advanced_opengl/3.blending/build +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh -. ../../config -TARGET='blending' -set -x -gcc -o $TARGET $CFLAGS $INCLUDE $LFLAGS $TARGET.c $LIBS diff --git a/advanced_opengl/3.blending/build.sh b/advanced_opengl/3.blending/build.sh new file mode 100755 index 0000000..51f3629 --- /dev/null +++ b/advanced_opengl/3.blending/build.sh @@ -0,0 +1,5 @@ +#!/bin/sh +. ../../config +TARGET='blending' +set -x +gcc -o $TARGET $CFLAGS $INCLUDE $LFLAGS $TARGET.c $LIBS diff --git a/advanced_opengl/4.face_culling/build b/advanced_opengl/4.face_culling/build deleted file mode 100755 index d67eefa..0000000 --- a/advanced_opengl/4.face_culling/build +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh -. ../../config -TARGET='face_culling' -set -x -gcc -o $TARGET $CFLAGS $INCLUDE $LFLAGS $TARGET.c $LIBS diff --git a/advanced_opengl/4.face_culling/build.sh b/advanced_opengl/4.face_culling/build.sh new file mode 100755 index 0000000..d67eefa --- /dev/null +++ b/advanced_opengl/4.face_culling/build.sh @@ -0,0 +1,5 @@ +#!/bin/sh +. ../../config +TARGET='face_culling' +set -x +gcc -o $TARGET $CFLAGS $INCLUDE $LFLAGS $TARGET.c $LIBS diff --git a/advanced_opengl/4.face_culling/face_culling.c b/advanced_opengl/4.face_culling/face_culling.c index 0e65e08..4c1490e 100644 --- a/advanced_opengl/4.face_culling/face_culling.c +++ b/advanced_opengl/4.face_culling/face_culling.c @@ -8,7 +8,6 @@ int main(void) { - GLFWwindow *window; State state; S32 width, height; Input input; @@ -24,7 +23,7 @@ int main(void) glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 3); glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 3); glfwWindowHint(GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE); - window = glfwCreateWindow(width, height, "Face culling", 0, 0); + GLFWwindow *window = glfwCreateWindow(width, height, "Face culling", 0, 0); if (!window) { fprintf(stderr, "[ERROR] Failed to create window.\n"); glfwTerminate(); @@ -150,9 +149,9 @@ int main(void) a, -a, a, 1.0f, 1.0f, /* top-right */ }; - U32 cube_vao, vbo; - glGenVertexArrays(1, &cube_vao); - glBindVertexArray(cube_vao); + U32 vao, vbo; + glGenVertexArrays(1, &vao); + glBindVertexArray(vao); glGenBuffers(1, &vbo); glBindBuffer(GL_ARRAY_BUFFER, vbo); glBufferData(GL_ARRAY_BUFFER, sizeof(cube_vertices_cw), cube_vertices_cw, GL_STATIC_DRAW); @@ -199,8 +198,7 @@ int main(void) view = look_at(state.camera.pos, target, v3f(0.0f, 1.0f, 0.0f)); proj = perspective(state.camera.fovx, (F32)width/(F32)height, state.camera.near, state.camera.far); - cube_transform = transform_rotate(cube_transform, - v3f(0.0f, d_angle*state.dt, 0.0f)); + cube_transform = transform_rotate(cube_transform, v3f(0.0f, d_angle*state.dt, 0.0f)); model = transform_apply(cube_transform); glViewport(0, 0, width, height); @@ -212,7 +210,7 @@ int main(void) shader_set_mat4fv(shader, "model", model); shader_set_mat4fv(shader, "view", view); shader_set_mat4fv(shader, "proj", proj); - glBindVertexArray(cube_vao); + glBindVertexArray(vao); glDrawArrays(GL_TRIANGLES, 0, 36); glBindVertexArray(0); diff --git a/advanced_opengl/5.framebuffers/build b/advanced_opengl/5.framebuffers/build deleted file mode 100755 index cb55ebf..0000000 --- a/advanced_opengl/5.framebuffers/build +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh -. ../../config -TARGET='framebuffers' -set -x -gcc -o $TARGET $CFLAGS $INCLUDE $LFLAGS $TARGET.c $LIBS diff --git a/advanced_opengl/5.framebuffers/build.sh b/advanced_opengl/5.framebuffers/build.sh new file mode 100755 index 0000000..cb55ebf --- /dev/null +++ b/advanced_opengl/5.framebuffers/build.sh @@ -0,0 +1,5 @@ +#!/bin/sh +. ../../config +TARGET='framebuffers' +set -x +gcc -o $TARGET $CFLAGS $INCLUDE $LFLAGS $TARGET.c $LIBS diff --git a/advanced_opengl/6.cubemaps/build b/advanced_opengl/6.cubemaps/build deleted file mode 100755 index 9bda0bc..0000000 --- a/advanced_opengl/6.cubemaps/build +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh -. ../../config -TARGET='cubemaps' -set -x -gcc -o $TARGET $CFLAGS $INCLUDE $LFLAGS $TARGET.c $LIBS diff --git a/advanced_opengl/6.cubemaps/build.sh b/advanced_opengl/6.cubemaps/build.sh new file mode 100755 index 0000000..9bda0bc --- /dev/null +++ b/advanced_opengl/6.cubemaps/build.sh @@ -0,0 +1,5 @@ +#!/bin/sh +. ../../config +TARGET='cubemaps' +set -x +gcc -o $TARGET $CFLAGS $INCLUDE $LFLAGS $TARGET.c $LIBS diff --git a/advanced_opengl/7.uniform_buffer/build b/advanced_opengl/7.uniform_buffer/build deleted file mode 100755 index 54642df..0000000 --- a/advanced_opengl/7.uniform_buffer/build +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh -. ../../config -TARGET='uniform_buffer' -set -x -gcc -o $TARGET $CFLAGS $INCLUDE $LFLAGS $TARGET.c $LIBS diff --git a/advanced_opengl/7.uniform_buffer/build.sh b/advanced_opengl/7.uniform_buffer/build.sh new file mode 100755 index 0000000..54642df --- /dev/null +++ b/advanced_opengl/7.uniform_buffer/build.sh @@ -0,0 +1,5 @@ +#!/bin/sh +. ../../config +TARGET='uniform_buffer' +set -x +gcc -o $TARGET $CFLAGS $INCLUDE $LFLAGS $TARGET.c $LIBS diff --git a/advanced_opengl/8.geometry_shader/build b/advanced_opengl/8.geometry_shader/build deleted file mode 100755 index f3339cb..0000000 --- a/advanced_opengl/8.geometry_shader/build +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh -. ../../config -TARGET='geometry_shader' -set -x -gcc -o $TARGET $CFLAGS $INCLUDE $LFLAGS $TARGET.c $LIBS diff --git a/advanced_opengl/8.geometry_shader/build.sh b/advanced_opengl/8.geometry_shader/build.sh new file mode 100755 index 0000000..f3339cb --- /dev/null +++ b/advanced_opengl/8.geometry_shader/build.sh @@ -0,0 +1,5 @@ +#!/bin/sh +. ../../config +TARGET='geometry_shader' +set -x +gcc -o $TARGET $CFLAGS $INCLUDE $LFLAGS $TARGET.c $LIBS diff --git a/advanced_opengl/9.instancing/build b/advanced_opengl/9.instancing/build deleted file mode 100755 index ebb6a01..0000000 --- a/advanced_opengl/9.instancing/build +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh -. ../../config -CFLAGS='-O2' -TARGET='instancing' -set -x -gcc -o $TARGET $CFLAGS $INCLUDE $LFLAGS $TARGET.c $LIBS diff --git a/advanced_opengl/9.instancing/build.sh b/advanced_opengl/9.instancing/build.sh new file mode 100755 index 0000000..ebb6a01 --- /dev/null +++ b/advanced_opengl/9.instancing/build.sh @@ -0,0 +1,6 @@ +#!/bin/sh +. ../../config +CFLAGS='-O2' +TARGET='instancing' +set -x +gcc -o $TARGET $CFLAGS $INCLUDE $LFLAGS $TARGET.c $LIBS diff --git a/advanced_opengl/build b/advanced_opengl/build deleted file mode 100755 index 4829c7d..0000000 --- a/advanced_opengl/build +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh -targets=$(ls) -for target in $targets ; do - if [ $target != 'build.sh' ] ; then - cd $target - ./build.sh - cd .. - fi -done -- cgit v1.2.3-70-g09d2