Browse Source

AnySceneImporter: special handling for binary glTF files.

pull/233/head
Vladimír Vondruš 8 years ago
parent
commit
e159db5aa1
  1. 3
      doc/changelog.dox
  2. 5
      src/MagnumPlugins/AnySceneImporter/AnySceneImporter.cpp
  3. 4
      src/MagnumPlugins/AnySceneImporter/AnySceneImporter.h

3
doc/changelog.dox

@ -163,6 +163,9 @@ See also:
@ref Trade::TgaImageConverter "TgaImageConverter" plugins now operate on @ref Trade::TgaImageConverter "TgaImageConverter" plugins now operate on
the generic @ref PixelFormat instead of GL-specific @ref GL::PixelFormat / the generic @ref PixelFormat instead of GL-specific @ref GL::PixelFormat /
@ref GL::PixelType @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 @subsection changelog-latest-buildsystem Build system

5
src/MagnumPlugins/AnySceneImporter/AnySceneImporter.cpp

@ -79,9 +79,10 @@ void AnySceneImporter::doOpenFile(const std::string& filename) {
plugin = "DxfImporter"; plugin = "DxfImporter";
else if(Utility::String::endsWith(filename, ".fbx")) else if(Utility::String::endsWith(filename, ".fbx"))
plugin = "FbxImporter"; plugin = "FbxImporter";
else if(Utility::String::endsWith(filename, ".gltf") || else if(Utility::String::endsWith(filename, ".gltf"))
Utility::String::endsWith(filename, ".glb"))
plugin = "GltfImporter"; plugin = "GltfImporter";
else if(Utility::String::endsWith(filename, ".glb"))
plugin = "GlbImporter";
else if(Utility::String::endsWith(filename, ".ifc")) else if(Utility::String::endsWith(filename, ".ifc"))
plugin = "IfcImporter"; plugin = "IfcImporter";
else if(Utility::String::endsWith(filename, ".irrmesh") || else if(Utility::String::endsWith(filename, ".irrmesh") ||

4
src/MagnumPlugins/AnySceneImporter/AnySceneImporter.h

@ -80,8 +80,8 @@ Supported formats:
- DirectX X (`*.x`), loaded with any plugin that provides `DirectXImporter` - DirectX X (`*.x`), loaded with any plugin that provides `DirectXImporter`
- AutoCAD DXF (`*.dxf`), loaded with any plugin that provides `DxfImporter` - AutoCAD DXF (`*.dxf`), loaded with any plugin that provides `DxfImporter`
- Autodesk FBX (`*.fbx`), loaded with any plugin that provides `FbxImporter` - Autodesk FBX (`*.fbx`), loaded with any plugin that provides `FbxImporter`
- glTF (`*.gltf`, `*.glb`), loaded with any plugin that provides - glTF (`*.gltf`), loaded with any plugin that provides `GltfImporter`
`GltfImporter` - Binary glTF (`*.glb`), loaded with any plugin that provides `GlbImporter`
- Industry Foundation Classes (IFC/Step) (`*.ifc`), loaded with any plugin - Industry Foundation Classes (IFC/Step) (`*.ifc`), loaded with any plugin
that provides `IfcImporter` that provides `IfcImporter`
- Irrlicht Mesh and Scene (`*.irrmesh`, `*.irr`), loaded with any plugin that - Irrlicht Mesh and Scene (`*.irrmesh`, `*.irr`), loaded with any plugin that

Loading…
Cancel
Save