lenn/LearnOpenGL
1
0
Fork 0
mirror of https://github.com/JoeyDeVries/LearnOpenGL.git synced 2026-01-02 04:37:54 +08:00
Code Issues Packages Projects Releases Wiki Activity
131 Commits 2 Branches 0 Tags
5491450bdef9738d7698b9acc6f1e894ce0885f4
Commit Graph

131 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Zach
d3d808f9d9 Update README.md 2016-09-14 12:47:40 -07:00
Joey de Vries
7ec34f7931 Merge pull request #39 from xiaofeii2/master 
Fixed bug: cannot load images in vs2015.
 2016-08-27 12:35:33 +02:00
txf
8baa9bf99e Fixed bug: cannot load images in vs2015. 2016-08-25 15:16:46 +08:00
Joey de Vries
de9593226f Merge pull request #36 from drahak/master 
Fix switching draw mode in SSAO deferred shader
 2016-07-06 15:23:11 +02:00
Drahomír Hanák
a1638ea19a Fix switching draw mode in SSAO deferred shader 2016-07-06 15:09:56 +02:00
Joey de Vries
28877f8aec Merge pull request #35 from ozan/patch-1 
Fix typo
 2016-07-03 20:05:15 +02:00
Ozan Onay
4198516138 Fix typo 2016-07-03 08:23:53 -07:00
J. de Vries
4d3a93859d Issue #33: removed text rendering from repository for now. 2016-05-24 14:11:10 +02:00
J. de Vries
bd75a3b830 Issue #32: Removed C++ variable list initialization due to compiler conflicts. 2016-05-24 13:31:26 +02:00
J. de Vries
30c6c04bf4 Forgot to add text_rendering source file to GitHub. 2016-05-24 10:18:28 +02:00
J. de Vries
11b26e6fc3 comments fix 2016-05-11 20:07:16 +02:00
J. de Vries
b63d9af161 New debugging tutorial source code w/ artificial errors. 2016-05-11 20:05:16 +02:00
J. de Vries
a4c2bb2498 Updated GLM version w/ now standard radians as angles. 2016-05-11 20:04:52 +02:00
J. de Vries
336df22af5 Added source code for debugging tutorials; new code_viewer directly loads from GitHub. 2016-05-11 19:43:32 +02:00
J. de Vries
f313234c9a Fix viewport display for high-DPI devices. 2016-04-30 11:38:05 +02:00
J. de Vries
2c04801327 Instancing asteroid object texture fix (resolution was too high) 2016-03-30 16:49:25 +02:00
Joey de Vries
f3b4c15984 Merge pull request #28 from fluffyfreak/fix-instance-texturing 
Fix texture mapping in asteroid instancing example.
 2016-03-30 16:47:06 +02:00
Andrew Copland
7ee4d9b56a Bind the rock models texture to the shaders sampler so texture mapping works in instancing example. 2016-03-30 10:53:53 +01:00
J. de Vries
d7ed65ff5d Shadow mapping view frustum clean-up (more intuitive LookAt Up vector). 2016-03-28 01:07:11 +02:00
J. de Vries
d5c3be70ab Merge branch 'master' of https://github.com/JoeyDeVries/LearnOpenGL 2016-03-06 11:29:09 +01:00
J. de Vries
d082668b2b new glfw3 compiled w/ VS2015 2016-03-06 11:24:51 +01:00
J. de Vries
2bf1ed16f1 Fix: framebuffer color format. 2016-03-06 11:24:34 +01:00
Joey de Vries
d0e667d544 Merge pull request #24 from andrewparlane/master 
Deferred Shading: Fixed bug with the normal texture component of the
 2016-01-20 12:06:37 +01:00
Andrew Parlane
1e9908378e Deferred Shading: Fixed bug with the normal texture component of the 
gBuffer.

The texture was being set up as GL_RGB instead of GL_RGB16F which caused
negative components of normals to be set to 0.
 2016-01-19 22:29:05 -04:00
Joey de Vries
20999a1b68 Update to depth testing article 
Instead of directly dividing by far in the LinearizeDepth function,
divide by far in the main() function to make it explicitly clear the
LinearizeDepth value returns the depth value up to far.
 2015-08-12 10:09:49 +02:00
JoeyDeVries
236cc79dc3 Merge pull request #16 from ibbles/master 
Out-of-source builds without environment variables.
 2015-08-04 22:03:53 +02:00
