diff --git a/doc/changelog.dox b/doc/changelog.dox index 236252472..40ac18b3c 100644 --- a/doc/changelog.dox +++ b/doc/changelog.dox @@ -163,6 +163,9 @@ See also: @ref Trade::TgaImageConverter "TgaImageConverter" plugins now operate on the generic @ref PixelFormat instead of GL-specific @ref GL::PixelFormat / @ref GL::PixelType +- @ref Trade::AnySceneImporter "AnySceneImporter" now uses `GlbImporter` for + loading binary glTF files instead of proxying them to `GltfImporter` + plugins @subsection changelog-latest-buildsystem Build system diff --git a/src/MagnumPlugins/AnySceneImporter/AnySceneImporter.cpp b/src/MagnumPlugins/AnySceneImporter/AnySceneImporter.cpp index c14317564..eab342be8 100644 --- a/src/MagnumPlugins/AnySceneImporter/AnySceneImporter.cpp +++ b/src/MagnumPlugins/AnySceneImporter/AnySceneImporter.cpp @@ -79,9 +79,10 @@ void AnySceneImporter::doOpenFile(const std::string& filename) { plugin = "DxfImporter"; else if(Utility::String::endsWith(filename, ".fbx")) plugin = "FbxImporter"; - else if(Utility::String::endsWith(filename, ".gltf") || - Utility::String::endsWith(filename, ".glb")) + else if(Utility::String::endsWith(filename, ".gltf")) plugin = "GltfImporter"; + else if(Utility::String::endsWith(filename, ".glb")) + plugin = "GlbImporter"; else if(Utility::String::endsWith(filename, ".ifc")) plugin = "IfcImporter"; else if(Utility::String::endsWith(filename, ".irrmesh") || diff --git a/src/MagnumPlugins/AnySceneImporter/AnySceneImporter.h b/src/MagnumPlugins/AnySceneImporter/AnySceneImporter.h index 9fd47638c..4a00378f0 100644 --- a/src/MagnumPlugins/AnySceneImporter/AnySceneImporter.h +++ b/src/MagnumPlugins/AnySceneImporter/AnySceneImporter.h @@ -80,8 +80,8 @@ Supported formats: - DirectX X (`*.x`), loaded with any plugin that provides `DirectXImporter` - AutoCAD DXF (`*.dxf`), loaded with any plugin that provides `DxfImporter` - Autodesk FBX (`*.fbx`), loaded with any plugin that provides `FbxImporter` -- glTF (`*.gltf`, `*.glb`), loaded with any plugin that provides - `GltfImporter` +- glTF (`*.gltf`), loaded with any plugin that provides `GltfImporter` +- Binary glTF (`*.glb`), loaded with any plugin that provides `GlbImporter` - Industry Foundation Classes (IFC/Step) (`*.ifc`), loaded with any plugin that provides `IfcImporter` - Irrlicht Mesh and Scene (`*.irrmesh`, `*.irr`), loaded with any plugin that