diff options
Diffstat (limited to 'advanced_opengl')
-rwxr-xr-x | advanced_opengl/1.depth/build.sh (renamed from advanced_opengl/1.depth/build) | 0 | ||||
-rw-r--r-- | advanced_opengl/1.depth/depth.c | 4 | ||||
-rwxr-xr-x | advanced_opengl/10.antialiasing/build.sh (renamed from advanced_opengl/10.antialiasing/build) | 0 | ||||
-rwxr-xr-x | advanced_opengl/2.stencil/build.sh (renamed from advanced_opengl/2.stencil/build) | 0 | ||||
-rwxr-xr-x | advanced_opengl/3.blending/build.sh (renamed from advanced_opengl/3.blending/build) | 0 | ||||
-rwxr-xr-x | advanced_opengl/4.face_culling/build.sh (renamed from advanced_opengl/4.face_culling/build) | 0 | ||||
-rw-r--r-- | advanced_opengl/4.face_culling/face_culling.c | 14 | ||||
-rwxr-xr-x | advanced_opengl/5.framebuffers/build.sh (renamed from advanced_opengl/5.framebuffers/build) | 0 | ||||
-rwxr-xr-x | advanced_opengl/6.cubemaps/build.sh (renamed from advanced_opengl/6.cubemaps/build) | 0 | ||||
-rwxr-xr-x | advanced_opengl/7.uniform_buffer/build.sh (renamed from advanced_opengl/7.uniform_buffer/build) | 0 | ||||
-rwxr-xr-x | advanced_opengl/8.geometry_shader/build.sh (renamed from advanced_opengl/8.geometry_shader/build) | 0 | ||||
-rwxr-xr-x | advanced_opengl/9.instancing/build.sh (renamed from advanced_opengl/9.instancing/build) | 0 | ||||
-rwxr-xr-x | advanced_opengl/build | 9 |
13 files changed, 8 insertions, 19 deletions
diff --git a/advanced_opengl/1.depth/build b/advanced_opengl/1.depth/build.sh index 04fe803..04fe803 100755 --- a/advanced_opengl/1.depth/build +++ b/advanced_opengl/1.depth/build.sh 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 <GL/glew.h> +#include <GLFW/glfw3.h> #include "pwyazh.h" #include "pwyazh_GL.h" diff --git a/advanced_opengl/10.antialiasing/build b/advanced_opengl/10.antialiasing/build.sh index 9d1011a..9d1011a 100755 --- a/advanced_opengl/10.antialiasing/build +++ b/advanced_opengl/10.antialiasing/build.sh diff --git a/advanced_opengl/2.stencil/build b/advanced_opengl/2.stencil/build.sh index c4aa562..c4aa562 100755 --- a/advanced_opengl/2.stencil/build +++ b/advanced_opengl/2.stencil/build.sh diff --git a/advanced_opengl/3.blending/build b/advanced_opengl/3.blending/build.sh index 51f3629..51f3629 100755 --- a/advanced_opengl/3.blending/build +++ b/advanced_opengl/3.blending/build.sh diff --git a/advanced_opengl/4.face_culling/build b/advanced_opengl/4.face_culling/build.sh index d67eefa..d67eefa 100755 --- a/advanced_opengl/4.face_culling/build +++ b/advanced_opengl/4.face_culling/build.sh 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.sh index cb55ebf..cb55ebf 100755 --- a/advanced_opengl/5.framebuffers/build +++ b/advanced_opengl/5.framebuffers/build.sh diff --git a/advanced_opengl/6.cubemaps/build b/advanced_opengl/6.cubemaps/build.sh index 9bda0bc..9bda0bc 100755 --- a/advanced_opengl/6.cubemaps/build +++ b/advanced_opengl/6.cubemaps/build.sh diff --git a/advanced_opengl/7.uniform_buffer/build b/advanced_opengl/7.uniform_buffer/build.sh index 54642df..54642df 100755 --- a/advanced_opengl/7.uniform_buffer/build +++ b/advanced_opengl/7.uniform_buffer/build.sh diff --git a/advanced_opengl/8.geometry_shader/build b/advanced_opengl/8.geometry_shader/build.sh index f3339cb..f3339cb 100755 --- a/advanced_opengl/8.geometry_shader/build +++ b/advanced_opengl/8.geometry_shader/build.sh diff --git a/advanced_opengl/9.instancing/build b/advanced_opengl/9.instancing/build.sh index ebb6a01..ebb6a01 100755 --- a/advanced_opengl/9.instancing/build +++ b/advanced_opengl/9.instancing/build.sh 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 |