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
432 Commits 2 Branches 0 Tags
8aae281d6c91ee2cc459ecb55c2e22457a831a60
Commit Graph

432 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ankit Singh Kushwah
8aae281d6c Merge branch 'JoeyDeVries:master' into master 2022-03-02 09:13:08 +05:30
ankitgamezop
5e99d5e186 corrected shader uniform name 2022-03-02 09:11:28 +05:30
Joey de Vries
5cf4ff07db Merge pull request #274 from jpaoneMines/master 
Missing file for Guest Tessellation article
 2022-02-20 17:52:18 +01:00
Joey de Vries
9cbc884dd6 Merge pull request #275 from NonLinearGuy/master 
Fixed errors in skeletal animation code
 2022-02-20 17:50:22 +01:00
Joey de Vries
aaf2f9f264 Merge pull request #276 from arbmarton/cascade_visualizer 
Added a visualizer for shadow cascade volumes
 2022-02-20 17:49:38 +01:00
arby
876053d332 Added a visualizer for shadow cascade volumes. 2022-02-19 20:21:08 +01:00
ankitgamezop
cc6b0b7834 Fixed errors in skeletal animation code 2022-02-19 23:16:20 +05:30
jpaone
eff4455a9f Shader Class that can create a Shader Program consisting of Vertex, Tessellation Control & Evaluation, Geometry, and Fragment Shaders 2022-02-18 20:11:35 -07:00
Joey de Vries
6f9610815f Merge pull request #272 from arbmarton/guest_build_errors 
Some guest article build error fixes
 2022-02-18 18:18:39 +01:00
arby
74dd442b7d Added an extra comment to the CMake file 2022-02-18 16:59:51 +01:00
arby
3ba3abdae6 Updated MSVC target compile options to C++17 2022-02-18 16:56:43 +01:00
Joey de Vries
bfc25470ed Comment out 2 guest article examples as they're not compiling succesfully. 2022-02-18 10:00:51 +01:00
Joey de Vries
994800632e Merge pull request #273 from Pierce-qiang/master 
Update cubemaps_environment_mapping.cpp
 2022-02-18 09:50:30 +01:00
Pierce
f9812ac1cf Update cubemaps_environment_mapping.cpp 2022-02-18 14:03:43 +08:00
arby
938e57f071 Fixed some build errors. 2022-02-17 19:42:50 +01:00
Joey de Vries
29b7cf2b57 Merge pull request #270 from arbmarton/build_script_update 
Guest article builds + windows build script.
 2022-02-08 21:41:51 +01:00
arby
25895c2093 Guest article builds + windows build script. 2022-02-08 21:32:07 +01:00
Joey de Vries
cf70474732 Merge pull request #264 from RandomErrorMessage/bugfix 
bugfix: (int)4 -> (float)4.0
 2022-01-17 18:59:36 +01:00
RandomErrorMessage
63362578f2 bugfix: (int)4 -> (float)4.0 2022-01-16 16:28:15 -08:00
Joey de Vries
d57df39bf5 Add source code for DSA guest chapter. 2022-01-11 14:15:04 +01:00
Joey de Vries
2b578f8d69 Add source code for tessellation guest chapters. 2022-01-11 13:51:04 +01:00
Joey de Vries
0f3d3160bb Merge pull request #262 from pattakosn/master 
fix compiler/linker warning messages
 2022-01-11 11:28:37 +01:00
Joey de Vries
b353a9b679 Merge pull request #263 from azisyus/master 
fix texture coordinate
 2022-01-10 12:34:19 +01:00
can
29f1c099ac fix texture coordinate 2022-01-10 14:16:44 +03:00
N. Pattakos
93be6f82ab update merge request as requested by JoeyDeVries: no auto or GLtypes 2022-01-10 00:45:44 +01:00
N. Pattakos
1be7d8ab3e update list of packages required to build on debian and ubuntu in Readme file 2022-01-08 00:21:34 +01:00
N. Pattakos
da279c2fd9 fix warning LNK4099 
added linker option to silence VS warning LNK4099.
Again, ignoring this message is not the Right Thing to do, but in my opinion is good enough for this project and better than having a ton of warning messages hiding potentially useful ones.
 2022-01-08 00:21:29 +01:00
