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
539 Commits 2 Branches 0 Tags
1acd9c17bbc361b49b90efa30502174c9c977c72
Commit Graph

539 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Joey de Vries
788234556d Update README.md 2020-06-13 12:23:15 +02:00
Joey de Vries
de610b8fe9 Use correct shader include for text rendering example. 2020-06-09 13:03:45 +02:00
Joey de Vries
3615cfce79 Do Geometry Shader normal visualization in view-space to prevent perspective distortion. 2020-06-04 17:41:32 +02:00
Joey de Vries
3c5fd34424 Pass shader by reference on mesh/model classes. 2020-06-04 17:25:52 +02:00
Joey de Vries
e5d75fb881 Fix texture rename on CMakeLIsts. 2020-06-03 17:07:22 +02:00
Joey de Vries
b963e2a4c9 Fix several texture/shader exercises to use updated code viewer. 2020-06-02 17:19:49 +02:00
Joey de Vries
bc75e9bae0 Few fixes normal mapping code. 2020-05-26 17:39:54 +02:00
Joey de Vries
42eeb4a01f Fix RGBA issue on Bloom demo as well. 2020-05-26 17:19:39 +02:00
Joey de Vries
9a67877172 Use RGBA over RGB to reduce byte-alignment framebuffer incomplete errors. 2020-05-26 17:15:46 +02:00
Joey de Vries
7f41f1fcee Restore stencil test func to defaults once done with stencil operations. 2020-05-26 17:02:06 +02:00
Joey de Vries
1385c8a239 Update Breakout game code. 2020-05-26 17:01:45 +02:00
Joey de Vries
fb5d791d7f Add face culling exercise1 to repo. 2020-05-22 18:01:40 +02:00
Joey de Vries
a3bf2ee860 Add first demo to repo (was still linking to old demo code). 2020-05-22 18:01:27 +02:00
Joey de Vries
f9cae3f84f Rename all occurences of 'Lamp' in Lighting chapter to 'LightCube' (VAO and Shaders). 2020-05-19 17:43:15 +02:00
Joey de Vries
0a65422760 Add multiple lights exercise to repo. 2020-05-18 15:43:50 +02:00
Joey de Vries
5b01e17c8e Another name/index fix for exercise4. 2020-05-17 18:41:52 +02:00
Joey de Vries
ee1d0fa2d2 Fix lighting maps' 4th exercise rename compile target. 2020-05-17 18:40:49 +02:00
Joey de Vries
79f7ea744f Update lighting maps exercise code. 2020-05-17 18:39:27 +02:00
Joey de Vries
45f4f469d0 Add Basic Lighting exercises to repo. 2020-05-17 18:04:36 +02:00
Joey de Vries
ceff4a43f5 Fix CMakeLists debug paths so debugging in the editor works (with correct shader paths). 2020-05-17 17:34:44 +02:00
Joey de Vries
e7d809b317 Readjust camera's FOV zoom code. 2020-05-17 17:06:07 +02:00
Joey de Vries
ef0dcfd5ab add folder number. 2020-05-12 15:17:14 +02:00
Joey de Vries
59c4aafb60 Add camera exercise solutions to repo. 2020-05-12 15:15:57 +02:00
Joey de Vries
d67c29e9d8 Add exercise3 of coordiante systems chapter to repo. 2020-05-08 22:03:53 +02:00
Joey de Vries
9a582d850c Add exercise1 to repo so it works on gh code viewer. 2020-05-08 21:35:59 +02:00
Joey de Vries
216a9283c3 Fix deferred and SSAO chapters to now use backpack model (and apprpriate resolution). 2020-05-05 13:59:18 +02:00
Joey de Vries
f36653f736 Source/model tweaks for updated revision. 2020-05-04 10:57:08 +02:00
Joey de Vries
66d51ae668 Update model chapter, and add new backpack model to repo (w/ attribution mention). Also use new model on deferred source code. 2020-04-30 14:32:14 +02:00
Joey de Vries
f9ae66b16a Breakout spriterenderer: User-code expects rotation in degrees, make sure to convert to radians during transform generation. 2020-04-29 17:40:12 +02:00
Joey de Vries
8d8a449480 Update mesh include class to match updated Mesh chapter. 2020-04-29 15:46:23 +02:00