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
369 Commits 2 Branches 0 Tags
01a2962d0107ea8377495269a76c544b47582289
Commit Graph

369 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joey de Vries
01a2962d01 Add model and include files for Ankit's Skeletal Animation tutorial. 2021-02-07 19:11:46 +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
Joey de Vries
d444d98da7 Merge pull request #205 from NicholasBlaskey/master 
Changed some incorrect comments regarding where the metallic/roughnes…
 2020-10-12 10:09:27 +02:00
Nicholas Blaskey
03c814d403 Changed some incorrect comments regarding where the metallic/roughness values come from 2020-10-11 17:25:54 -04:00
Joey de Vries
b6da46b9f3 Create FUNDING.yml 2020-10-08 14:26:19 +02:00
Joey de Vries
c0e37ada7b Merge pull request #202 from NicholasBlaskey/master 
Renamed sample -> samplePos because sample is a keyword in future glsl versions
 2020-10-08 10:05:22 +02:00
Nicholas Blaskey
649f40b01e Renamed sample -> samplePos because sample is a keyword in future glsl versions 2020-10-07 18:13:51 -04:00
Joey de Vries
c0b8cb6d5b Merge pull request #201 from NicholasBlaskey/master 
Removed a duplicate line of setting a uniform
 2020-10-06 09:47:36 +02:00
Nicholas Blaskey
3ee14a3c2d Removed a duplicate line of setting a uniform 2020-10-05 15:44:30 -04:00
Joey de Vries
c4fae25e8a Merge pull request #200 from github-jane-doe/public/typos 
Typos
 2020-10-04 18:59:26 +02: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
Joey de Vries
0a8d6e582c Merge pull request #192 from daeunSong/master 
Generate smooth normals
 2020-08-19 10:32:20 +02:00
daeunSong
5e511ef621 Generate smooth normals 2020-08-19 16:20:52 +09:00
Joey de Vries
a25bb571c8 Merge pull request #191 from ButchDean/master 
Fixed compile warning.
 2020-08-16 13:21:03 +02:00
Dean Butcher
6ccb76e4c8 Fixed compile warning. 2020-08-15 20:05:58 -03:00
Joey de Vries
9ee05dda15 Merge pull request #190 from daeunSong/master 
Fix texture coordinate tangent and bitangent calculation
 2020-08-13 11:07:38 +02:00
daeunSong
3c4a88761b Fix texture coordinate tangent and bitangent calculation 2020-08-13 17:53:03 +09: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
Joey de Vries
affd714e28 Merge pull request #185 from mahiuchun/font_name 
Make font loading more reliably.
 2020-07-12 16:36:14 +02:00
Hill Ma
0425961389 Make font loading more reliably. 2020-07-11 16:16:26 -07:00
Joey de Vries
08be309c87 Merge branch 'master' of https://github.com/JoeyDeVries/LearnOpenGL 2020-07-06 17:48:42 +02: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
fe79499e15 Merge pull request #183 from mahiuchun/freetype 
Link `freetype` for unix and not apple.
 2020-07-06 17:12:37 +02:00
Hill Ma
99c7ad2380 Link freetype for unix and not apple. 
This prevents a link error on Ubuntu 18.04.
 2020-07-03 18:43:23 -07: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
Joey de Vries
1f9181a2ac Merge pull request #179 from rbarkmore/2d_game 
2d game
 2020-06-25 09:56:29 +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
Joey de Vries
98f58cccf8 Merge pull request #177 from rbarkmore/text_rendering_readme 
Added fonts to resources folder.  Using a font with a 'free' license,
 2020-06-24 18:45:18 +02: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
Joey de Vries
a206d50893 Merge pull request #176 from rbarkmore/text_rendering_readme 
Add Freetype2 to includes and lib folders, update CMakeLists.txt to
 2020-06-23 17:00:35 +02:00
rich_b
38749dff87 Add Freetype2 to includes and lib folders, update CMakeLists.txt to 
properly build the text_rendering example as just one more project.
 2020-06-23 09:59:08 -04:00
Joey de Vries
55e355322a Merge pull request #175 from rbarkmore/text_rendering_readme 
Updated readme for freetype, explaing how to add the freetype library
 2020-06-23 15:11:30 +02: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
Joey de Vries
587d5827c3 Merge pull request #174 from rbarkmore/text_rendering_readme 
Add readme.md for the text_rendering example.
 2020-06-22 09:29:45 +02:00
rich_b
d4e3f80fad Add readme.md for the text_rendering example. 2020-06-21 17:23:23 -04:00
Joey de Vries
4721a50bfb Merge pull request #173 from rbarkmore/fix_text_rend 
Fix 'use' and 'ID' in two places each, delete second main()
 2020-06-20 12:02:43 +02:00
rich_b
0114162c95 Fix 'use' and 'ID' in two places each, delete second main() 2020-06-19 08:25:13 -04:00