Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Trade: KTX importer #103

Closed
wants to merge 95 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
95 commits
Select commit Hold shift + click to select a range
afad144
Trade: KtxImporter
pezcode Jul 14, 2021
5b5cfd3
KtxImporter: clean up header struct
pezcode Jul 15, 2021
19fc1b5
KtxImporter: print useful error for unsupported KTX versions
pezcode Jul 15, 2021
8f77e64
KtxImporter: read key/value data
pezcode Jul 15, 2021
c4f5b4d
KtxImporter: cleanup
pezcode Jul 16, 2021
bd7dbba
KtxImporter: replace asserts with errors and warnings
pezcode Jul 16, 2021
6590f2a
KtxImporter: cleanup
pezcode Jul 17, 2021
f2765d0
KtxImporter: add copyright notice
pezcode Jul 17, 2021
9662fff
KtxImporter: decode Vulkan format with Magnum::Vk
pezcode Jul 17, 2021
e1b667d
KtxImporter: check KTXswizzle metadata
pezcode Jul 17, 2021
bec3e8b
KtxImporter: read orientation
pezcode Jul 17, 2021
d289b6f
KtxImporter: cleanup
pezcode Jul 17, 2021
cc14641
KtxImporter: import array layers and cubemap faces as extra image dim…
pezcode Jul 19, 2021
7021c96
KtxImporter: validate data format descriptor
pezcode Jul 20, 2021
b3f906a
KtxImporter: flip axes
pezcode Jul 22, 2021
ef11d33
KtxImporter: cleanup
pezcode Jul 22, 2021
fa79467
KtxImporter: return texture with linear sampler filters
pezcode Jul 22, 2021
b8a8c22
KtxImporter: first round of tests
pezcode Jul 22, 2021
06858dd
Trade: KtxImageConverter
pezcode Jul 22, 2021
fc2ba00
Ktx{Importer,ImageConverter}: register plugins
pezcode Jul 22, 2021
cd3a6fc
KtxImporter: oops
pezcode Jul 22, 2021
ca92b02
KtxImporter: dereference VkFormat values in formatMapping.hpp
pezcode Jul 28, 2021
3990096
KtxImporter: ignore data format descriptor
pezcode Jul 28, 2021
e9fe3d2
KtxImporter: avoid std::map for parsing key/value data
pezcode Jul 28, 2021
2715a10
KtxImporter: miscellaneous PR feedback
pezcode Jul 28, 2021
6c011f1
Ktx{Importer,ImageConverter}: enable in android package build
pezcode Jul 28, 2021
ae4287c
KtxImporter: set correct size for images with extra dimensions (cube …
pezcode Jul 30, 2021
ca5dee8
KtxImporter: read until the end of the key/value data
pezcode Jul 30, 2021
ce95690
KtxImporter: don't warn about empty value data, that's allowed
pezcode Jul 30, 2021
8e8a094
KtxImporter: cleanup
pezcode Jul 30, 2021
c35d247
KtxImporter: more tests
pezcode Jul 30, 2021
89398d1
KtxImageConverter: we don't need this
pezcode Jul 30, 2021
bf43072
KtxImageConverter: add support for multiple levels
pezcode Jul 30, 2021
6cda8e6
KtxImageConverter: write DFD for block-compressed formats
pezcode Jul 30, 2021
976a7dc
KtxImageConverter: first set of tests
pezcode Jul 30, 2021
a08c0e4
KtxImageConverter: oops
pezcode Jul 30, 2021
d7586f7
KtxImporter: check entire level size for 3D layered images
pezcode Jul 31, 2021
11fc2d3
KtxImageConverter: write block-compressed formats
pezcode Jul 31, 2021
b33e7a2
Ktx{Importer, ImageConverter}: split formatMapping.hpp into compresse…
pezcode Jul 31, 2021
b2d65f0
KtxImageConverter: remove unneeded template parameter
pezcode Jul 31, 2021
84485e5
KtxImageConverter: read swizzle and writer name key/value data from c…
pezcode Jul 31, 2021
7d14569
KtxImageConverter: remove unneeded image checks
pezcode Aug 1, 2021
5c15bef
KtxImageConverter: test configuration options
pezcode Aug 1, 2021
601a6a3
KtxImageConverter: test cleanup
pezcode Aug 1, 2021
8daa1fd
KtxImporter: test cleanup
pezcode Aug 1, 2021
447721b
KtxImageConverter: remove yet another unneeded image check
pezcode Aug 2, 2021
6740ffa
KtxImageConverter: require default compressed pixel storage
pezcode Aug 2, 2021
0447316
KtxImageConverter: write DFD for depth formats
pezcode Aug 12, 2021
6205be4
KtxImporter: test swizzle for depth (ignored), compressed (error) and…
pezcode Aug 13, 2021
4d59a3a
KtxImageConverter: read orientation from configuration
pezcode Aug 17, 2021
12f5c09
KtxImageConverter: don't write empty key/value data
pezcode Aug 17, 2021
67cf877
KtxImageConverter: test orientation and general key/value data output
pezcode Aug 17, 2021
5e09782
KtxImageConverter: test handling of pixel storage
pezcode Aug 17, 2021
35401d4
KtxImageConverter: test handling of implementation-specific compresse…
pezcode Aug 17, 2021
f7bf338
KtxImageConverter: forgot the orientation entry in .conf
pezcode Aug 17, 2021
d14cf10
KtxImporter: test compressed ground truth
pezcode Aug 18, 2021
7fb1a67
KtxImporter: test more image types
pezcode Aug 18, 2021
ac22a89
KtxImageConverter: test output
pezcode Aug 18, 2021
73bae54
KtxImageConverter: fix combined depth+stencil DFD
pezcode Aug 18, 2021
5687961
KtxImageConverter: test multiple conversions
pezcode Aug 18, 2021
0c9d533
KtxImageConverter: test cleanup
pezcode Aug 18, 2021
7a89b00
KtxImporter: test image flip
pezcode Aug 18, 2021
0dd268e
KtxImporter: test cleanup
pezcode Aug 18, 2021
e5bf3f4
KtxImporter: clarify comment
pezcode Aug 18, 2021
6802153
KtxImporter: update test files
pezcode Aug 18, 2021
503518d
KtxImageConverter: fix DFD channel upper for D24[S8]
pezcode Aug 18, 2021
98f3dbc
Ktx{Importer, ImageConverter}: fix warnings and errors
pezcode Aug 18, 2021
b9d0a5d
KtxImageConverter: disable tests on Emscripten CI
pezcode Aug 18, 2021
89b9b24
KtxImporter: don't use deprecated TextureData::Type
pezcode Aug 18, 2021
357d200
KtxImporter: fix whitespace
pezcode Aug 18, 2021
31d1484
KtxImporter: docs++
pezcode Aug 18, 2021
5d58458
KtxImageConverter: docs++
pezcode Aug 18, 2021
d704d11
KtxImporter: docs++
pezcode Aug 19, 2021
03af7b9
KtxImageConverter: docs++
pezcode Aug 19, 2021
c62fd59
KtxImporter: cleanup
pezcode Aug 24, 2021
015eaa9
KtxImageConverter: remove double colon from default writer name
pezcode Aug 24, 2021
bd776a5
KtxImageConverter: make samples() constexpr again
pezcode Aug 24, 2021
33788ee
KtxImageConverter: too many levels is an error now, and more helpful
pezcode Aug 24, 2021
4fba2c6
KtxImageConverter: make short orientation error more helpful
pezcode Aug 24, 2021
c6f400b
KtxImageConverter: move private member template into anonymous namespace
pezcode Aug 24, 2021
47cef7f
KtxImageConverter: clarify comments
pezcode Aug 24, 2021
53ecb2f
KtxImageConverter: make codecov happy
pezcode Aug 24, 2021
2cc1f29
KtxImageConverter: cleanup
pezcode Aug 24, 2021
8a62f91
KtxImageConverter: don't test unsupported format messages
pezcode Aug 24, 2021
256d392
Ktx{Importer, ImageConverter}: test compressed 3D images with mipmaps
pezcode Aug 25, 2021
a85db6d
KtxImageConverter: correctly test compressed 2D images with mipmaps
pezcode Aug 25, 2021
a63a549
KtxImageConverter: fix DFD for signed normalized and combined depth-s…
pezcode Aug 25, 2021
8b24763
KtxImageConverter: test DFD against output of dfdutils
pezcode Aug 25, 2021
621fa4b
Ktx{Importer, ImageConverter}: remove some of the 2D compressed files
pezcode Aug 25, 2021
c8390b2
Ktx{Importer, ImageConverter}: update list of test files
pezcode Aug 25, 2021
f0c5b40
KtxImageConverter: enable on Emscripten CI again
pezcode Aug 25, 2021
cc3a023
KtxImageConverter: fix GCC 4.8 error
pezcode Aug 25, 2021
e0e29f3
KtxImporter: clarify test file comments
pezcode Aug 25, 2021
91d87a1
KtxImageConverter: fix DFD file reading in tests under Emscripten
pezcode Aug 25, 2021
76dd769
KtxImageConverter: merge DFD test files
pezcode Aug 31, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,8 @@ option(WITH_HARFBUZZFONT "Build HarfBuzzFont plugin" OFF)
option(WITH_ICOIMPORTER "Build IcoImporter plugin" OFF)
option(WITH_JPEGIMAGECONVERTER "Build JpegImageConverter plugin" OFF)
option(WITH_JPEGIMPORTER "Build JpegImporter plugin" OFF)
option(WITH_KTXIMAGECONVERTER "Build KtxImageConverter plugin" OFF)
option(WITH_KTXIMPORTER "Build KtxImporter plugin" OFF)
pezcode marked this conversation as resolved.
Show resolved Hide resolved
option(WITH_MESHOPTIMIZERSCENECONVERTER "Build MeshOptimizerSceneConverter plugin" OFF)
option(WITH_MINIEXRIMAGECONVERTER "Build MiniExrImageConverter plugin" OFF)
cmake_dependent_option(WITH_OPENDDL "Build OpenDdl library" OFF "NOT WITH_OPENGEXIMPORTER" ON)
Expand Down
4 changes: 4 additions & 0 deletions doc/building-plugins.dox
Original file line number Diff line number Diff line change
Expand Up @@ -369,6 +369,10 @@ By default no plugins are built and you need to select them manually:
@ref Trade::JpegImageConverter "JpegImageConverter" plugin.
- `WITH_JPEGIMPORTER` --- Build the @ref Trade::JpegImporter "JpegImporter"
plugin. Depends on [libJPEG](http://libjpeg.sourceforge.net/).
- `WITH_KTXIMAGECONVERTER` --- Build the
@relativeref{Trade,KtxImageConverter} plugin.
- `WITH_KTXIMPORTER` --- Build the
@relativeref{Trade,KtxImporter} plugin.
- `WITH_MESHOPTIMIZERSCENECONVERTER` --- Build the
@ref Trade::MeshOptimizerSceneConverter "MeshOptimizerSceneConverter"
plugin.
Expand Down
3 changes: 3 additions & 0 deletions doc/cmake-plugins.dox
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,9 @@ This command will not try to find any actual plugin. The plugins are:
- `JpegImageConverter` --- @ref Trade::JpegImageConverter "JpegImageConverter"
plugin
- `JpegImporter` --- @ref Trade::JpegImporter "JpegImporter" plugin
- `KtxImageConverter` --- @ref Trade::KtxImageConverter "KtxImageConverter"
plugin
- `KtxImporter` --- @ref Trade::KtxImporter "KtxImporter" plugin
- `MeshOptimizerSceneConverter` ---
@ref Trade::MeshOptimizerSceneConverter "MeshOptimizerSceneConverter"
plugin
Expand Down
6 changes: 6 additions & 0 deletions doc/namespaces.dox
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,12 @@
/** @dir MagnumPlugins/JpegImporter
* @brief Plugin @ref Magnum::Trade::JpegImporter
*/
/** @dir MagnumPlugins/KtxImageConverter
* @brief Plugin @ref Magnum::Trade::KtxImageConverter
*/
/** @dir MagnumPlugins/KtxImporter
* @brief Plugin @ref Magnum::Trade::KtxImporter
*/
/** @dir MagnumPlugins/MeshOptimizerSceneConverter
* @brief Plugin @ref Magnum::Trade::MeshOptimizerSceneConverter
* @m_since_{plugins,2020,06}
Expand Down
16 changes: 11 additions & 5 deletions modules/FindMagnumPlugins.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@
# IcoImporter - ICO importer
# JpegImageConverter - JPEG image converter
# JpegImporter - JPEG importer
# KtxImageConverter - KTX image converter
# KtxImporter - KTX importer
# MeshOptimizerSceneConverter - MeshOptimizer scene converter
# MiniExrImageConverter - OpenEXR image converter using miniexr
# OpenGexImporter - OpenGEX importer
Expand Down Expand Up @@ -144,11 +146,12 @@ set(_MAGNUMPLUGINS_PLUGIN_COMPONENTS
DevIlImageImporter DrFlacAudioImporter DrMp3AudioImporter
DrWavAudioImporter Faad2AudioImporter FreeTypeFont GlslangShaderConverter
HarfBuzzFont IcoImporter JpegImageConverter JpegImporter
MeshOptimizerSceneConverter MiniExrImageConverter OpenExrImageConverter
OpenExrImporter OpenGexImporter PngImageConverter PngImporter
PrimitiveImporter SpirvToolsShaderConverter StanfordImporter
StanfordSceneConverter StbDxtImageConverter StbImageConverter
StbImageImporter StbTrueTypeFont StbVorbisAudioImporter StlImporter
KtxImageConverter KtxImporter MeshOptimizerSceneConverter
MiniExrImageConverter OpenExrImageConverter OpenExrImporter
OpenGexImporter PngImageConverter PngImporter PrimitiveImporter
SpirvToolsShaderConverter StanfordImporter StanfordSceneConverter
StbDxtImageConverter StbImageConverter StbImageImporter
StbTrueTypeFont StbVorbisAudioImporter StlImporter
TinyGltfImporter)
# Nothing is enabled by default right now
set(_MAGNUMPLUGINS_IMPLICITLY_ENABLED_COMPONENTS )
Expand Down Expand Up @@ -384,6 +387,9 @@ foreach(_component ${MagnumPlugins_FIND_COMPONENTS})
INTERFACE_LINK_LIBRARIES ${JPEG_LIBRARIES})
endif()

# KtxImageConverter has no dependencies
# KtxImporter has no dependencies

# MeshOptimizerSceneConverter plugin dependencies
elseif(_component STREQUAL MeshOptimizerSceneConverter)
if(NOT TARGET meshoptimizer)
Expand Down
2 changes: 2 additions & 0 deletions package/archlinux/PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@ build() {
-DWITH_ICOIMPORTER=ON \
-DWITH_JPEGIMAGECONVERTER=ON \
-DWITH_JPEGIMPORTER=ON \
-DWITH_KTXIMAGECONVERTER=ON \
-DWITH_KTXIMPORTER=ON \
-DWITH_MESHOPTIMIZERSCENECONVERTER=ON \
-DWITH_MINIEXRIMAGECONVERTER=ON \
-DWITH_OPENEXRIMAGECONVERTER=ON \
Expand Down
2 changes: 2 additions & 0 deletions package/archlinux/PKGBUILD-android-arm64
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@ build() {
-DWITH_ICOIMPORTER=ON \
-DWITH_JPEGIMAGECONVERTER=OFF \
-DWITH_JPEGIMPORTER=OFF \
-DWITH_KTXIMAGECONVERTER=ON \
-DWITH_KTXIMPORTER=ON \
-DWITH_MESHOPTIMIZERSCENECONVERTER=OFF \
-DWITH_MINIEXRIMAGECONVERTER=ON \
-DWITH_OPENEXRIMAGECONVERTER=OFF \
Expand Down
2 changes: 2 additions & 0 deletions package/archlinux/PKGBUILD-clang
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,8 @@ build() {
-DWITH_ICOIMPORTER=ON \
-DWITH_JPEGIMAGECONVERTER=ON \
-DWITH_JPEGIMPORTER=ON \
-DWITH_KTXIMAGECONVERTER=ON \
-DWITH_KTXIMPORTER=ON \
-DWITH_MESHOPTIMIZERSCENECONVERTER=ON \
-DWITH_MINIEXRIMAGECONVERTER=ON \
-DWITH_OPENEXRIMAGECONVERTER=ON \
Expand Down
2 changes: 2 additions & 0 deletions package/archlinux/PKGBUILD-clang-addresssanitizer
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ build() {
-DWITH_ICOIMPORTER=ON \
-DWITH_JPEGIMAGECONVERTER=ON \
-DWITH_JPEGIMPORTER=ON \
-DWITH_KTXIMAGECONVERTER=ON \
-DWITH_KTXIMPORTER=ON \
-DWITH_MESHOPTIMIZERSCENECONVERTER=ON \
-DWITH_MINIEXRIMAGECONVERTER=ON \
-DWITH_OPENEXRIMAGECONVERTER=ON \
Expand Down
2 changes: 2 additions & 0 deletions package/archlinux/PKGBUILD-clang-threadsanitizer
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ build() {
-DWITH_ICOIMPORTER=ON \
-DWITH_JPEGIMAGECONVERTER=ON \
-DWITH_JPEGIMPORTER=ON \
-DWITH_KTXIMAGECONVERTER=ON \
-DWITH_KTXIMPORTER=ON \
-DWITH_MESHOPTIMIZERSCENECONVERTER=ON \
-DWITH_MINIEXRIMAGECONVERTER=ON \
-DWITH_OPENEXRIMAGECONVERTER=ON \
Expand Down
2 changes: 2 additions & 0 deletions package/archlinux/PKGBUILD-coverage
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@ build() {
-DWITH_ICOIMPORTER=ON \
-DWITH_JPEGIMAGECONVERTER=ON \
-DWITH_JPEGIMPORTER=ON \
-DWITH_KTXIMAGECONVERTER=ON \
-DWITH_KTXIMPORTER=ON \
-DWITH_MESHOPTIMIZERSCENECONVERTER=ON \
-DWITH_MINIEXRIMAGECONVERTER=ON \
-DWITH_OPENEXRIMAGECONVERTER=ON \
Expand Down
2 changes: 2 additions & 0 deletions package/archlinux/PKGBUILD-emscripten
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@ build() {
-DWITH_DRWAVAUDIOIMPORTER=ON \
-DWITH_FAAD2AUDIOIMPORTER=ON \
-DWITH_ICOIMPORTER=ON \
-DWITH_KTXIMAGECONVERTER=ON \
-DWITH_KTXIMPORTER=ON \
-DWITH_MESHOPTIMIZERSCENECONVERTER=OFF \
-DWITH_MINIEXRIMAGECONVERTER=ON \
-DWITH_OPENEXRIMAGECONVERTER=OFF \
Expand Down
2 changes: 2 additions & 0 deletions package/archlinux/PKGBUILD-emscripten-wasm
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@ build() {
-DWITH_DRWAVAUDIOIMPORTER=ON \
-DWITH_FAAD2AUDIOIMPORTER=ON \
-DWITH_ICOIMPORTER=ON \
-DWITH_KTXIMAGECONVERTER=ON \
-DWITH_KTXIMPORTER=ON \
-DWITH_MESHOPTIMIZERSCENECONVERTER=OFF \
-DWITH_MINIEXRIMAGECONVERTER=ON \
-DWITH_OPENEXRIMAGECONVERTER=OFF \
Expand Down
2 changes: 2 additions & 0 deletions package/archlinux/PKGBUILD-emscripten-wasm-webgl2
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@ build() {
-DWITH_DRWAVAUDIOIMPORTER=ON \
-DWITH_FAAD2AUDIOIMPORTER=ON \
-DWITH_ICOIMPORTER=ON \
-DWITH_KTXIMAGECONVERTER=ON \
-DWITH_KTXIMPORTER=ON \
-DWITH_MESHOPTIMIZERSCENECONVERTER=OFF \
-DWITH_MINIEXRIMAGECONVERTER=ON \
-DWITH_OPENEXRIMAGECONVERTER=OFF \
Expand Down
2 changes: 2 additions & 0 deletions package/archlinux/PKGBUILD-gcc48
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,8 @@ build() {
-DWITH_ICOIMPORTER=ON \
-DWITH_JPEGIMAGECONVERTER=ON \
-DWITH_JPEGIMPORTER=ON \
-DWITH_KTXIMAGECONVERTER=ON \
-DWITH_KTXIMPORTER=ON \
-DWITH_MESHOPTIMIZERSCENECONVERTER=ON \
-DWITH_MINIEXRIMAGECONVERTER=ON \
-DWITH_OPENEXRIMAGECONVERTER=ON \
Expand Down
4 changes: 4 additions & 0 deletions package/archlinux/PKGBUILD-mingw-w64
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ build() {
-DWITH_ICOIMPORTER=ON \
-DWITH_JPEGIMAGECONVERTER=ON \
-DWITH_JPEGIMPORTER=ON \
-DWITH_KTXIMAGECONVERTER=ON \
-DWITH_KTXIMPORTER=ON \
-DWITH_MESHOPTIMIZERSCENECONVERTER=OFF \
-DWITH_MINIEXRIMAGECONVERTER=ON \
-DWITH_OPENEXRIMAGECONVERTER=OFF \
Expand Down Expand Up @@ -82,6 +84,8 @@ build() {
-DWITH_ICOIMPORTER=ON \
-DWITH_JPEGIMAGECONVERTER=ON \
-DWITH_JPEGIMPORTER=ON \
-DWITH_KTXIMAGECONVERTER=ON \
-DWITH_KTXIMPORTER=ON \
-DWITH_MESHOPTIMIZERSCENECONVERTER=OFF \
-DWITH_MINIEXRIMAGECONVERTER=ON \
-DWITH_OPENEXRIMAGECONVERTER=OFF \
Expand Down
4 changes: 4 additions & 0 deletions package/archlinux/PKGBUILD-release
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@ build() {
-DWITH_ICOIMPORTER=ON \
-DWITH_JPEGIMAGECONVERTER=ON \
-DWITH_JPEGIMPORTER=ON \
-DWITH_KTXIMAGECONVERTER=ON \
-DWITH_KTXIMPORTER=ON \
-DWITH_MESHOPTIMIZERSCENECONVERTER=ON \
-DWITH_MINIEXRIMAGECONVERTER=ON \
-DWITH_OPENEXRIMAGECONVERTER=ON \
Expand Down Expand Up @@ -82,6 +84,8 @@ build() {
-DWITH_ICOIMPORTER=ON \
-DWITH_JPEGIMAGECONVERTER=ON \
-DWITH_JPEGIMPORTER=ON \
-DWITH_KTXIMAGECONVERTER=ON \
-DWITH_KTXIMPORTER=ON \
-DWITH_MESHOPTIMIZERSCENECONVERTER=ON \
-DWITH_MINIEXRIMAGECONVERTER=ON \
-DWITH_OPENEXRIMAGECONVERTER=ON \
Expand Down
2 changes: 2 additions & 0 deletions package/archlinux/magnum-plugins-git/PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@ build() {
-DWITH_ICOIMPORTER=ON \
-DWITH_JPEGIMPORTER=ON \
-DWITH_JPEGIMAGECONVERTER=ON \
-DWITH_KTXIMAGECONVERTER=ON \
-DWITH_KTXIMPORTER=ON \
-DWITH_MESHOPTIMIZERSCENECONVERTER=ON \
-DWITH_MINIEXRIMAGECONVERTER=ON \
-DWITH_OPENEXRIMAGECONVERTER=ON \
Expand Down
2 changes: 2 additions & 0 deletions package/archlinux/magnum-plugins/PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,8 @@ build() {
-DWITH_ICOIMPORTER=ON \
-DWITH_JPEGIMAGECONVERTER=ON \
-DWITH_JPEGIMPORTER=ON \
-DWITH_KTXIMAGECONVERTER=ON \
-DWITH_KTXIMPORTER=ON \
-DWITH_MESHOPTIMIZERSCENECONVERTER=ON \
-DWITH_MINIEXRIMAGECONVERTER=ON \
-DWITH_OPENEXRIMAGECONVERTER=ON \
Expand Down
2 changes: 2 additions & 0 deletions package/ci/appveyor-desktop-mingw.bat
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,8 @@ cmake .. ^
-DWITH_ICOIMPORTER=ON ^
-DWITH_JPEGIMAGECONVERTER=ON ^
-DWITH_JPEGIMPORTER=ON ^
-DWITH_KTXIMAGECONVERTER=ON ^
-DWITH_KTXIMPORTER=ON ^
-DWITH_MESHOPTIMIZERSCENECONVERTER=ON ^
-DWITH_MINIEXRIMAGECONVERTER=ON ^
-DWITH_OPENEXRIMAGECONVERTER=ON ^
Expand Down
2 changes: 2 additions & 0 deletions package/ci/appveyor-desktop.bat
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,8 @@ cmake .. ^
-DWITH_ICOIMPORTER=ON ^
-DWITH_JPEGIMAGECONVERTER=%EXCEPT_MSVC2015% ^
-DWITH_JPEGIMPORTER=%EXCEPT_MSVC2015% ^
-DWITH_KTXIMAGECONVERTER=ON ^
-DWITH_KTXIMPORTER=ON ^
-DWITH_MESHOPTIMIZERSCENECONVERTER=ON ^
-DWITH_MINIEXRIMAGECONVERTER=ON ^
-DWITH_OPENEXRIMAGECONVERTER=%EXCEPT_MSVC2015% ^
Expand Down
2 changes: 2 additions & 0 deletions package/ci/appveyor-rt.bat
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,8 @@ cmake .. ^
-DWITH_ICOIMPORTER=ON ^
-DWITH_JPEGIMAGECONVERTER=OFF ^
-DWITH_JPEGIMPORTER=OFF ^
-DWITH_KTXIMAGECONVERTER=ON ^
-DWITH_KTXIMPORTER=ON ^
-DWITH_MESHOPTIMIZERSCENECONVERTER=OFF ^
-DWITH_MINIEXRIMAGECONVERTER=ON ^
-DWITH_OPENEXRIMAGECONVERTER=OFF ^
Expand Down
2 changes: 2 additions & 0 deletions package/ci/emscripten.sh
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,8 @@ cmake .. \
-DWITH_ICOIMPORTER=ON \
-DWITH_JPEGIMAGECONVERTER=OFF \
-DWITH_JPEGIMPORTER=OFF \
-DWITH_KTXIMAGECONVERTER=ON \
-DWITH_KTXIMPORTER=ON \
-DWITH_MESHOPTIMIZERSCENECONVERTER=OFF \
-DWITH_MINIEXRIMAGECONVERTER=ON \
-DWITH_OPENEXRIMAGECONVERTER=OFF \
Expand Down
2 changes: 2 additions & 0 deletions package/ci/travis-android-arm.sh
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,8 @@ cmake .. \
-DWITH_ICOIMPORTER=ON \
-DWITH_JPEGIMAGECONVERTER=OFF \
-DWITH_JPEGIMPORTER=OFF \
-DWITH_KTXIMAGECONVERTER=ON \
-DWITH_KTXIMPORTER=ON \
-DWITH_MESHOPTIMIZERSCENECONVERTER=OFF \
-DWITH_MINIEXRIMAGECONVERTER=ON \
-DWITH_OPENEXRIMAGECONVERTER=OFF \
Expand Down
2 changes: 2 additions & 0 deletions package/ci/travis-ios-simulator.sh
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,8 @@ cmake .. \
-DWITH_ICOIMPORTER=ON \
-DWITH_JPEGIMAGECONVERTER=OFF \
-DWITH_JPEGIMPORTER=OFF \
-DWITH_KTXIMAGECONVERTER=ON \
-DWITH_KTXIMPORTER=ON \
-DWITH_MESHOPTIMIZERSCENECONVERTER=OFF \
-DWITH_MINIEXRIMAGECONVERTER=ON \
-DWITH_OPENEXRIMAGECONVERTER=OFF \
Expand Down
2 changes: 2 additions & 0 deletions package/ci/unix-desktop.sh
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,8 @@ cmake .. \
-DWITH_ICOIMPORTER=ON \
-DWITH_JPEGIMAGECONVERTER=ON \
-DWITH_JPEGIMPORTER=ON \
-DWITH_KTXIMAGECONVERTER=ON \
-DWITH_KTXIMPORTER=ON \
-DWITH_MESHOPTIMIZERSCENECONVERTER=ON \
-DWITH_MINIEXRIMAGECONVERTER=ON \
-DWITH_OPENEXRIMAGECONVERTER=ON \
Expand Down
2 changes: 2 additions & 0 deletions package/debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ override_dh_auto_configure:
-DWITH_ICOIMPORTER=ON \
-DWITH_JPEGIMAGECONVERTER=ON \
-DWITH_JPEGIMPORTER=ON \
-DWITH_KTXIMAGECONVERTER=ON \
-DWITH_KTXIMPORTER=ON \
-DWITH_MESHOPTIMIZERSCENECONVERTER=OFF \
-DWITH_MINIEXRIMAGECONVERTER=ON \
-DWITH_OPENEXRIMAGECONVERTER=ON \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@ src_configure() {
-DWITH_ICOIMPORTER=ON
-DWITH_JPEGIMAGECONVERTER=ON
-DWITH_JPEGIMPORTER=ON
-DWITH_KTXIMAGECONVERTER=ON
-DWITH_KTXIMPORTER=ON
-DWITH_MESHOPTIMIZERSCENECONVERTER=OFF
-DWITH_MINIEXRIMAGECONVERTER=ON
-DWITH_OPENEXRIMAGECONVERTER=ON
Expand Down
2 changes: 2 additions & 0 deletions package/homebrew/magnum-plugins.rb
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,8 @@ def install
"-DWITH_HARFBUZZFONT=#{(build.with? 'harfbuzz') ? 'ON' : 'OFF'}",
"-DWITH_JPEGIMAGECONVERTER=#{(build.with? 'jpeg') ? 'ON' : 'OFF'}",
"-DWITH_JPEGIMPORTER=#{(build.with? 'jpeg') ? 'ON' : 'OFF'}",
"-DWITH_KTXIMAGECONVERTER=ON",
"-DWITH_KTXIMAGEIMPORTER=ON",
"-DWITH_MESHOPTIMIZERSCENECONVERTER=ON",
"-DWITH_MINIEXRIMAGECONVERTER=ON",
"-DWITH_OPENEXRIMAGECONVERTER=#{(build.with? 'openexr') ? 'ON' : 'OFF'}",
Expand Down
2 changes: 2 additions & 0 deletions package/msys/PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@ build() {
-DWITH_ICOIMPORTER=ON \
-DWITH_JPEGIMAGECONVERTER=ON \
-DWITH_JPEGIMPORTER=ON \
-DWITH_KTXIMAGECONVERTER=ON \
-DWITH_KTXIMPORTER=ON \
-DWITH_MESHOPTIMIZERSCENECONVERTER=OFF \
-DWITH_MINIEXRIMAGECONVERTER=ON \
-DWITH_OPENEXRIMAGECONVERTER=ON \
Expand Down
2 changes: 2 additions & 0 deletions package/msys/magnum-plugins/PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,8 @@ build() {
-DWITH_ICOIMPORTER=ON \
-DWITH_JPEGIMAGECONVERTER=ON \
-DWITH_JPEGIMPORTER=ON \
-DWITH_KTXIMAGECONVERTER=ON \
-DWITH_KTXIMPORTER=ON \
-DWITH_MESHOPTIMIZERSCENECONVERTER=OFF \
-DWITH_MINIEXRIMAGECONVERTER=ON \
-DWITH_OPENEXRIMAGECONVERTER=ON \
Expand Down
8 changes: 8 additions & 0 deletions src/MagnumPlugins/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,14 @@ if(WITH_JPEGIMPORTER)
add_subdirectory(JpegImporter)
endif()

if(WITH_KTXIMAGECONVERTER)
add_subdirectory(KtxImageConverter)
endif()

if(WITH_KTXIMPORTER)
add_subdirectory(KtxImporter)
endif()

if(WITH_MESHOPTIMIZERSCENECONVERTER)
add_subdirectory(MeshOptimizerSceneConverter)
endif()
Expand Down
Loading