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

Merge pull request #301 from arbmarton/animation_shader_fix

Browse Source 
Skeletal animation project fix + windows DLL copy
This commit is contained in:
Joey de Vries
2022-05-24 13:38:54 +02:00
committed by GitHub
parent c0ecf480f9 b7e97ceeec
commit 2884816a61
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@@ -236,10 +236,13 @@ function(create_project_from_sources chapter demo)
"src/${chapter}/${demo}/*.fs"
"src/${chapter}/${demo}/*.gs"
)
# copy dlls
file(GLOB DLLS "dlls/*.dll")
foreach(SHADER ${SHADERS})
if(WIN32)
# configure_file(${SHADER} "test")
add_custom_command(TARGET ${NAME} PRE_BUILD COMMAND ${CMAKE_COMMAND} -E copy ${SHADER} $<TARGET_FILE_DIR:${NAME}>)
add_custom_command(TARGET ${NAME} PRE_BUILD COMMAND ${CMAKE_COMMAND} -E copy ${DLLS} $<TARGET_FILE_DIR:${NAME}>)
elseif(UNIX AND NOT APPLE)
file(COPY ${SHADER} DESTINATION ${CMAKE_SOURCE_DIR}/bin/${chapter})
elseif(APPLE)

6
src/8.guest/2020/skeletal_animation/anim_model.vs
View File

@@ -3,8 +3,10 @@
layout(location = 0) in vec3 pos;
layout(location = 1) in vec3 norm;
layout(location = 2) in vec2 tex;
layout(location = 3) in ivec4 boneIds;
layout(location = 4) in vec4 weights;
layout(location = 3) in vec3 tangent;
layout(location = 4) in vec3 bitangent;
layout(location = 5) in ivec4 boneIds;
layout(location = 6) in vec4 weights;
uniform mat4 projection;
uniform mat4 view;