From 2ee6054f696c8b8343c7892ef66c6c33f95352e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Thu, 12 May 2022 01:40:15 +0200 Subject: [PATCH] doc: adapt to the fact there's a real GltfImporter now. I.e., with the intention to be implemented in the best way possible, without relying on some 3rd party library with murky corner cases and questionable tradeoffs. --- doc/file-formats.dox | 12 ++++++------ src/Magnum/Trade/SceneData.h | 2 +- .../AnySceneImporter/AnySceneImporter.h | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/doc/file-formats.dox b/doc/file-formats.dox index 087298a17..2248dd7c1 100644 --- a/doc/file-formats.dox +++ b/doc/file-formats.dox @@ -477,14 +477,14 @@ Together with @ref file-formats-image-importers "image importers" derived from glTF
(`*.gltf`, `*.glb`) `GltfImporter` -@ref Trade::CgltfImporter "CgltfImporter" -@ref Trade-CgltfImporter-behavior "minor" -bundled -MIT +@relativeref{Trade,GltfImporter} +@ref Trade-GltfImporter-behavior "minor" +@m_span{m-text m-dim} none @m_endspan + -@ref Trade::TinyGltfImporter "TinyGltfImporter" -@ref Trade-TinyGltfImporter-behavior "minor" +@ref Trade::TinyGltfImporter "TinyGltfImporter" @m_class{m-label m-danger} **deprecated** +@ref Trade-TinyGltfImporter-behavior "some" bundled MIT diff --git a/src/Magnum/Trade/SceneData.h b/src/Magnum/Trade/SceneData.h index ff586f7a6..6f7aa2c7f 100644 --- a/src/Magnum/Trade/SceneData.h +++ b/src/Magnum/Trade/SceneData.h @@ -1070,7 +1070,7 @@ However, since each @ref SceneField can be in a variety of types, you're expected to either check that the type is indeed what you expect using @ref fieldType(SceneField) const, or at least check with documentation of the corresponding importer. For example, because glTF files represent the scene -in a textual form, @ref CgltfImporter will always parse the data into canonical +in a textual form, @ref GltfImporter will always parse the data into canonical 32-bit types. With that assumption, the above snippet that used @ref transformations3DAsArray() can be rewritten to a zero-copy form like this: diff --git a/src/MagnumPlugins/AnySceneImporter/AnySceneImporter.h b/src/MagnumPlugins/AnySceneImporter/AnySceneImporter.h index 3b588dd9b..44a5bd8aa 100644 --- a/src/MagnumPlugins/AnySceneImporter/AnySceneImporter.h +++ b/src/MagnumPlugins/AnySceneImporter/AnySceneImporter.h @@ -70,8 +70,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`, `*.glb`), loaded with any plugin that provides - `GltfImporter` +- glTF (`*.gltf`, `*.glb`), loaded with @ref GltfImporter or any other plugin + that provides it - Industry Foundation Classes (IFC/Step) (`*.ifc`), loaded with any plugin that provides `IfcImporter` - Irrlicht Mesh and Scene (`*.irrmesh`, `*.irr`), loaded with any plugin that