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
456 Commits 2 Branches 0 Tags
b0e8a4c990c9bedfeff4a6a0d9b26ae28d6dbf3d
Commit Graph

456 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joey de Vries
d4af863bc3 Adjust light values to hit bloom threshold. 2019-01-08 20:56:26 +01:00
Joey de Vries
f4b6763356 Update GLM to latest version (0.9.9.3). This includes GLM's change of matrices no longer default initializing to the identity matrix. This commit thus also includes the update of all of LearnOpenGL's code to reflect this: all matrices are now constructor-initialized to the identity matrix where relevant. 2018-12-30 14:27:14 +01:00
Joey de Vries
239c456ae9 Merge pull request #127 from tim3385/master 
LN134: The second parameter internalFormat GL_RGB will not work on Op…
 2018-11-24 20:51:28 +01:00
houstond
d07b463cfc LN134: The second parameter internalFormat GL_RGB will not work on OpenGL es. GL_RGB should be GL_RGBA. 2018-11-24 12:03:07 +08:00
Joey de Vries
e2d82e2cfb Merge pull request #118 from linesight/master 
fix unreferenced local variable warning
 2018-09-20 13:37:31 +02:00
linesight
ce0c6dab4e fix unreferenced local variable warning 2018-09-20 01:23:38 -07:00
linesight
b17767ed89 Merge remote-tracking branch 'upstream/master' 2018-09-20 00:43:34 -07:00
linesight
95a8b4dd8c fix unreferenced local variable warning 2018-09-20 00:33:58 -07:00
Joey de Vries
36e1f03d44 Merge pull request #117 from linesight/master 
fix unreferenced local variable warning
 2018-09-13 09:29:14 +02:00
linesight
437ba8b08d fix unreferenced local variable warning 2018-09-12 22:24:36 -07:00
Joey de Vries
2d6a9b964d Merge branch 'master' of https://github.com/JoeyDeVries/LearnOpenGL 2018-08-23 19:03:10 +02:00
Joey de Vries
d091c7b9c4 Add updated awesomeface.png back to repository. 2018-08-23 19:02:16 +02:00
Joey de Vries
b7836922b0 Merge pull request #116 from arteniioleg/master 
Docker configuration minor improvements
 2018-08-19 22:55:47 +02:00
Joey de Vries
443f16db60 Update awesomeface.png image to fix white-border artifacts. 2018-06-19 20:51:36 +02:00
arteniioleg
8deb4c45a3 docker: removed x11docker --no-init, not needed anymore 2018-05-05 11:47:19 +03:00
arteniioleg
ba90540eea dockerfile: clean apt 2018-05-04 16:57:49 +03:00
arteniioleg
98aeeece5a Dockerfile: install kmod package 2018-04-27 22:55:37 +03:00
Joey de Vries
cdceb36d25 Merge pull request #108 from arteniioleg/master 
fix `dl` link error
 2018-04-24 16:32:48 +02:00
xuveroleg
35271459e7 fix dl link error 
fixes https://github.com/JoeyDeVries/LearnOpenGL/issues/64
 2018-04-24 17:28:46 +03:00
Joey de Vries
9e235570f2 Merge pull request #107 from arteniioleg/master 
Build and run in docker
 2018-04-24 16:14:09 +02:00
xuveroleg
c876c7aec8 docker: enabled gpu support 2018-04-24 16:57:17 +03:00
xuveroleg
4c23c8144f created docker/ide.sh to start IDE in docker 2018-04-24 15:44:15 +03:00
xuveroleg
57e270637e initial Dockerfile with GUI libs for IDE 2018-04-24 15:43:39 +03:00
Joey de Vries
79ff6cbb68 Merge pull request #105 from keith2018/keith2018-patch-1 
fix shader file names
 2018-04-12 07:48:49 +02:00
keith2018
1a70c3efad fix shader file names 2018-04-12 10:33:41 +08:00
Joey de Vries
d0fc384f29 Merge pull request #104 from d3BugErr/master 
Another take on PBR tutorials missing rows and columns
 2018-04-10 15:51:48 +02:00
