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
560 Commits 2 Branches 0 Tags
2974edd9d3d4a249399c74b3d9bffd82f789a632
Commit Graph

72 Commits

Author SHA1 Message Date
alexpanter
d082f5b7be Code examples compile and run 2022-10-20 15:41:45 +02:00
alexpanter
a9e0ea22ea Initial commit for area lights guest article 2022-10-20 12:29:22 +02:00
Joey de Vries
514e43052b Merge pull request #307 from alexpanter/master 
Add pbr bloom example code
 2022-06-03 14:27:34 +02:00
alexpanter
0bc8312a14 Adding pbr bloom initial 2022-05-27 20:12:35 +02:00
Jonas Sorgenfrei
61a12ab780 change compute shader extension in cmake 2022-05-25 02:08:53 +02:00
Joey de Vries
995f26be09 Merge pull request #296 from jonassorgenfrei/master 
Compute Shader for guest article
 2022-05-24 13:42:41 +02:00
arby
b7e97ceeec Copy .dlls to the build dir. 2022-05-14 23:48:36 +02:00
Jonas Sorgenfrei
801be81baa end of file 2022-04-04 01:48:17 +02:00
Jonas Sorgenfrei
587ac79769 Merge branch 'JoeyDeVries:master' into master 2022-03-19 11:36:54 +01:00
arby
c42fdcbb3c Freetype find_package only on macos 2022-03-18 23:28:52 +01:00
Jonas_sorgenfrei@yahoo.de
26fca9f8ee adding x64 bit 
adding VS Studio dlls to debugger env
 2022-03-18 21:08:30 +01:00
Laszlo Papp
19dc6ea860 Fix the freetype linker issue on Mac 2022-03-05 17:45:15 +00:00
ankitgamezop
cc6b0b7834 Fixed errors in skeletal animation code 2022-02-19 23:16:20 +05:30
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
arby
938e57f071 Fixed some build errors. 2022-02-17 19:42:50 +01:00
arby
25895c2093 Guest article builds + windows build script. 2022-02-08 21:32:07 +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
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
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
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
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
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
e5d75fb881 Fix texture rename on CMakeLIsts. 2020-06-03 17:07:22 +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
ee1d0fa2d2 Fix lighting maps' 4th exercise rename compile target. 2020-05-17 18:40:49 +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
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
xuveroleg
35271459e7 fix dl link error 
fixes https://github.com/JoeyDeVries/LearnOpenGL/issues/64
 2018-04-24 17:28:46 +03:00
Chen Shuquan
1e2bf7104c 1. add *.vs *.fs *.gs into xcode project as source file 
2. create symbolic link for *.vs *.fs *.gs: changes made in Xcode project for shader will come into effect while running the project
 2018-03-03 00:36:19 +08:00
Chen Shuquan
b1ff9b1908 can run with xcode project genrated by cmake client: output binary into the same dir with resource 2018-02-28 19:48:15 +08:00
David Stutz
0cea4ab65e Fix building, using correct assimp library path, on Linux (Debian). 2018-02-14 10:32:38 +01:00
Joey de Vries
e0edef36dd Update CMakeLists for consistent paths on Linux builds. 2017-11-03 19:12:22 +01:00
dotlive
922e127d0e fix macOS load shader failed. 2017-10-19 07:28:10 +08:00
lost plesed
0cb58d04ba fix mac build failed 
#82
 2017-08-29 11:47:04 +08:00
Shivpratap Chauhan
95598f250a osx cmake build fixes. 2017-07-12 00:45:06 +05:30
Joey de Vries
701f4fe608 Fix build errors w/ long path name. 2017-05-26 15:07:44 +02:00
Joey de Vries
7dc79cd5fa Code re-work: parallax mapping. 2017-04-23 16:30:06 +02:00
Joey de Vries
cdcc3be029 Code re-work: advanced lighting. 2017-04-22 17:07:31 +02:00
Joey de Vries
9994831d5d Code re-work: anti-aliasing. 2017-04-20 21:30:22 +02:00
Joey de Vries
4b6b4d6377 Start code re-work Advanced OpenGL chapter. 2017-04-17 20:40:26 +02:00
Joey de Vries
4b4e0cc839 Code re-format: lighting. 2017-04-10 22:08:47 +02:00
Joey de Vries
d2a4a1e655 PBR IBL Specular tutorial code. 2017-03-31 22:34:26 +02:00
Joey de Vries
534b6ec8c9 IBL Diffuse irradiance source code. Note that these projects use stb_image.h directly, but still link with SOIL causing libray conflicts. Run these specific projects by not linking to SOIL. This will get resolved the moment all projects run on stb_image.h instead of SOIL. 2017-02-16 22:42:05 +01:00
Joey de Vries
c5b584deb9 Improved CMakeLists for clearer project setup with added library support for stb_image. 2017-01-18 21:56:31 +01: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