Marin Nilsson
eeb22a792a Merge branch 'master' of https://github.com/JoeyDeVries/LearnOpenGL 2015-08-04 19:51:40 +02:00
Marin Nilsson
1d2b1dae19 Out-of-source builds without environment variables. 
Using CMake's configure_file command to generate a header file defining
a C string containing the path to the source root directory; the
directory where the resource folder is. Textures and models can now be
found directly as long the user doesn't move stuff around.

Shaders are still a problem.
 2015-08-04 19:41:08 +02:00
JoeyDeVries
1973ab6987 Merge pull request #15 from ibbles/master 
Fixed linking with GLFW in Ubuntu.
 2015-08-04 19:39:22 +02:00
Marin Nilsson
83497513eb Using CMake variables setup but find_package(GLFW3) instead of hard-coding the name. 2015-08-04 18:37:03 +02:00
JoeyDeVries
2008ec1bb1 Merge pull request #13 from ibbles/master 
Support for out-of-source builds.
 2015-08-02 21:04:38 +02:00
Marin Nilsson
b03523d3f0 Included description of LOGL_ROOT_PATH in README.md. 
With instructions of when and how to set it.
 2015-08-02 15:16:25 +02:00
Marin Nilsson
26758e0dea Merge remote-tracking branch 'upstream/master' 2015-08-02 13:49:33 +02:00
JoeyDeVries
3678d3411e Merge pull request #14 from zryan3/bugfix/linux_cmake 
refactored CMakeLists to build for Linux Mint 17.2, and ...
 2015-08-02 11:29:25 +02:00
zryan3
bebe39c0be refactored CMakeLists to build for Linux Mint 17.2, and removed std::sqrtf which is not apart of GCC C++ libraries apparently 2015-08-02 00:40:56 -07:00
Marin Nilsson
a8a8d11f22 Support for out-of-source builds. 
Uses environment variable to tell the program where to find resource
files.
Sharder sources are still search for in the current workind directory.
 2015-07-30 21:48:41 +02:00
Joey de Vries
eac76c9a50 New tutorial code 
Added code of new tutorials to the repository
 2015-07-15 11:48:45 +02:00
Joey de Vries
05b24d9268 improved readme 
improved readme
 2015-06-20 12:03:19 +02:00
Joey de Vries
07c805eb31 Added Glitter reference 
Added small description of Glitter in the Readme
 2015-06-20 12:01:56 +02:00
Joey de Vries
711be5ad90 new CMake with added tutorials 
new CMake with added tutorials
 2015-06-20 11:56:32 +02:00
Joey de Vries
635309ef0b New tutorial code 
New tutorial code
 2015-06-20 11:55:58 +02:00
Joey de Vries
c4c3221de9 Added Parallax Mapping code/resources 
Added code samples and necessary texture resources for upcoming Parallax
Mapping tutorial
 2015-06-04 19:59:04 +02:00
Joey de Vries
2a0a415c8f Normal mapping code 
Normal mapping code for normal mapping tutorial (+ few extra's for next
tutorial)
 2015-05-26 22:00:21 +02:00
JoeyDeVries
e1e307f3de Merge pull request #10 from zwookie/master 
fixed Linux error with the gamma variable already being defined in mathcalls.h
 2015-05-23 09:49:39 +02:00
zmertens
4018e023de fixed Linux error with the gamma variable already being defined in mathcalls.h 2015-05-22 20:25:46 -07:00
Joey de Vries
349a95b997 Added Mac OSX instructions 
Added Stéphane's contribution of Mac OSX fork to readme
 2015-05-21 21:26:09 +02:00
Joey de Vries
f6c5ac42fc Shadow tutorials added 
Added source code of shadow mapping and omnidirectional shadow mapping
tutorial.
 2015-05-15 11:25:35 +02:00
Joey de Vries
052070123a Merge branch 'master' of https://github.com/JoeyDeVries/LearnOpenGL 2015-04-27 13:40:44 +02:00
JoeyDeVries
2aef49160b Merge pull request #8 from zwookie/master 
sample keyword is reserved in OpenGL 4.2+
 2015-04-27 13:41:02 +02:00
Joey de Vries
231651b44f Merge branch 'master' of https://github.com/JoeyDeVries/LearnOpenGL 2015-04-27 13:38:11 +02:00