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
Oleg Artene
0a2d84d0ec readme: removed outdated section "build in Docker" 
That script was moved here https://github.com/01e9/ide-in-docker
but it's too advanced, too much trouble
 2022-11-27 18:40:11 +02:00
Joey de Vries
b878c64e07 Merge pull request #336 from pattakosn/master 
delete duplicated lines
 2022-11-11 08:47:15 +01:00
N. Pattakos
dccf008e4c delete duplicated lines 2022-11-11 00:05:19 +01:00
arby
e2f2c512e2 Fixed incorrect lower bound setting in an algorithm 2022-10-27 23:10:41 +02:00
alexpanter
d082f5b7be Code examples compile and run 2022-10-20 15:41:45 +02:00
alexpanter
4944998053 Single light example done 2022-10-20 13:59:12 +02:00
alexpanter
eb05991135 First time running 2022-10-20 13:33:49 +02:00
alexpanter
a9e0ea22ea Initial commit for area lights guest article 2022-10-20 12:29:22 +02:00
Joey de Vries
efc34c9437 Fix lerp name ambiguity (need to look into getting rid of using namespace std in header files, for later). 2022-10-01 09:50:20 +02:00
Joey de Vries
2373d636a1 Merge pull request #329 from ButchDean/master 
An even simpler way to build on Mac.
 2022-09-18 08:48:43 +02:00
Dean Butcher
b688f762f7 An even simpler way to build on Mac. 2022-09-17 20:15:26 -04:00
Joey de Vries
6159792dec Fix correct shader activation on AA chapter. 2022-07-11 16:51:08 +02:00
Joey de Vries
08b51d57c0 Merge pull request #315 from jonassorgenfrei/master 
Simplify Motion Calculation in Shader
 2022-07-11 16:05:09 +02:00
Jonas Sorgenfrei
7ddb406442 Merge branch 'JoeyDeVries:master' into master 2022-06-19 18:16:14 +02:00
Jonas_sorgenfrei@yahoo.de
ff76cf3cd6 reader comment adjustment 2022-06-08 01:37:24 +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
Joey de Vries
5183d1c996 Merge pull request #306 from jonassorgenfrei/master 
CMake adjust for compute shader Extension
 2022-05-30 09:36:06 +02:00
alexpanter
4ab092ec96 Make pbr bloom example compile 2022-05-27 21:00:48 +02:00
alexpanter
0bc8312a14 Adding pbr bloom initial 2022-05-27 20:12:35 +02:00
Alexander Christensen
c2f8faa77e Create physically_based_bloom.cpp 2022-05-27 19:09:52 +02:00
Jonas Sorgenfrei
61a12ab780 change compute shader extension in cmake 2022-05-25 02:08:53 +02:00
Joey de Vries
1a6f48e9c5 Rename .comp shader to .cs shader. 2022-05-24 14:31:55 +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
Joey de Vries
2884816a61 Merge pull request #301 from arbmarton/animation_shader_fix 
Skeletal animation project fix + windows DLL copy
 2022-05-24 13:38:54 +02:00
Jonas Sorgenfrei
dfa96f593e Merge branch 'master' of https://github.com/jonassorgenfrei/LearnOpenGL 2022-05-15 15:56:17 +02:00
Jonas Sorgenfrei
f9ab4337fc adjusted comments from article feedback 2022-05-15 15:56:10 +02:00
arby
b7e97ceeec Copy .dlls to the build dir. 2022-05-14 23:48:36 +02:00
arby
636cfae622 Fixed the layouts in the skeletal_animation vertex shader. 2022-05-14 23:38:08 +02:00
Harald Reingruber
13c446f255 Fix update of model matrix 2022-05-12 16:25:58 +02:00
Jonas Sorgenfrei
36a2eb863f Merge branch 'JoeyDeVries:master' into master 2022-05-06 13:33:54 +02:00
Joey de Vries
c0ecf480f9 Merge pull request #297 from haraldreingruber-dedalus/fix-loading-entities-of-scenegraph-example 
Fix loading of entities in scene graph example
 2022-04-26 18:08:18 +02:00
Harald Reingruber
d65be1e880 Fix loading of entities in scene graph example 2022-04-26 18:04:19 +02:00
Jonas Sorgenfrei
2024ac1aee changed variable naming 2022-04-24 14:25:54 +02:00
Jonas Sorgenfrei
b0e8a4c990 fix version of Fragment and Vertex Shader 2022-04-23 20:19:04 +02:00
Jonas_sorgenfrei@yahoo.de
25d692253f reverted shader_m 2022-04-04 14:36:57 +02:00
Jonas_sorgenfrei@yahoo.de
36e0cc9ec3 create seperate shader 2022-04-04 14:34:41 +02:00
Jonas Sorgenfrei
8fe4397758 Merge pull request #1 from jonassorgenfrei/computeShaderHelloWorld 
Compute shader hello world
 2022-04-04 01:54:23 +02:00
Jonas Sorgenfrei
1751f341ec Delete weighted_blended.cpp 2022-04-04 01:53:34 +02:00
Jonas Sorgenfrei
ace261e60f Delete composite.vs 2022-04-04 01:53:15 +02:00
Jonas Sorgenfrei
5e51f03c20 Delete composite.fs 2022-04-04 01:53:08 +02:00
Jonas Sorgenfrei
801be81baa end of file 2022-04-04 01:48:17 +02:00
Jonas Sorgenfrei
c6385183b3 compute shader 2022-04-04 01:44:24 +02:00
Joey de Vries
166aeced4b Merge pull request #294 from beaumanvienna/master 
update assimp_glm_helpers.h
 2022-03-21 19:38:21 +01:00
JC
f61a4d8043 update assimp_glm_helpers.h 2022-03-20 16:17:08 -07:00
Joey de Vries
5abd8d67e3 Merge pull request #291 from jonassorgenfrei/master 
Adding dlls to debugger path for visual Studio
 2022-03-20 20:32:07 +01:00
Jonas Sorgenfrei
587ac79769 Merge branch 'JoeyDeVries:master' into master 2022-03-19 11:36:54 +01:00
Jonas_sorgenfrei@yahoo.de
0ed1ebe039 edited readme 2022-03-19 11:36:29 +01:00
Joey de Vries
95f76c2e0d Merge pull request #290 from arbmarton/fix_cmake_windows 
Freetype find_package only on macos
 2022-03-19 07:44:55 +01:00
Joey de Vries
6d2bad74a6 Merge pull request #289 from arbmarton/fix_csm_bug 
Removed bogus line of code
 2022-03-19 07:44:27 +01:00
arby
c42fdcbb3c Freetype find_package only on macos 2022-03-18 23:28:52 +01:00