Commit Graph

566 Commits

Author SHA1 Message Date
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
arby
f144783220 Removed bogus line of code 2022-03-18 23:24:49 +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
Joey de Vries
9f9c9588bb Merge pull request #285 from lpapp/issue-268
Fix the freetype linker issue on Mac
2022-03-05 21:03:07 +01:00
Joey de Vries
506831147e Merge pull request #284 from lpapp/issue-283
Fix the compilation issue on Mac
2022-03-05 21:02:43 +01:00
Laszlo Papp
19dc6ea860 Fix the freetype linker issue on Mac 2022-03-05 17:45:15 +00:00
Laszlo Papp
9941098651 Fix the compilation issue on Mac 2022-03-05 17:09:39 +00:00
Joey de Vries
a1958b7bea Merge pull request #280 from NonLinearGuy/master
corrected uniform name for bone transformations
2022-03-02 17:36:35 +01:00
Ankit Singh Kushwah
8aae281d6c Merge branch 'JoeyDeVries:master' into master 2022-03-02 09:13:08 +05:30
ankitgamezop
5e99d5e186 corrected shader uniform name 2022-03-02 09:11:28 +05:30
Joey de Vries
5cf4ff07db Merge pull request #274 from jpaoneMines/master
Missing file for Guest Tessellation article
2022-02-20 17:52:18 +01:00
Joey de Vries
9cbc884dd6 Merge pull request #275 from NonLinearGuy/master
Fixed errors in skeletal animation code
2022-02-20 17:50:22 +01:00
Joey de Vries
aaf2f9f264 Merge pull request #276 from arbmarton/cascade_visualizer
Added a visualizer for shadow cascade volumes
2022-02-20 17:49:38 +01:00
arby
876053d332 Added a visualizer for shadow cascade volumes. 2022-02-19 20:21:08 +01:00
ankitgamezop
cc6b0b7834 Fixed errors in skeletal animation code 2022-02-19 23:16:20 +05:30
jpaone
eff4455a9f Shader Class that can create a Shader Program consisting of Vertex, Tessellation Control & Evaluation, Geometry, and Fragment Shaders 2022-02-18 20:11:35 -07:00
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
Joey de Vries
994800632e Merge pull request #273 from Pierce-qiang/master
Update cubemaps_environment_mapping.cpp
2022-02-18 09:50:30 +01:00
Pierce
f9812ac1cf Update cubemaps_environment_mapping.cpp 2022-02-18 14:03:43 +08:00
arby
938e57f071 Fixed some build errors. 2022-02-17 19:42:50 +01:00
Joey de Vries
29b7cf2b57 Merge pull request #270 from arbmarton/build_script_update
Guest article builds + windows build script.
2022-02-08 21:41:51 +01:00