lenn/LearnOpenGL
1
0
Fork 0
mirror of https://github.com/JoeyDeVries/LearnOpenGL.git synced 2026-01-08 01:33:22 +08:00
Code Issues Packages Projects Releases Wiki Activity
384 Commits 2 Branches 0 Tags
c85067d4fedf2dba1a1c606274d757a55d3f7b56
Commit Graph

384 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joey de Vries
b379c0fe74 Additional statements to clarify usage of FileSystem namespace in Textures tutorial. 2017-07-24 20:08:53 +02:00
Joey de Vries
d2c0775928 Merge pull request #77 from shivmsit/osx_cmake_fix 
Add glfw hint for GLFW_OPENGL_FORWARD_COMPAT for more samples to let it
 2017-07-12 18:13:40 +02:00
Shivpratap Chauhan
b5848894eb Add glfw hint for GLFW_OPENGL_FORWARD_COMPAT for more samples to let it 
work on osx
 2017-07-12 21:33:07 +05:30
Joey de Vries
c591154e15 Merge pull request #76 from shivmsit/osx_cmake_fix 
GLFW hint GLFW_OPENGL_FORWARD_COMPAT is must on osx
 2017-07-12 13:50:45 +02:00
Shivpratap Chauhan
2d16ef0fe2 GLFW hint GLFW_OPENGL_FORWARD_COMPAT is must on osx to create glfw 
window successfully
 2017-07-12 17:06:00 +05:30
Joey de Vries
18197233c7 Merge pull request #75 from shivmsit/osx_cmake_fix 
osx cmake build fixes.
 2017-07-11 21:54:12 +02:00
Shivpratap Chauhan
95598f250a osx cmake build fixes. 2017-07-12 00:45:06 +05:30
Joey de Vries
effe69f83d Merge branch 'master' of https://github.com/JoeyDeVries/LearnOpenGL 2017-07-10 08:37:02 +02:00
Joey de Vries
103b4f6358 Coordinate system code fix. 2017-07-10 08:36:52 +02:00
Joey de Vries
8f66784a79 Merge pull request #73 from d3BugErr/master 
Changed MSVC std::sqrtf call to simple std::sqrt on MinGW toolchain
 2017-07-04 13:40:25 +02:00
Erik
c4c5fea218 Changed MSVC std::sqrtf call to simple std::sqrt - causes compile failure on mingw toolchain, as no such fucntion is present. 2017-07-04 13:40:47 +03:00
Joey de Vries
f3bda045c1 Merge pull request #71 from tielei/minor_fix 
fix texture1 uniform name & two shader variables
 2017-06-29 17:32:50 +02:00
Charles Zhang
e7382fdfb0 fix texture1 uniform name & two shader variables 2017-06-29 18:37:08 +08:00
Joey de Vries
905be9ce52 Use appropriate texture fs name on setting uniform. 2017-06-29 08:38:48 +02:00
Joey de Vries
d67d69712d Merge pull request #70 from tielei/minor_fix 
Variable name does not match with that in frag shader
 2017-06-29 08:36:02 +02:00
Charles Zhang
ecc7e7ca92 Variable name does not match with that in frag shader 2017-06-29 14:32:27 +08:00
Joey de Vries
1e2398e92b Add license file, code to public domain. 2017-06-29 08:12:50 +02:00
Joey de Vries
4bd8846929 Merge pull request #61 from amesgames/master 
Fixed stencil testing sample to actually set the uniform matrices on …
 2017-06-29 08:10:14 +02:00
Joey de Vries
aa22112332 Merge pull request #68 from 64/master 
Fix more errors on OSX
 2017-06-18 23:20:47 +02:00
Matthew Taylor
4a94fbf2bf Add commented out code to allow window creation on OSX 2017-06-18 01:53:16 +01:00
Joey de Vries
8ffb45834b Merge pull request #67 from 64/master 
Fix OSX errors and warnings
 2017-06-18 01:54:02 +02:00
Matthew Taylor
120c8c8c11 Fix OSX errors and warnings 2017-06-18 00:39:07 +01:00
Joey de Vries
30caeb3489 mesh/model header include fixes. 2017-06-16 19:11:52 +02:00
Joey de Vries
8c45cab498 Final PBR adjustments on code/content-rework. 2017-06-02 23:03:46 +02:00
Joey de Vries
5eddf64303 Code and content re-work: advanced lighting. 2017-06-02 22:53:53 +02:00
Joey de Vries
f844f7c541 Code and content re-work: advanced OpenGL and advanced lighting. 2017-06-01 22:04:34 +02:00
Joey de Vries
49d8d895ae Updated source code to reflect content changes (code re-work): advanced OpenGL and model-loading. 2017-05-31 23:12:15 +02:00
Joey de Vries
70b789d3b9 Code re-work with content: model-loading. 2017-05-31 19:02:05 +02:00
Joey de Vries
e2e36d6ff8 Code re-work and content update: lighting. 2017-05-30 22:17:40 +02:00
Joey de Vries
320db41e89 Code re-work and content update: lighting. 2017-05-30 19:23:56 +02:00
Joey de Vries
18e5fdb443 Code/content re-work: getting started. 2017-05-29 23:47:28 +02:00
Joey de Vries
79e22d716e Content/code update: coordinate systems. 2017-05-29 22:43:07 +02:00
Joey de Vries
28eb2bbf62 Updated code changes to reflect content updates. 2017-05-29 21:04:33 +02:00
Joey de Vries
5846428705 Getting started content code-rework updates. 2017-05-29 20:36:10 +02:00
Joey de Vries
bc718162b1 Another shader tab/whitespace fix. 2017-05-28 08:58:38 +02:00
Joey de Vries
d78752800f Shader tab fix. 2017-05-28 08:56:30 +02:00
Joey de Vries
e84046aecc Removed code re-work warning. 2017-05-28 08:54:23 +02:00
Joey de Vries
13ad6528cd Final updates on PBR tutorials w/ updated code. 2017-05-28 08:52:26 +02:00
Joey de Vries
a398a343a4 PBR Shader fix to code standard. 2017-05-26 15:49:29 +02:00
Joey de Vries
701f4fe608 Fix build errors w/ long path name. 2017-05-26 15:07:44 +02:00
Joey de Vries
ecd23d4de0 All PBR tuts updated. 2017-05-26 15:00:56 +02:00
Joey de Vries
b5ea38f87f Update early PBR chapters to conform to new code standard. 2017-05-26 13:18:50 +02:00
Andrew Ames
5001977dad Fixed stencil testing sample to actually set the uniform matrices on the single color shader program. Without it, the border does not show up. 2017-04-25 14:48:33 -07:00
Joey de Vries
ec4cc678d6 warning update. 2017-04-25 19:11:49 +02:00
Joey de Vries
6f9706af45 Code re-work: Debugging 2017-04-25 18:59:08 +02:00
Joey de Vries
f95da5cccd Code re-work: SSAO 2017-04-24 22:57:05 +02:00
Joey de Vries
0948dfec05 Merge branch 'master' of https://github.com/JoeyDeVries/LearnOpenGL 2017-04-24 20:55:41 +02:00
Joey de Vries
4d5aed34ac Code re-work: deferred shading. 2017-04-24 20:55:39 +02:00
Joey de Vries
bedbcda4cf Code re-work: bloom. 2017-04-24 20:36:40 +02:00
Joey de Vries
437d55dd4f Merge pull request #59 from elect86/patch-2 
Update shaders_class.cpp
 2017-04-24 20:18:03 +02:00