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

284 Commits

Author SHA1 Message Date
Joey de Vries
0f3d3160bb Merge pull request #262 from pattakosn/master 
fix compiler/linker warning messages
 2022-01-11 11:28:37 +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
72f3e37150 fix narrowing conversions (eg double to float, size_t to GLsizei) 2022-01-08 00:20:26 +01:00
Joey de Vries
b49ea10348 Fix correct shader names skeletal animation. 2021-11-23 14:01:54 +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
Nipun Ramani
89f3a18dd0 Corrected ambient lighting calculation 2021-10-17 18:30:59 +05:30
arby
c7102b1d9b Simplified CSM code, removed some comments. 2021-10-07 23:28:51 +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
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
cyaneko
b7a196ba4a Fix a minor bug in rear view mirror 
Rotating both the Yaw and Pitch would cause the mirror to display whatever was in front but with Pitch * -1, this fixes this behaviour. Tested.
 2021-08-19 21:10:57 +02:00
Joey de Vries
e48244d8b6 Merge pull request #234 from gonnavis/master 
Fix typo: nominator to numerator.
 2021-05-27 15:03:43 +02:00
gonnavis
c976eee7ea Fix typo: nominator to numerator. 2021-05-06 17:26:13 +08:00
Phillip Chang
4dc5862c12 Fix bug: glDisable(GL_DEPTH) -> glDisable(GL_DEPTH_TEST) 2021-05-05 23:46:21 +09:00
Joey de Vries
85ee9d136f Use normalized cross product results for irradiance map generation in PBR tutorials. 2021-04-07 10:00:07 +02:00
Joey de Vries
0e424d3710 Add first version weighted blended OIT source code for OIT guest article. 2021-03-21 13:33:22 +01:00
Joey de Vries
90f44b65bb Update include files to add appropriate model_animation include. 2021-02-07 19:15:34 +01:00
Joey de Vries
e72d3e05d7 Include cpp skeletal animation tutorial file. 2021-02-07 19:13:14 +01:00
Joey de Vries
dfcf5ed149 Add levels to breakout 2D source code. 2021-01-24 10:37:09 +01:00
Joey de Vries
95ed602bd6 Also update hello triangle example. 2021-01-20 16:28:47 +01:00
Joey de Vries
ac661d85f3 Use unsigned ints for shader ids. 2021-01-20 16:22:44 +01:00
Joey de Vries
73ff9934d0 Update PBR lighting chapter to support large DGGX values as 0-clamp was too high. 2020-12-30 09:55:55 +01:00
Joey de Vries
9a46ecf526 Prevent 1.0 - cosTheta from becoming negative due to small FP inaccuracies. This can cause NaNs otherwise. 2020-12-13 13:53:56 +01:00
Nicholas Blaskey
03c814d403 Changed some incorrect comments regarding where the metallic/roughness values come from 2020-10-11 17:25:54 -04:00
Nicholas Blaskey
649f40b01e Renamed sample -> samplePos because sample is a keyword in future glsl versions 2020-10-07 18:13:51 -04:00
Nicholas Blaskey
3ee14a3c2d Removed a duplicate line of setting a uniform 2020-10-05 15:44:30 -04:00
Jane Doe
2753224137 necessery -> necessary 2020-10-04 09:44:29 -07:00
Jane Doe
b1e0d26d35 minifcation -> minification 2020-10-04 09:43:29 -07:00
Jane Doe
b91f519d6f declerations -> declarations 2020-10-04 09:41:34 -07:00
Jane Doe
cb871509fa seperated -> separated 2020-10-04 09:40:26 -07:00
Jane Doe
1ff4bf03c2 treshold -> threshold 2020-10-04 09:40:06 -07:00
Jane Doe
e9467e18ed Mathemtics -> Mathematics 2020-10-04 09:35:17 -07:00
Dean Butcher
6ccb76e4c8 Fixed compile warning. 2020-08-15 20:05:58 -03:00
Joey de Vries
e09f4d657a Merge branch 'master' of https://github.com/JoeyDeVries/LearnOpenGL 2020-08-06 12:04:24 +02:00
Joey de Vries
37b08a6546 Remove default menu state from Breakout's program as this breaks rendering/flow in chapters before Text Rendering (will be set from Game's constructor only). 2020-08-06 12:03:54 +02:00
Hill Ma
0425961389 Make font loading more reliably. 2020-07-11 16:16:26 -07:00
Joey de Vries
cfd43bd404 Return exit error code on main when freetype (or its setup) fails. 2020-07-06 17:48:35 +02:00
Joey de Vries
1e590697b1 Get the 0.full_source folder back in game directory and comment out game compile, not ideal, but needs to be reverted for now to not break code/book links, will look into better fix. 2020-07-01 09:52:04 +02:00
rich_b
7aa2a51ed2 moved 2d_game resource sub folders to the main resource folder. 
changed game.cpp to load resources using filesystem.
 2020-06-24 16:36:44 -04:00
rich_b
581ebd8061 Changed to reflect moving and renaming the *.fs and *.vs shader files. 2020-06-24 15:43:22 -04:00
rich_b
5d919242f1 move shaders up a level, running cmake won't copy the shaders in 
a sub folder into the bin folders.  Rename four files from *.frag
to *.fs, to be consistent with the rest of the examples.
Renamed text.* to text_2d.*, so they won't conflict or overwrite
the text.* files under text_rendering example.
 2020-06-24 15:41:26 -04:00
rich_b
a694c848c7 Change CMakeLists.txt to add 2d_game project, and added irrKlang to LIBS. 
Added irrKlang.dll and ikpMP2.dll to dlls folder.  Added irrKlang as a
sub-folder under includes.  Added irrKlang.lib to lib folder.  At this point
running cmake gave an error it couldn't find source files under 2d_game.
Moved 2d_game source up one folder level, then cmake found the files.
 2020-06-23 14:39:31 -04:00
rich_b
68ea5ee345 Added fonts to resources folder. Using a font with a 'free' license, 
refer to the license file for details.  Updated text_rendering to load
the font from the resouces folder.  The user doesn't need to do anything
except build the solution.
 2020-06-23 13:55:09 -04:00
rich_b
4132da36f8 Updated readme for freetype, explaing how to add the freetype library 
to CMakeLists.txt.
 2020-06-23 09:02:53 -04:00
rich_b
d4e3f80fad Add readme.md for the text_rendering example. 2020-06-21 17:23:23 -04:00