Erik
686797546a Update lighting_textured.cpp 
Real fix for missing rows and columns.
 2018-04-10 16:47:52 +03:00
Erik
ac1784f29b Update lighting.cpp 
Real fix for missing rows and columns.
 2018-04-10 16:47:20 +03:00
Joey de Vries
75648e81f6 Merge pull request #103 from d3BugErr/master 
Tutorial PBR 1.1 sphere grid construction fix
 2018-04-10 12:56:43 +02:00
d3BugErr
3eaf086897 Spheres model matrix generation fix 
Fix of integer division resulting in some spheres being rendered at same position.
Removed redundant float cast as all operands are being promoted to double anyways.
 2018-04-10 13:07:43 +03:00
Erik
e511ca603d Revert "Spheres model matrix generation fix" 
This reverts commit d702e0c6bf.
 2018-04-10 12:39:42 +03:00
d3BugErr
d702e0c6bf Spheres model matrix generation fix 
Fix of integer division resulting in some spheres being rendered at same position.
Removed redundant float cast as all operands are being promoted to double anyways.
 2018-04-10 11:23:09 +03:00
Joey de Vries
19f312b8f6 Merge pull request #102 from rarest/master 
For Xcode project: *.vs *.fs *.gs can be shown in project, changes made for shaders in project will come into effect when running
 2018-03-03 00:36:38 +01:00
Chen Shuquan
1e2bf7104c 1. add *.vs *.fs *.gs into xcode project as source file 
2. create symbolic link for *.vs *.fs *.gs: changes made in Xcode project for shader will come into effect while running the project
 2018-03-03 00:36:19 +08:00
Joey de Vries
746e751e56 Merge pull request #101 from rarest/master 
Can run with xcode project genrated by cmake client
 2018-03-01 09:40:29 +01:00
Chen Shuquan
b1ff9b1908 can run with xcode project genrated by cmake client: output binary into the same dir with resource 2018-02-28 19:48:15 +08:00
Joey de Vries
5c85f5fa20 Merge pull request #100 from klayklogg/master 
Fix a few spelling mistakes in camera.h
 2018-02-23 08:01:32 +01:00
klayklogg
498fa36396 Fix some spelling mistakes in constants, comments 2018-02-23 17:07:04 +13:00
Joey de Vries
451d772c02 Merge pull request #99 from davidstutz/master 
Fix build (using correct Assimp library) on Linux (Debian).
 2018-02-14 18:36:41 +01:00
David Stutz
0cea4ab65e Fix building, using correct assimp library path, on Linux (Debian). 2018-02-14 10:32:38 +01:00
Joey de Vries
c12bb682bf Complete build instructions Mac OS X (and typofix) 2018-02-10 10:03:24 +01:00
Joey de Vries
386dd729f3 Update ReadMe with Mac OS X instructions, issue #98. 2018-02-09 22:06:59 +01:00
Joey de Vries
eb6892ef80 Update soruce license. 2018-01-30 09:00:49 +01:00
Joey de Vries
3309ae604b Fix skybox order. 2018-01-22 19:11:11 +01:00
Joey de Vries
f9913d5aa8 Merge branch 'master' of https://github.com/JoeyDeVries/LearnOpenGL 2018-01-16 08:51:04 +01:00
Joey de Vries
3b605521fb Fix geometry shader normal homogenous coordinate, and use std::string instead of aString for model loading. 2018-01-16 08:50:57 +01:00
Joey de Vries
fdb1edf760 Merge pull request #97 from sallyx/patch-1 
Added required Linux dev packages
 2017-12-06 19:37:29 +01:00
sallyx
036315579c Added required Linux dev packages 
I needed to install these packages, otherwise my build end with linkage error (-lXi misssing etc.)
 2017-12-06 19:00:02 +01:00
Joey de Vries
b1554e99a7 Merge pull request #95 from Galfatron/master 
decoupled assimp from mesh.h
 2017-11-28 12:40:04 +01:00
Galfatron
2178776423 decoupled assimp from mesh.h 2017-11-27 20:16:05 -08:00