diff --git a/doc/file-formats.dox b/doc/file-formats.dox index 53643986e..53b522efe 100644 --- a/doc/file-formats.dox +++ b/doc/file-formats.dox @@ -198,6 +198,16 @@ Together with @ref file-formats-scene-importers "scene importers" derived from + +KTX2 (`*.ktx2`) +`KtxImporter` +@ref Trade::KtxImporter "KtxImporter" +@ref Trade-KtxImporter-behavior "some" +@m_span{m-text m-dim} none @m_endspan + + + + PNG
(`*.png`) `PngImporter` @@ -346,6 +356,16 @@ Derived from @ref Trade::AbstractImageConverter. + +KTX2 (`*.ktx2`) +`KtxImageConverter` +@ref Trade::KtxImageConverter "KtxImageConverter" +@ref Trade-KtxImageConverter-behavior "some" +@m_span{m-text m-dim} none @m_endspan + + + + PNG
(`*.png`) `PngImageConverter` @@ -382,7 +402,7 @@ Derived from @ref Trade::AbstractImageConverter. @section file-formats-scene-importers Scene importers -Together with @ref file-formats-image-importers "image-importers" derived from +Together with @ref file-formats-image-importers "image importers" derived from @ref Trade::AbstractImporter. @m_class{m-row m-container-inflate} @@ -455,8 +475,14 @@ Together with @ref file-formats-image-importers "image-importers" derived from -glTF
(`*.gltf`, `*.glb`) -`GltfImporter` +glTF
(`*.gltf`, `*.glb`) +`GltfImporter` +@ref Trade::CgltfImporter "CgltfImporter" +@ref Trade-CgltfImporter-behavior "minor" +bundled +MIT + + @ref Trade::TinyGltfImporter "TinyGltfImporter" @ref Trade-TinyGltfImporter-behavior "minor" bundled diff --git a/src/MagnumPlugins/AnyImageConverter/AnyImageConverter.h b/src/MagnumPlugins/AnyImageConverter/AnyImageConverter.h index 715997a5f..0c8863a8c 100644 --- a/src/MagnumPlugins/AnyImageConverter/AnyImageConverter.h +++ b/src/MagnumPlugins/AnyImageConverter/AnyImageConverter.h @@ -66,8 +66,8 @@ tries to convert the file with it. Supported formats for uncompressed data: `HdrImageConverter` - JPEG (`*.jpg`, `*.jpe`, `*.jpeg`), converted with @ref JpegImageConverter or any other plugin that provides it -- KTX2 (`*.ktx2`), converted with any plugin that provides - `KtxImageConverter` +- KTX2 (`*.ktx2`), converted with @ref KtxImageConverter or any other plugin + that provides it - Portable Network Graphics (`*.png`), converted with @ref PngImageConverter or any other plugin that provides it - Truevision TGA (`*.tga`, `*.vda`, `*.icb`, `*.vst`), converted with diff --git a/src/MagnumPlugins/AnyImageImporter/AnyImageImporter.h b/src/MagnumPlugins/AnyImageImporter/AnyImageImporter.h index 76cad08b5..7f4795cbd 100644 --- a/src/MagnumPlugins/AnyImageImporter/AnyImageImporter.h +++ b/src/MagnumPlugins/AnyImageImporter/AnyImageImporter.h @@ -74,8 +74,8 @@ tries to open the file with it. Supported formats: loaded with @ref JpegImporter or any other plugin that provides it - JPEG 2000 (`*.jp2`), loaded with any plugin that provides `Jpeg2000Importer` -- KTX2 (`*.ktx2` or data with corresponding signature), loaded with any - plugin that provides `KtxImporter` +- KTX2 (`*.ktx2` or data with corresponding signature), loaded with + @ref KtxImporter or any other plugin that provides it - Multiple-image Network Graphics (`*.mng`), loaded with any plugin that provides `MngImporter` - Portable Bitmap (`*.pbm`), loaded with any plugin that provides `PbmImporter`