N. Pattakos
72f3e37150 fix narrowing conversions (eg double to float, size_t to GLsizei) 2022-01-08 00:20:26 +01:00
N. Pattakos
47a6664845 fix warning: getenv not secure 
Just silence the warning. Yes, the Right Thing to do would be to use the newer and safer ways instead of getenv, but silencing it is simpler and suffices for this project's needs :)
 2022-01-08 00:20:23 +01:00
N. Pattakos
2ad7b99766 fix warnings: "cl : Command line warning D9002 : ignoring unknown option" 
They were caused by the VS compiler not understanding the "-std=c++11" option.
The old style CMake way of setting C++11 version was replaced with the new one which is crossplatform/compiler and fixes the warning.
 2022-01-08 00:18:33 +01:00
N. Pattakos
76b3e85352 fix unused exception parameter: print it in exception message 2022-01-07 23:09:38 +01:00
Joey de Vries
b49ea10348 Fix correct shader names skeletal animation. 2021-11-23 14:01:54 +01:00
Joey de Vries
a6a16e3565 Merge pull request #255 from SnowyLake/master 
Fix glBufferDelete() argument mistake in cubemaps_skybox.cpp
 2021-11-09 11:05:52 +01:00
SnowyLake
31c2cf3a9a bugfix: In cubemaps_skybox.cpp, the second argument to glBufferDelete() should be &SkyboxVBO instead of &SkyboxVAO 2021-11-09 17:26:20 +08:00
Joey de Vries
2c8bf91c50 Merge pull request #254 from jiannanya/fix_mesh.h_comments 
fix comments in mesh.h
 2021-10-29 10:22:48 +02:00
Jiannanya
23cd2123f0 fix comments in mesh.h 
stream->string
 2021-10-29 10:02:58 +08:00
Joey de Vries
279e6be7fa Merge pull request #251 from BhayanakMoth/fix-ambient 
Corrected ambient lighting calculation
 2021-10-18 10:24:26 +02:00
Nipun Ramani
89f3a18dd0 Corrected ambient lighting calculation 2021-10-17 18:30:59 +05:30
Joey de Vries
a11954e474 Merge pull request #249 from arbmarton/csm_update 
Simplified CSM code, removed some comments.
 2021-10-08 09:54:57 +02:00
arby
c7102b1d9b Simplified CSM code, removed some comments. 2021-10-07 23:28:51 +02:00
Joey de Vries
6f03f5a959 Another source code update on skeletal animation article. 2021-09-10 17:09:29 +02:00
Joey de Vries
a051a65d80 Updated source code files of skeletal animation guest article. 2021-09-08 20:43:58 +02:00
Joey de Vries
0ce49088e5 Add source code for the cascaded shadow mapping guest article. 2021-09-08 19:06:07 +02:00
Joey de Vries
54dd372518 Add source files for scene (graph + frustum culling) guest article. 2021-09-02 15:27:27 +02:00
Joey de Vries
0d538f002d Use numerator instead of nominator (re-applied previous commit). 2021-09-01 12:43:10 +02:00
Joey de Vries
2ef9c55f16 Merge branch 'master' of https://github.com/JoeyDeVries/LearnOpenGL 
# Conflicts:
#	src/6.pbr/1.1.lighting/1.1.pbr.fs
#	src/6.pbr/1.2.lighting_textured/1.2.pbr.fs
#	src/6.pbr/2.1.1.ibl_irradiance_conversion/2.1.1.pbr.fs
#	src/6.pbr/2.1.2.ibl_irradiance/2.1.2.pbr.fs
#	src/6.pbr/2.2.1.ibl_specular/2.2.1.pbr.fs
#	src/6.pbr/2.2.2.ibl_specular_textured/2.2.2.pbr.fs
 2021-09-01 12:42:27 +02:00
Joey de Vries
946cbc9118 Fix PBR source code inconsistencies (thanks Andrei!). Also fix winding order sphere and update CMake min. version. 2021-09-01 12:40:43 +02:00
Joey de Vries
bad2db3fe5 Merge pull request #247 from JelleVos1/patch-1 
Update textures.cpp
 2021-09-01 11:18:14 +02:00
Jelle Vos
c85067d4fe Update textures.cpp 
On line 109 glGenerateMipmap is getting called but the GL_TEXTURE_MIN_FILTER uses GL_LINEAR. Changed it to GL_LINEAR_MIPMAP_LINEAR
 2021-08-28 19:04:33 +02:00
Joey de Vries
48010de993 Merge pull request #245 from cyaneko/patch-1 
Fix a minor bug in rear view mirror
 2021-08-20 15:06:35 +02:00