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.

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

Update to latest Magnum with complete MeshData Python bindings #1999

Merged
merged 4 commits into from
Feb 8, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 5 additions & 1 deletion src/cmake/FindMagnumPlugins.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@
# StbTrueTypeFont - TrueType font using stb_truetype
# StbVorbisAudioImporter - OGG audio importer using stb_vorbis
# StlImporter - STL importer
# UfbxImporter - FBX and OBJ importer using ufbx
# WebPImporter - WebP importer
#
# If Magnum is built with MAGNUM_BUILD_DEPRECATED enabled, these additional
Expand Down Expand Up @@ -140,6 +141,8 @@ foreach(_component ${MagnumPlugins_FIND_COMPONENTS})
list(APPEND _MAGNUMPLUGINS_${_component}_MAGNUM_DEPENDENCIES MeshTools)
elseif(_component STREQUAL StanfordSceneConverter)
list(APPEND _MAGNUMPLUGINS_${_component}_MAGNUM_DEPENDENCIES MeshTools)
elseif(_component STREQUAL UfbxImporter)
list(APPEND _MAGNUMPLUGINS_${_component}_MAGNUM_DEPENDENCIES AnyImageImporter)
elseif(_component STREQUAL TinyGltfImporter)
# TODO remove when the deprecated plugin is gone
list(APPEND _MAGNUMPLUGINS_${_component}_MAGNUM_DEPENDENCIES AnyImageImporter)
Expand Down Expand Up @@ -168,7 +171,7 @@ set(_MAGNUMPLUGINS_PLUGIN_COMPONENTS
SpirvToolsShaderConverter StanfordImporter StanfordSceneConverter
StbDxtImageConverter StbImageConverter StbImageImporter
StbResizeImageConverter StbTrueTypeFont StbVorbisAudioImporter StlImporter
WebPImporter)
UfbxImporter WebPImporter)
# Nothing is enabled by default right now
set(_MAGNUMPLUGINS_IMPLICITLY_ENABLED_COMPONENTS )

Expand Down Expand Up @@ -477,6 +480,7 @@ foreach(_component ${MagnumPlugins_FIND_COMPONENTS})
# StbTrueTypeFont has no dependencies
# StbVorbisAudioImporter has no dependencies
# StlImporter has no dependencies
# UfbxImporter has no dependencies
# TinyGltfImporter has no dependencies

# WebPImporter plugin dependencies
Expand Down
2 changes: 1 addition & 1 deletion src/deps/corrade
Submodule corrade updated 127 files
2 changes: 1 addition & 1 deletion src/deps/magnum
Submodule magnum updated 191 files
2 changes: 1 addition & 1 deletion src/deps/magnum-plugins
Submodule magnum-plugins updated 132 files
3 changes: 3 additions & 0 deletions src/shaders/Shaders.conf
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
group = default-shaders

# To avoid a needless copy when the sources get added to GL::Shader
nullTerminated=true

[file]
filename = depth.vert

Expand Down
2 changes: 1 addition & 1 deletion src/tests/BatchReplayRendererTest.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ Mn::MutableImageView2D getRGBView(int width,
Mn::Vector2i size(width, height);
constexpr int pixelSize = 4;

buffer.resize(static_cast<size_type>(width * height * pixelSize));
buffer.resize(std::size_t(width * height * pixelSize));

auto view = Mn::MutableImageView2D(Mn::PixelFormat::RGB8Unorm, size, buffer);

Expand Down