From 636cfae62286b6aa2101a767c7249193a9c8adda Mon Sep 17 00:00:00 2001 From: arby Date: Sat, 14 May 2022 23:38:08 +0200 Subject: [PATCH 1/2] Fixed the layouts in the skeletal_animation vertex shader. --- src/8.guest/2020/skeletal_animation/anim_model.vs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/8.guest/2020/skeletal_animation/anim_model.vs b/src/8.guest/2020/skeletal_animation/anim_model.vs index 552adb2..6caec57 100644 --- a/src/8.guest/2020/skeletal_animation/anim_model.vs +++ b/src/8.guest/2020/skeletal_animation/anim_model.vs @@ -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; From b7e97ceeecb3fa7b615041f439ec96a100f19fcc Mon Sep 17 00:00:00 2001 From: arby Date: Sat, 14 May 2022 23:48:36 +0200 Subject: [PATCH 2/2] Copy .dlls to the build dir. --- CMakeLists.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 38aea7e..c5b878c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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} $) + add_custom_command(TARGET ${NAME} PRE_BUILD COMMAND ${CMAKE_COMMAND} -E copy ${DLLS} $) elseif(UNIX AND NOT APPLE) file(COPY ${SHADER} DESTINATION ${CMAKE_SOURCE_DIR}/bin/${chapter}) elseif(APPLE)