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
397 Commits 2 Branches 0 Tags
23cd2123f0f1b45588ea040a10aa6257ee437f47
Commit Graph

49 Commits

Author SHA1 Message Date
Joey de Vries
dfcf5ed149 Add levels to breakout 2D source code. 2021-01-24 10:37:09 +01:00
Jane Doe
2753224137 necessery -> necessary 2020-10-04 09:44: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
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
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
de610b8fe9 Use correct shader include for text rendering example. 2020-06-09 13:03:45 +02:00
Joey de Vries
1385c8a239 Update Breakout game code. 2020-05-26 17:01:45 +02:00
Joey de Vries
f36653f736 Source/model tweaks for updated revision. 2020-05-04 10:57:08 +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
ab132220a9 Add (updated) source code for Text Rendering chapter. 2020-04-29 13:51:53 +02:00
Joey de Vries
6d1136d09a Update debugging example code to match Debugging chapter updates. 2020-04-29 11:57:45 +02:00
Joey de Vries
39cdda55e4 Merge branch 'master' of https://github.com/JoeyDeVries/LearnOpenGL 2020-04-29 10:41:42 +02:00
Joey de Vries
88ab67dad2 Add glDeleteProgram call to relevant examples. 2020-04-29 10:41:28 +02:00
Joey de Vries
6d2976e4f9 Merge pull request #166 from FlexW/patch-1 
Zero out memory from color variable
 2020-04-29 10:36:00 +02:00
Joey de Vries
82b066067f Update Breakout source code to match updates Text Rendering chapter. 2020-04-28 14:46:15 +02:00
Felix Weilbach
c91f8d65a5 Zero out memory from color variable 
According to [here](https://www.khronos.org/opengl/wiki/Type_Qualifier_(GLSL)#Fragment_shader_outputs) memory of a fragment shader variable is initialized with undefined values. Therefore it should be zeroed out.
 2020-04-27 16:44:24 +02:00
Joey de Vries
be066bcb6e Add Breakout progress code for Audio chapter. 2020-04-27 15:00:23 +02:00
Joey de Vries
75c6d5fa97 Update Breakout progress code for PowerUps chapter. Also few missed items on prev. progress code. 2020-04-27 14:26:24 +02:00
Joey de Vries
596c654c2c Add progress code item for Breakout's PostProcessing chapter. 2020-04-26 12:58:03 +02:00
Joey de Vries
9a34b34b32 Fix include error on 6.game.cpp progress. 2020-04-25 16:58:38 +02:00
Joey de Vries
4b890eca6b Update Breakout code for revised Particles chapter. 2020-04-25 16:57:19 +02:00
Joey de Vries
abbcac5743 Add game progress code for Breakout collision chapters. Add forgotten destructor logic on previous progress files. 2020-04-24 15:51:32 +02:00
Joey de Vries
01def67b0d Add progress ball object code. 2020-04-23 12:30:50 +02:00
Joey de Vries
85af3b93fa Fix awesomeface alpha channel on texture. 2020-04-23 12:30:38 +02:00
Joey de Vries
90163ce702 Forgot to add relevant include. 2020-04-23 12:01:15 +02:00
Joey de Vries
351c968373 Update breakout code to match revised changes 'Levels' chapter. 2020-04-23 12:00:15 +02:00
Joey de Vries
1f05d38e1e Breakout changes for revision 'Rendering Sprites' 2020-04-22 19:02:20 +02:00
Joey de Vries
91f53af052 Remove unnecessary 'uncomment' statement from all code samples. 2020-04-22 16:37:07 +02:00
Joey de Vries
e046977ffb Update Breakout code for 'Setting up' chapter. 2020-04-22 16:35:13 +02:00
Joey de Vries
599355fba8 First chapter-specific progress breakout code; test to see if I can link these directly from article. 2020-04-22 16:05:11 +02:00
Joey de Vries
d756ed80fa Add full source code of the finished (and revised code) Breakout example. Not set up for cross-platform compilation as it has irrKlang and FreeType dependency, but at least source code is available online (and can be referenced from Breakout chapters). 2020-04-22 15:47:23 +02: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
Shivpratap Chauhan
2d16ef0fe2 GLFW hint GLFW_OPENGL_FORWARD_COMPAT is must on osx to create glfw 
window successfully
 2017-07-12 17:06:00 +05:30
Matthew Taylor
4a94fbf2bf Add commented out code to allow window creation on OSX 2017-06-18 01:53:16 +01:00
Joey de Vries
6f9706af45 Code re-work: Debugging 2017-04-25 18:59:08 +02:00
Joey de Vries
0a46f53608 Template PBR lighting tut with folder re-structure to fit PBR tuts. 2016-12-12 21:10:58 +01:00