diff --git a/modules/meshlet/CMakeLists.txt b/modules/meshlet/CMakeLists.txt index d85b46029d736e44cc06ff4faab23ebc0c78e628..8c6823876d0c7ca2632fa57903427c25986724db 100644 --- a/modules/meshlet/CMakeLists.txt +++ b/modules/meshlet/CMakeLists.txt @@ -19,9 +19,6 @@ set(vkcv_meshlet_sources # adding source files to the module add_library(vkcv_meshlet STATIC ${vkcv_meshlet_sources}) -# Setup some path variables to load libraries -set(vkcv_meshlet_lib lib) -set(vkcv_meshlet_lib_path ${PROJECT_SOURCE_DIR}/${vkcv_meshlet_lib}) # link the required libraries to the module target_link_libraries(vkcv_meshlet vkcv ${vkcv_libraries}) @@ -33,4 +30,4 @@ target_include_directories(vkcv_meshlet SYSTEM BEFORE PRIVATE ${vkcv_include} ${ target_include_directories(vkcv_meshlet BEFORE PUBLIC ${vkcv_meshlet_include}) # linking with libraries from all dependencies and the VkCV framework -target_link_libraries(vkcv_meshlet vkcv vkcv_asset_loader) +target_link_libraries(vkcv_meshlet vkcv vkcv_asset_loader vkcv_camera) diff --git a/modules/meshlet/config/GLM.cmake b/modules/meshlet/config/GLM.cmake deleted file mode 100644 index 507933456f0f256192bd58c226e585522441d9c2..0000000000000000000000000000000000000000 --- a/modules/meshlet/config/GLM.cmake +++ /dev/null @@ -1,23 +0,0 @@ - -find_package(glm QUIET) - -if (glm_FOUND) - list(APPEND vkcv_meshlet_includes ${GLM_INCLUDE_DIRS}) - list(APPEND vkcv_meshlet_libraries glm) -else() - if (EXISTS "${vkcv_meshlet_lib_path}/glm") - add_subdirectory(${vkcv_meshlet_lib}/glm) - - list(APPEND vkcv_meshlet_includes ${vkcv_meshlet_lib_path}/glm) - list(APPEND vkcv_meshlet_libraries glm) - else() - message(WARNING "GLM is required..! Update the submodules!") - endif () -endif () - -list(APPEND vkcv_meshlet_definitions GLM_DEPTH_ZERO_TO_ONE) -list(APPEND vkcv_meshlet_definitions GLM_FORCE_LEFT_HANDED) - -if ((WIN32) AND (${CMAKE_SIZEOF_VOID_P} MATCHES 4)) - list(APPEND vkcv_meshlet_definitions GLM_ENABLE_EXPERIMENTAL) -endif() diff --git a/modules/meshlet/include/vkcv/meshlet/Meshlet.hpp b/modules/meshlet/include/vkcv/meshlet/Meshlet.hpp index 447618025217ff68f66266df1f85a1e9a2ede685..498257c15c9292adcc9cf5aa342422185077c00b 100644 --- a/modules/meshlet/include/vkcv/meshlet/Meshlet.hpp +++ b/modules/meshlet/include/vkcv/meshlet/Meshlet.hpp @@ -3,6 +3,7 @@ #include <vector> #include <map> #include <glm/glm.hpp> +#include <vkcv/asset/asset_loader.hpp> namespace vkcv::meshlet { diff --git a/modules/meshlet/src/vkcv/meshlet/Meshlet.cpp b/modules/meshlet/src/vkcv/meshlet/Meshlet.cpp index 542dcf7d4c41afe26e5a406d473897281c783ec9..02bfa9d80ff54f2f6d1cb3a9f450c43366595bb2 100644 --- a/modules/meshlet/src/vkcv/meshlet/Meshlet.cpp +++ b/modules/meshlet/src/vkcv/meshlet/Meshlet.cpp @@ -1,6 +1,5 @@ #include "vkcv/meshlet/Meshlet.hpp" -#include <vkcv/asset/asset_loader.hpp> #include <vkcv/Logger.hpp> #include <cassert> diff --git a/projects/mesh_shader/src/main.cpp b/projects/mesh_shader/src/main.cpp index 40ae9ce24190b05d85165186e004e0b3277b6737..5d90672396eb6413a3296c64b422db197a11ee3e 100644 --- a/projects/mesh_shader/src/main.cpp +++ b/projects/mesh_shader/src/main.cpp @@ -8,7 +8,7 @@ #include <vkcv/gui/GUI.hpp> #include <vkcv/asset/asset_loader.hpp> #include <vkcv/meshlet/Meshlet.hpp> -#include <vkcv/meshlet/Tipsify.hpp> +//#include <vkcv/meshlet/Tipsify.hpp> int main(int argc, const char** argv) { const char* applicationName = "Mesh shader";