From 778d407bcdc07daa17fe44124423d5533181b4c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Fri, 17 Apr 2020 20:17:22 +0200 Subject: [PATCH] AnySceneImporter: recognize Magnum's blob files. --- src/MagnumPlugins/AnySceneImporter/AnySceneImporter.cpp | 2 ++ src/MagnumPlugins/AnySceneImporter/AnySceneImporter.h | 2 ++ .../AnySceneImporter/Test/AnySceneImporterTest.cpp | 1 + 3 files changed, 5 insertions(+) diff --git a/src/MagnumPlugins/AnySceneImporter/AnySceneImporter.cpp b/src/MagnumPlugins/AnySceneImporter/AnySceneImporter.cpp index a6c6859c7..8580a5b25 100644 --- a/src/MagnumPlugins/AnySceneImporter/AnySceneImporter.cpp +++ b/src/MagnumPlugins/AnySceneImporter/AnySceneImporter.cpp @@ -80,6 +80,8 @@ void AnySceneImporter::doOpenFile(const std::string& filename) { plugin = "Ac3dImporter"; else if(Utility::String::endsWith(normalized, ".blend")) plugin = "BlenderImporter"; + else if(Utility::String::endsWith(normalized, ".blob")) + plugin = "MagnumImporter"; else if(Utility::String::endsWith(normalized, ".bvh")) plugin = "BvhImporter"; else if(Utility::String::endsWith(normalized, ".csm")) diff --git a/src/MagnumPlugins/AnySceneImporter/AnySceneImporter.h b/src/MagnumPlugins/AnySceneImporter/AnySceneImporter.h index 9b37b9499..dfb0284f9 100644 --- a/src/MagnumPlugins/AnySceneImporter/AnySceneImporter.h +++ b/src/MagnumPlugins/AnySceneImporter/AnySceneImporter.h @@ -61,6 +61,8 @@ tries to open the file with it. Supported formats: - AC3D (`*.ac`), loaded with any plugin that provides `Ac3dImporter` - Blender 3D (`*.blend`), loaded with any plugin that provides `BlenderImporter` +- @ref blob "Magnum's memory-mappable serialization format" (`*.blob`), + loaded with @ref MagnumImporter - Biovision BVH (`*.bvh`), loaded with any plugin that provides `BvhImporter` - CharacterStudio Motion (`*.csm`), loaded with any plugin that provides `CsmImporter` diff --git a/src/MagnumPlugins/AnySceneImporter/Test/AnySceneImporterTest.cpp b/src/MagnumPlugins/AnySceneImporter/Test/AnySceneImporterTest.cpp index 9ab10472f..6b930f1bf 100644 --- a/src/MagnumPlugins/AnySceneImporter/Test/AnySceneImporterTest.cpp +++ b/src/MagnumPlugins/AnySceneImporter/Test/AnySceneImporterTest.cpp @@ -75,6 +75,7 @@ constexpr struct { const char* plugin; } DetectData[]{ {"Blender", "suzanne.blend", "BlenderImporter"}, + {"BLOB", "messy.blob", "MagnumImporter"}, {"COLLADA", "xml.dae", "ColladaImporter"}, {"FBX", "autodesk.fbx", "FbxImporter"}, {"glTF", "khronos.gltf", "GltfImporter"},