diff --git a/src/cmake/dependencies.cmake b/src/cmake/dependencies.cmake index ff97b3e0d8..fe4b5d4267 100644 --- a/src/cmake/dependencies.cmake +++ b/src/cmake/dependencies.cmake @@ -189,7 +189,7 @@ if(NOT USE_SYSTEM_MAGNUM) if(BUILD_ASSIMP_SUPPORT) set(WITH_ASSIMPIMPORTER ON CACHE BOOL "WITH_ASSIMPIMPORTER" FORCE) endif() - set(WITH_TINYGLTFIMPORTER ON CACHE BOOL "WITH_TINYGLTFIMPORTER" FORCE) + set(WITH_CGLTFIMPORTER ON CACHE BOOL "" FORCE) set(WITH_ANYIMAGEIMPORTER ON CACHE BOOL "WITH_ANYIMAGEIMPORTER" FORCE) set(WITH_ANYIMAGECONVERTER ON CACHE BOOL "WITH_ANYIMAGECONVERTER" FORCE) set(WITH_PRIMITIVEIMPORTER ON CACHE BOOL "" FORCE) diff --git a/src/deps/corrade b/src/deps/corrade index d99ea9a8bb..bb626d650c 160000 --- a/src/deps/corrade +++ b/src/deps/corrade @@ -1 +1 @@ -Subproject commit d99ea9a8bbdf3de98e6af65e3d95c608e6f64dd5 +Subproject commit bb626d650c7d76dd2846945ef22e9eb0003b6ea9 diff --git a/src/deps/magnum b/src/deps/magnum index b37df09892..0d0e62c424 160000 --- a/src/deps/magnum +++ b/src/deps/magnum @@ -1 +1 @@ -Subproject commit b37df09892cd03a826c5bff3ed5bdbb2a727698f +Subproject commit 0d0e62c42452efa5c8edfee26e4b704952ae7515 diff --git a/src/deps/magnum-plugins b/src/deps/magnum-plugins index 144716c064..809fc1829d 160000 --- a/src/deps/magnum-plugins +++ b/src/deps/magnum-plugins @@ -1 +1 @@ -Subproject commit 144716c064b06c8b4ae3f21d8abc0393d6a224a1 +Subproject commit 809fc1829db8e41d52fd7d299a3bc511b7ba9d83 diff --git a/src/esp/assets/CMakeLists.txt b/src/esp/assets/CMakeLists.txt index 365969725c..5eb243b3c8 100644 --- a/src/esp/assets/CMakeLists.txt +++ b/src/esp/assets/CMakeLists.txt @@ -40,11 +40,11 @@ find_package( MagnumPlugins REQUIRED BasisImporter + CgltfImporter PrimitiveImporter StanfordImporter StbImageImporter StbImageConverter - TinyGltfImporter ) if(BUILD_ASSIMP_SUPPORT) @@ -73,11 +73,11 @@ target_link_libraries( Magnum::Trade Magnum::Primitives MagnumPlugins::BasisImporter + MagnumPlugins::CgltfImporter MagnumPlugins::PrimitiveImporter MagnumPlugins::StanfordImporter MagnumPlugins::StbImageImporter MagnumPlugins::StbImageConverter - MagnumPlugins::TinyGltfImporter PRIVATE geo io ) diff --git a/src/esp/assets/ResourceManager.cpp b/src/esp/assets/ResourceManager.cpp index 426e2aadd9..8242576f31 100644 --- a/src/esp/assets/ResourceManager.cpp +++ b/src/esp/assets/ResourceManager.cpp @@ -1261,7 +1261,7 @@ scene::SceneNode* ResourceManager::createRenderAssetInstanceIMesh( void ResourceManager::ConfigureImporterManager( const std::string& dispFileName) { // Preferred plugins, Basis target GPU format - importerManager_.setPreferredPlugins("GltfImporter", {"TinyGltfImporter"}); + importerManager_.setPreferredPlugins("GltfImporter", {"CgltfImporter"}); #ifdef ESP_BUILD_ASSIMP_SUPPORT importerManager_.setPreferredPlugins("ObjImporter", {"AssimpImporter"}); Cr::PluginManager::PluginMetadata* const assimpmetadata = diff --git a/src/esp/gfx/CMakeLists.txt b/src/esp/gfx/CMakeLists.txt index 7972c70c3f..e4c8a7097f 100644 --- a/src/esp/gfx/CMakeLists.txt +++ b/src/esp/gfx/CMakeLists.txt @@ -101,7 +101,7 @@ find_package( AnyImageConverter ) -find_package(MagnumPlugins REQUIRED StbImageImporter StbImageConverter TinyGltfImporter) +find_package(MagnumPlugins REQUIRED CgltfImporter StbImageImporter StbImageConverter) find_package(MagnumIntegration REQUIRED Eigen) @@ -143,9 +143,9 @@ target_link_libraries( Magnum::SceneGraph Magnum::Shaders Magnum::Trade + MagnumPlugins::CgltfImporter MagnumPlugins::StbImageImporter MagnumPlugins::StbImageConverter - MagnumPlugins::TinyGltfImporter MagnumIntegration::Eigen Corrade::Utility Magnum::AnyImageConverter diff --git a/src/esp/physics/CMakeLists.txt b/src/esp/physics/CMakeLists.txt index add59af716..95a4a3800a 100644 --- a/src/esp/physics/CMakeLists.txt +++ b/src/esp/physics/CMakeLists.txt @@ -1,4 +1,4 @@ -find_package(MagnumPlugins REQUIRED StbImageImporter StbImageConverter TinyGltfImporter) +find_package(MagnumPlugins REQUIRED CgltfImporter StbImageImporter StbImageConverter) set(ESP_DEFAULT_PHYSICS_CONFIG_REL_PATH ./data/default.physics_config.json) set(ESP_DEFAULT_PHYSICS_CONFIG @@ -46,9 +46,9 @@ target_link_libraries( PUBLIC core scene assets + MagnumPlugins::CgltfImporter MagnumPlugins::StbImageImporter MagnumPlugins::StbImageConverter - MagnumPlugins::TinyGltfImporter ) set_directory_properties(PROPERTIES CORRADE_USE_PEDANTIC_FLAGS ON)