From 27f4a7073e136fde6de8911c19f031aebc0a60cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sat, 28 Mar 2020 21:12:10 +0100 Subject: [PATCH] AnySceneImporter: treat both *.gltf and *.glb the same. --- src/MagnumPlugins/AnySceneImporter/AnySceneImporter.cpp | 5 ++--- src/MagnumPlugins/AnySceneImporter/AnySceneImporter.h | 4 ++-- .../AnySceneImporter/Test/AnySceneImporterTest.cpp | 1 - 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/MagnumPlugins/AnySceneImporter/AnySceneImporter.cpp b/src/MagnumPlugins/AnySceneImporter/AnySceneImporter.cpp index 0e7faa2b7..94cff9e0e 100644 --- a/src/MagnumPlugins/AnySceneImporter/AnySceneImporter.cpp +++ b/src/MagnumPlugins/AnySceneImporter/AnySceneImporter.cpp @@ -92,10 +92,9 @@ void AnySceneImporter::doOpenFile(const std::string& filename) { plugin = "DxfImporter"; else if(Utility::String::endsWith(normalized, ".fbx")) plugin = "FbxImporter"; - else if(Utility::String::endsWith(normalized, ".gltf")) + else if(Utility::String::endsWith(normalized, ".gltf") || + Utility::String::endsWith(normalized, ".glb")) plugin = "GltfImporter"; - else if(Utility::String::endsWith(normalized, ".glb")) - plugin = "GlbImporter"; else if(Utility::String::endsWith(normalized, ".ifc")) plugin = "IfcImporter"; else if(Utility::String::endsWith(normalized, ".irrmesh") || diff --git a/src/MagnumPlugins/AnySceneImporter/AnySceneImporter.h b/src/MagnumPlugins/AnySceneImporter/AnySceneImporter.h index 743bd86a4..9b37b9499 100644 --- a/src/MagnumPlugins/AnySceneImporter/AnySceneImporter.h +++ b/src/MagnumPlugins/AnySceneImporter/AnySceneImporter.h @@ -68,8 +68,8 @@ tries to open the file with it. 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`), loaded with any plugin that provides `GltfImporter` -- Binary glTF (`*.glb`), loaded with any plugin that provides `GlbImporter` +- glTF (`*.gltf`, `*.glb`), loaded with any plugin that provides + `GltfImporter` - Industry Foundation Classes (IFC/Step) (`*.ifc`), loaded with any plugin that provides `IfcImporter` - Irrlicht Mesh and Scene (`*.irrmesh`, `*.irr`), loaded with any plugin that diff --git a/src/MagnumPlugins/AnySceneImporter/Test/AnySceneImporterTest.cpp b/src/MagnumPlugins/AnySceneImporter/Test/AnySceneImporterTest.cpp index 722754bb9..b451a8b8f 100644 --- a/src/MagnumPlugins/AnySceneImporter/Test/AnySceneImporterTest.cpp +++ b/src/MagnumPlugins/AnySceneImporter/Test/AnySceneImporterTest.cpp @@ -76,7 +76,6 @@ constexpr struct { {"COLLADA", "xml.dae", "ColladaImporter"}, {"FBX", "autodesk.fbx", "FbxImporter"}, {"glTF", "khronos.gltf", "GltfImporter"}, - {"glTF binary", "khronos.glb", "GlbImporter"}, {"OpenGEX", "eric.ogex", "OpenGexImporter"}, {"Stanford PLY", "bunny.ply", "StanfordImporter"}, {"Stanford PLY uppercase", "ARMADI~1.PLY", "StanfordImporter"},