Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update Magnum projects and switch to CgltfImporter from TinyGltfImporter #1549

Merged
merged 1 commit into from
Oct 29, 2021
Merged

Update Magnum projects and switch to CgltfImporter from TinyGltfImporter #1549

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/cmake/dependencies.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion src/deps/corrade
Open in desktop
Submodule corrade updated 1 files
+6 −6 src/Corrade/Containers/StringView.h
2 changes: 1 addition & 1 deletion src/deps/magnum
Open in desktop
Submodule magnum updated 57 files
+3 −1 doc/Doxyfile
+3 −1 doc/Doxyfile-mcss
+3 −1 doc/Doxyfile-public
+36 −7 doc/changelog.dox
+29 −3 doc/file-formats.dox
+3 −3 doc/opengl-support.dox
+34 −12 doc/opengl.dox
+2 −1 doc/portability.dox
+27 −1 doc/snippets/MagnumTrade.cpp
+2 −2 src/Magnum/Audio/AbstractImporter.cpp
+1 −1 src/Magnum/Audio/AbstractImporter.h
+62 −10 src/Magnum/GL/AbstractShaderProgram.cpp
+240 −25 src/Magnum/GL/AbstractShaderProgram.h
+34 −13 src/Magnum/GL/Context.cpp
+69 −31 src/Magnum/GL/Context.h
+3 −1 src/Magnum/GL/Extensions.h
+4 −4 src/Magnum/GL/Framebuffer.h
+25 −2 src/Magnum/GL/Implementation/ContextState.cpp
+1 −8 src/Magnum/GL/Implementation/ContextState.h
+105 −17 src/Magnum/GL/Implementation/MeshState.cpp
+8 −4 src/Magnum/GL/Implementation/MeshState.h
+109 −26 src/Magnum/GL/Implementation/driverSpecific.cpp
+246 −40 src/Magnum/GL/Mesh.cpp
+48 −18 src/Magnum/GL/Mesh.h
+0 −21 src/Magnum/GL/MeshView.cpp
+0 −7 src/Magnum/GL/MeshView.h
+8 −8 src/Magnum/GL/PixelFormat.h
+2 −2 src/Magnum/GL/Test/AbstractObjectGLTest.cpp
+11 −11 src/Magnum/GL/Test/FramebufferGLTest.cpp
+1,194 −166 src/Magnum/GL/Test/MeshGLTest.cpp
+1 −1 src/Magnum/GL/Test/RenderbufferGLTest.cpp
+1 −1 src/Magnum/GL/Test/TransformFeedbackGLTest.cpp
+4 −4 src/Magnum/GL/TextureFormat.h
+5 −4 src/Magnum/Math/Test/TypeTraitsTest.cpp
+63 −28 src/Magnum/MeshTools/sceneconverter.cpp
+1 −1 src/Magnum/Platform/GlfwApplication.cpp
+2 −2 src/Magnum/Platform/Test/EmscriptenApplicationTest.cpp
+48 −0 src/Magnum/Platform/gl-info.cpp
+1 −1 src/Magnum/Shaders/Test/MeshVisualizerGLTest.cpp
+2 −2 src/Magnum/Text/AbstractFont.cpp
+5 −5 src/Magnum/Text/AbstractFont.h
+38 −7 src/Magnum/Trade/AbstractImporter.cpp
+91 −14 src/Magnum/Trade/AbstractImporter.h
+2 −0 src/Magnum/Trade/Data.cpp
+22 −6 src/Magnum/Trade/Data.h
+119 −25 src/Magnum/Trade/Test/AbstractImporterTest.cpp
+45 −0 src/Magnum/Vk/vk-info.cpp
+2 −2 src/MagnumPlugins/AnyImageConverter/AnyImageConverter.h
+11 −10 src/MagnumPlugins/AnyImageImporter/AnyImageImporter.cpp
+3 −3 src/MagnumPlugins/AnyImageImporter/AnyImageImporter.h
+1 −1 src/MagnumPlugins/AnySceneImporter/AnySceneImporter.cpp
+3 −2 src/MagnumPlugins/ObjImporter/ObjImporter.cpp
+1 −1 src/MagnumPlugins/ObjImporter/ObjImporter.h
+32 −1 src/MagnumPlugins/ObjImporter/Test/ObjImporterTest.cpp
+78 −45 src/MagnumPlugins/TgaImporter/Test/TgaImporterTest.cpp
+9 −6 src/MagnumPlugins/TgaImporter/TgaImporter.cpp
+1 −1 src/MagnumPlugins/TgaImporter/TgaImporter.h
2 changes: 1 addition & 1 deletion src/deps/magnum-plugins
Open in desktop
Submodule magnum-plugins updated 137 files
4 changes: 2 additions & 2 deletions src/esp/assets/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,11 @@ find_package(
MagnumPlugins
REQUIRED
BasisImporter
CgltfImporter
PrimitiveImporter
StanfordImporter
StbImageImporter
StbImageConverter
TinyGltfImporter
)

if(BUILD_ASSIMP_SUPPORT)
Expand Down Expand Up @@ -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
)

Expand Down
2 changes: 1 addition & 1 deletion src/esp/assets/ResourceManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 =
Expand Down
4 changes: 2 additions & 2 deletions src/esp/gfx/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/esp/physics/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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)