From 7e907a2736f52c40af671c7be139eff070a5dcd6 Mon Sep 17 00:00:00 2001 From: Zach Date: Wed, 8 Apr 2015 14:23:23 -0700 Subject: [PATCH 1/2] Update README.md added backticks to make instruction --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 563d5fe..2e7ab90 100644 --- a/README.md +++ b/README.md @@ -10,4 +10,4 @@ Note that you still have to manually copy the required .DLL files from the /dlls ## Linux building First make sure you have CMake, Git, and GCC by typing as root (sudo) `apt-get install g++ cmake git` and then get the required packages: -Using root (sudo) and type `apt-get install libsoil-dev libglm-dev libassimp-dev libglew-dev libglfw3-dev` . Next, run CMake (preferably CMake-gui). The source directory is LearnOpenGL and specify the build directory as LearnOpenGL/build. Creating the build directory within LearnOpenGL is important for linking to the resource files (it also will be ignored by Git). Hit configure and specify your compiler files (Unix Makefiles are recommended), resolve any missing directories or libraries, and then hit generate. Navigate to the build directory (`cd LearnOpenGL/build`) and type make in the terminal. This should generate the executables in the respective chapter folders. Note that using CodeBlocks or an IDE may have issues running the programs due to problems finding the shader and resource files, however it should still be able to generate the exectuables. +Using root (sudo) and type `apt-get install libsoil-dev libglm-dev libassimp-dev libglew-dev libglfw3-dev` . Next, run CMake (preferably CMake-gui). The source directory is LearnOpenGL and specify the build directory as LearnOpenGL/build. Creating the build directory within LearnOpenGL is important for linking to the resource files (it also will be ignored by Git). Hit configure and specify your compiler files (Unix Makefiles are recommended), resolve any missing directories or libraries, and then hit generate. Navigate to the build directory (`cd LearnOpenGL/build`) and type `make` in the terminal. This should generate the executables in the respective chapter folders. Note that using CodeBlocks or an IDE may have issues running the programs due to problems finding the shader and resource files, however it should still be able to generate the exectuables. From 30d336f04433764adc6223cca38cd991c422a43c Mon Sep 17 00:00:00 2001 From: zmertens Date: Sun, 26 Apr 2015 11:29:01 -0700 Subject: [PATCH 2/2] sample keyword is reserved in GLSL 4.2+ --- .../5.framebuffers/framebuffers_screen.frag | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/4.advanced_opengl/5.framebuffers/framebuffers_screen.frag b/src/4.advanced_opengl/5.framebuffers/framebuffers_screen.frag index db0fedf..197b3c8 100644 --- a/src/4.advanced_opengl/5.framebuffers/framebuffers_screen.frag +++ b/src/4.advanced_opengl/5.framebuffers/framebuffers_screen.frag @@ -27,14 +27,14 @@ void main() -1, -1, -1 ); - vec3 sample[9]; + vec3 sampleTex[9]; for(int i = 0; i < 9; i++) { - sample[i] = vec3(texture(screenTexture, TexCoords.st + offsets[i])); + sampleTex[i] = vec3(texture(screenTexture, TexCoords.st + offsets[i])); } vec3 col; for(int i = 0; i < 9; i++) - col += sample[i] * kernel[i]; + col += sampleTex[i] * kernel[i]; color = vec4(col, 1.0); -} \ No newline at end of file +}