Skip to content

Commit

Permalink
MeshOptimizerSceneConverter: new plugin.
Browse files Browse the repository at this point in the history
Currently integrating just the first three optimization routines; mesh
simplification, meshlets etc will come later.
  • Loading branch information
mosra committed May 26, 2020
1 parent 356940b commit ae69193
Show file tree
Hide file tree
Showing 44 changed files with 1,511 additions and 12 deletions.
1 change: 1 addition & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ cmake_dependent_option(WITH_FREETYPEFONT "Build FreeTypeFont plugin" OFF "NOT WI
option(WITH_HARFBUZZFONT "Build HarfBuzzFont plugin" OFF)
option(WITH_JPEGIMAGECONVERTER "Build JpegImageConverter plugin" OFF)
option(WITH_JPEGIMPORTER "Build JpegImporter plugin" OFF)
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)
option(WITH_OPENGEXIMPORTER "Build OpenGexImporter plugin" OFF)
Expand Down
3 changes: 3 additions & 0 deletions doc/building-plugins.dox
Original file line number Diff line number Diff line change
Expand Up @@ -334,6 +334,9 @@ 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_MESHOPTIMIZERSCENECONVERTER` --- Build the
@ref Trade::MeshOptimizerSceneConverter "MeshOptimizerSceneConverter"
plugin.
- `WITH_MINIEXRIMAGECONVERTER` --- Build the
@ref Trade::MiniExrImageConverter "MiniExrImageConverter" plugin.
- `WITH_OPENGEXIMPORTER` --- Build the @ref Trade::OpenGexImporter "OpenGexImporter"
Expand Down
2 changes: 2 additions & 0 deletions doc/changelog-plugins.dox
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,8 @@ namespace Magnum {
writing binary PLY files
- New @ref Trade::StlImporter "StlImporter" plugin for importing binary STL
files
- New @ref Trade::MeshOptimizerSceneConverter "MeshOptimizerSceneConverter"
plugin, integrating [meshoptimizer](https://github.com/zeux/meshoptimizer)
- Animated GIF support in @ref Trade::StbImageImporter "StbImageImporter"
- Texture coordinate set import in @ref Trade::AssimpImporter "AssimpImporter"
and @ref Trade::TinyGltfImporter "TinyGltfImporter" (see
Expand Down
3 changes: 3 additions & 0 deletions doc/cmake-plugins.dox
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,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
- `MeshOptimizerSceneConverter` ---
@ref Trade::MeshOptimizerSceneConverter "MeshOptimizerSceneConverter"
plugin
- `MiniExrImageConverter` --- @ref Trade::MiniExrImageConverter "MiniExrImageConverter"
plugin
- `OpenGexImporter` --- @ref Trade::OpenGexImporter "OpenGexImporter" plugin
Expand Down
2 changes: 2 additions & 0 deletions doc/custom-buildsystems-plugins-order.dot
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,8 @@ digraph "Magnum Plugins dependency order" {
AssimpImporter -> AnyImageImporter
FreeTypeFont -> MagnumText
HarfBuzzFont -> FreeTypeFont
MeshOptimizerSceneConverter -> MagnumTrade
MeshOptimizerSceneConverter -> MagnumMeshTools
OpenGexImporter -> MagnumTrade
OpenGexImporter -> AnyImageImporter
OpenGexImporter -> MagnumOpenDdl
Expand Down
22 changes: 19 additions & 3 deletions modules/FindMagnumPlugins.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
# HarfBuzzFont - HarfBuzz font
# JpegImageConverter - JPEG image converter
# JpegImporter - JPEG importer
# MeshOptimizerSceneConverter - MeshOptimizer scene converter
# MiniExrImageConverter - OpenEXR image converter using miniexr
# OpenGexImporter - OpenGEX importer
# PngImageConverter - PNG image converter
Expand Down Expand Up @@ -108,6 +109,8 @@ foreach(_component ${MagnumPlugins_FIND_COMPONENTS})

if(_component STREQUAL AssimpImporter)
list(APPEND _MAGNUMPLUGINS_${_component}_MAGNUM_DEPENDENCIES AnyImageImporter)
elseif(_component STREQUAL MeshOptimizerSceneConverter)
list(APPEND _MAGNUMPLUGINS_${_component}_MAGNUM_DEPENDENCIES MeshTools)
elseif(_component STREQUAL OpenGexImporter)
list(APPEND _MAGNUMPLUGINS_${_component}_MAGNUM_DEPENDENCIES AnyImageImporter)
elseif(_component STREQUAL PrimitiveImporter)
Expand Down Expand Up @@ -136,9 +139,11 @@ set(_MAGNUMPLUGINS_PLUGIN_COMPONENT_LIST
AssimpImporter BasisImageConverter BasisImporter DdsImporter
DevIlImageImporter DrFlacAudioImporter DrMp3AudioImporter
DrWavAudioImporter Faad2AudioImporter FreeTypeFont HarfBuzzFont
JpegImageConverter JpegImporter MiniExrImageConverter OpenGexImporter
PngImageConverter PngImporter PrimitiveImporter StanfordImporter
StanfordSceneConverter StbImageConverter StbImageImporter StbTrueTypeFont StbVorbisAudioImporter StlImporter TinyGltfImporter)
JpegImageConverter JpegImporter MeshOptimizerSceneConverter
MiniExrImageConverter OpenGexImporter PngImageConverter PngImporter
PrimitiveImporter StanfordImporter StanfordSceneConverter StbImageConverter
StbImageImporter StbTrueTypeFont StbVorbisAudioImporter StlImporter
TinyGltfImporter)

# Inter-component dependencies
set(_MAGNUMPLUGINS_HarfBuzzFont_DEPENDENCIES FreeTypeFont)
Expand Down Expand Up @@ -369,6 +374,17 @@ foreach(_component ${MagnumPlugins_FIND_COMPONENTS})
INTERFACE_LINK_LIBRARIES ${JPEG_LIBRARIES})
endif()

# MeshOptimizerSceneConverter plugin dependencies
elseif(_component STREQUAL MeshOptimizerSceneConverter)
if(NOT TARGET meshoptimizer)
find_package(meshoptimizer REQUIRED CONFIG)
set_property(TARGET MagnumPlugins::${_component} APPEND PROPERTY
INTERFACE_LINK_LIBRARIES meshoptimizer::meshoptimizer)
else()
set_property(TARGET MagnumPlugins::${_component} APPEND PROPERTY
INTERFACE_LINK_LIBRARIES meshoptimizer)
endif()

# MiniExrImageConverter has no dependencies
# No special setup for the OpenDdl library
# OpenGexImporter has no dependencies
Expand Down
3 changes: 2 additions & 1 deletion package/archlinux/PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ pkgdesc="Plugins for the Magnum C++11/C++14 graphics engine"
arch=('i686' 'x86_64')
url="https://magnum.graphics"
license=('MIT')
depends=('magnum' 'devil' 'faad2' 'freetype2' 'harfbuzz' 'libjpeg' 'libpng' 'assimp' 'basis-universal-src')
depends=('magnum' 'devil' 'faad2' 'freetype2' 'harfbuzz' 'libjpeg' 'libpng' 'assimp' 'basis-universal-src' 'meshoptimizer')
makedepends=('cmake' 'ninja')
options=(!strip)
provides=('magnum-plugins-git')
Expand Down Expand Up @@ -36,6 +36,7 @@ build() {
-DWITH_HARFBUZZFONT=ON \
-DWITH_JPEGIMAGECONVERTER=ON \
-DWITH_JPEGIMPORTER=ON \
-DWITH_MESHOPTIMIZERSCENECONVERTER=ON \
-DWITH_MINIEXRIMAGECONVERTER=ON \
-DWITH_OPENGEXIMPORTER=ON \
-DWITH_PNGIMAGECONVERTER=ON \
Expand Down
1 change: 1 addition & 0 deletions package/archlinux/PKGBUILD-android-arm64
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ build() {
-DWITH_DRFLACAUDIOIMPORTER=OFF \
-DWITH_DRMP3AUDIOIMPORTER=OFF \
-DWITH_DRWAVAUDIOIMPORTER=OFF \
-DWITH_MESHOPTIMIZERSCENECONVERTER=OFF \
-DWITH_MINIEXRIMAGECONVERTER=ON \
-DWITH_OPENGEXIMPORTER=ON \
-DWITH_PRIMITIVEIMPORTER=ON \
Expand Down
3 changes: 2 additions & 1 deletion package/archlinux/PKGBUILD-clang
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ pkgdesc="Plugins for the Magnum C++11/C++14 graphics engine (built with clang)"
arch=('i686' 'x86_64')
url="https://magnum.graphics"
license=('MIT')
depends=('magnum' 'devil' 'faad2' 'freetype2' 'harfbuzz' 'libjpeg' 'libpng' 'assimp')
depends=('magnum' 'devil' 'faad2' 'freetype2' 'harfbuzz' 'libjpeg' 'libpng' 'assimp' 'meshoptimizer')
makedepends=('cmake' 'clang' 'ninja' 'basis-universal-src')
options=(!strip)
provides=('magnum-plugins-git')
Expand Down Expand Up @@ -48,6 +48,7 @@ build() {
-DWITH_HARFBUZZFONT=ON \
-DWITH_JPEGIMAGECONVERTER=ON \
-DWITH_JPEGIMPORTER=ON \
-DWITH_MESHOPTIMIZERSCENECONVERTER=ON \
-DWITH_MINIEXRIMAGECONVERTER=ON \
-DWITH_OPENGEXIMPORTER=ON \
-DWITH_PNGIMAGECONVERTER=ON \
Expand Down
3 changes: 2 additions & 1 deletion package/archlinux/PKGBUILD-clang-addresssanitizer
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ pkgdesc="Plugins for the Magnum C++11/C++14 graphics engine (clang-addresssaniti
arch=('i686' 'x86_64')
url="https://magnum.graphics"
license=('MIT')
depends=('magnum' 'ninja' 'devil' 'faad2' 'freetype2' 'harfbuzz' 'libjpeg' 'libpng' 'assimp')
depends=('magnum' 'ninja' 'devil' 'faad2' 'freetype2' 'harfbuzz' 'libjpeg' 'libpng' 'assimp' 'meshoptimizer')
makedepends=('cmake' 'clang' 'basis-universal-src')
options=(!strip)
provides=('magnum-plugins-git')
Expand Down Expand Up @@ -38,6 +38,7 @@ build() {
-DWITH_HARFBUZZFONT=ON \
-DWITH_JPEGIMAGECONVERTER=ON \
-DWITH_JPEGIMPORTER=ON \
-DWITH_MESHOPTIMIZERSCENECONVERTER=ON \
-DWITH_MINIEXRIMAGECONVERTER=ON \
-DWITH_OPENGEXIMPORTER=ON \
-DWITH_PNGIMAGECONVERTER=ON \
Expand Down
3 changes: 2 additions & 1 deletion package/archlinux/PKGBUILD-clang-threadsanitizer
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ pkgdesc="Plugins for the Magnum C++11/C++14 graphics engine (clang-threadsanitiz
arch=('i686' 'x86_64')
url="https://magnum.graphics"
license=('MIT')
depends=('magnum' 'ninja' 'devil' 'faad2' 'freetype2' 'harfbuzz' 'libjpeg' 'libpng' 'assimp')
depends=('magnum' 'ninja' 'devil' 'faad2' 'freetype2' 'harfbuzz' 'libjpeg' 'libpng' 'assimp' 'meshoptimizer')
makedepends=('cmake' 'clang' 'basis-universal-src')
options=(!strip)
provides=('magnum-plugins-git')
Expand Down Expand Up @@ -37,6 +37,7 @@ build() {
-DWITH_FREETYPEFONT=ON \
-DWITH_HARFBUZZFONT=ON \
-DWITH_JPEGIMPORTER=ON \
-DWITH_MESHOPTIMIZERSCENECONVERTER=ON \
-DWITH_MINIEXRIMAGECONVERTER=ON \
-DWITH_OPENGEXIMPORTER=ON \
-DWITH_PNGIMAGECONVERTER=ON \
Expand Down
3 changes: 2 additions & 1 deletion package/archlinux/PKGBUILD-coverage
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ arch=('i686' 'x86_64')
url="https://magnum.graphics"
license=('MIT')
depends=('magnum' 'devil' 'faad2' 'freetype2' 'harfbuzz' 'libjpeg' 'libpng')
makedepends=('cmake' 'ninja' 'lcov' 'basis-universal-src')
makedepends=('cmake' 'ninja' 'lcov' 'basis-universal-src' 'meshoptimizer')
options=(!strip)
provides=('magnum-plugins-git')

Expand Down Expand Up @@ -41,6 +41,7 @@ build() {
-DWITH_HARFBUZZFONT=ON \
-DWITH_JPEGIMAGECONVERTER=ON \
-DWITH_JPEGIMPORTER=ON \
-DWITH_MESHOPTIMIZERSCENECONVERTER=ON \
-DWITH_MINIEXRIMAGECONVERTER=ON \
-DWITH_OPENGEXIMPORTER=ON \
-DWITH_PNGIMAGECONVERTER=ON \
Expand Down
1 change: 1 addition & 0 deletions package/archlinux/PKGBUILD-emscripten
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ build() {
-DWITH_DRMP3AUDIOIMPORTER=ON \
-DWITH_DRWAVAUDIOIMPORTER=ON \
-DWITH_FAAD2AUDIOIMPORTER=ON \
-DWITH_MESHOPTIMIZERSCENECONVERTER=OFF \
-DWITH_MINIEXRIMAGECONVERTER=ON \
-DWITH_OPENGEXIMPORTER=ON \
-DWITH_PRIMITIVEIMPORTER=ON \
Expand Down
1 change: 1 addition & 0 deletions package/archlinux/PKGBUILD-emscripten-wasm
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ build() {
-DWITH_DRMP3AUDIOIMPORTER=ON \
-DWITH_DRWAVAUDIOIMPORTER=ON \
-DWITH_FAAD2AUDIOIMPORTER=ON \
-DWITH_MESHOPTIMIZERSCENECONVERTER=OFF \
-DWITH_MINIEXRIMAGECONVERTER=ON \
-DWITH_OPENGEXIMPORTER=ON \
-DWITH_PRIMITIVEIMPORTER=ON \
Expand Down
1 change: 1 addition & 0 deletions package/archlinux/PKGBUILD-emscripten-wasm-webgl2
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ build() {
-DWITH_DRMP3AUDIOIMPORTER=ON \
-DWITH_DRWAVAUDIOIMPORTER=ON \
-DWITH_FAAD2AUDIOIMPORTER=ON \
-DWITH_MESHOPTIMIZERSCENECONVERTER=OFF \
-DWITH_MINIEXRIMAGECONVERTER=ON \
-DWITH_OPENGEXIMPORTER=ON \
-DWITH_PRIMITIVEIMPORTER=ON \
Expand Down
3 changes: 2 additions & 1 deletion package/archlinux/PKGBUILD-gcc48
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ arch=('i686' 'x86_64')
url="https://magnum.graphics"
license=('MIT')
depends=('magnum' 'devil' 'faad2' 'freetype2' 'harfbuzz' 'libjpeg' 'libpng' 'assimp')
makedepends=('cmake' 'ninja' 'gcc48' 'basis-universal-src')
makedepends=('cmake' 'ninja' 'gcc48' 'basis-universal-src' 'meshoptimizer')
options=(!strip)
provides=('magnum-plugins-git')

Expand Down Expand Up @@ -48,6 +48,7 @@ build() {
-DWITH_HARFBUZZFONT=ON \
-DWITH_JPEGIMAGECONVERTER=ON \
-DWITH_JPEGIMPORTER=ON \
-DWITH_MESHOPTIMIZERSCENECONVERTER=ON \
-DWITH_MINIEXRIMAGECONVERTER=ON \
-DWITH_OPENGEXIMPORTER=ON \
-DWITH_PNGIMAGECONVERTER=ON \
Expand Down
2 changes: 2 additions & 0 deletions package/archlinux/PKGBUILD-mingw-w64
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ build() {
-DWITH_FREETYPEFONT=ON \
-DWITH_JPEGIMAGECONVERTER=ON \
-DWITH_JPEGIMPORTER=ON \
-DWITH_MESHOPTIMIZERSCENECONVERTER=OFF \
-DWITH_MINIEXRIMAGECONVERTER=ON \
-DWITH_OPENGEXIMPORTER=ON \
-DWITH_PNGIMAGECONVERTER=ON \
Expand Down Expand Up @@ -73,6 +74,7 @@ build() {
-DWITH_FREETYPEFONT=ON \
-DWITH_JPEGIMAGECONVERTER=ON \
-DWITH_JPEGIMPORTER=ON \
-DWITH_MESHOPTIMIZERSCENECONVERTER=OFF \
-DWITH_MINIEXRIMAGECONVERTER=ON \
-DWITH_OPENGEXIMPORTER=ON \
-DWITH_PNGIMAGECONVERTER=ON \
Expand Down
4 changes: 3 additions & 1 deletion package/archlinux/PKGBUILD-release
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ pkgdesc="Plugins for the Magnum C++11/C++14 graphics engine (debug+release libs)
arch=('i686' 'x86_64')
url="https://magnum.graphics"
license=('MIT')
depends=('magnum' 'devil' 'faad2' 'freetype2' 'harfbuzz' 'libjpeg' 'libpng' 'assimp')
depends=('magnum' 'devil' 'faad2' 'freetype2' 'harfbuzz' 'libjpeg' 'libpng' 'assimp' 'meshoptimizer')
makedepends=('cmake' 'ninja' 'basis-universal-src')
options=('!strip')
provides=('magnum-plugins-git')
Expand Down Expand Up @@ -36,6 +36,7 @@ build() {
-DWITH_HARFBUZZFONT=ON \
-DWITH_JPEGIMAGECONVERTER=ON \
-DWITH_JPEGIMPORTER=ON \
-DWITH_MESHOPTIMIZERSCENECONVERTER=ON \
-DWITH_MINIEXRIMAGECONVERTER=ON \
-DWITH_OPENGEXIMPORTER=ON \
-DWITH_PNGIMAGECONVERTER=ON \
Expand Down Expand Up @@ -73,6 +74,7 @@ build() {
-DWITH_HARFBUZZFONT=ON \
-DWITH_JPEGIMAGECONVERTER=ON \
-DWITH_JPEGIMPORTER=ON \
-DWITH_MESHOPTIMIZERSCENECONVERTER=ON \
-DWITH_MINIEXRIMAGECONVERTER=ON \
-DWITH_OPENGEXIMPORTER=ON \
-DWITH_PNGIMAGECONVERTER=ON \
Expand Down
3 changes: 2 additions & 1 deletion package/archlinux/magnum-plugins-git/PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ pkgdesc="Plugins for the Magnum C++11/C++14 graphics engine (Git version)"
arch=('i686' 'x86_64')
url="https://magnum.graphics"
license=('MIT')
depends=('magnum-git' 'devil' 'faad2' 'libpng' 'libjpeg' 'freetype2' 'assimp')
depends=('magnum-git' 'devil' 'faad2' 'libpng' 'libjpeg' 'freetype2' 'assimp' 'meshoptimizer')
makedepends=('cmake' 'git')
provides=('magnum-plugins')
conflicts=('magnum-plugins')
Expand Down Expand Up @@ -37,6 +37,7 @@ build() {
-DWITH_FREETYPEFONT=ON \
-DWITH_JPEGIMPORTER=ON \
-DWITH_JPEGIMAGECONVERTER=ON \
-DWITH_MESHOPTIMIZERSCENECONVERTER=ON \
-DWITH_MINIEXRIMAGECONVERTER=ON \
-DWITH_OPENGEXIMPORTER=ON \
-DWITH_PNGIMAGECONVERTER=ON \
Expand Down
1 change: 1 addition & 0 deletions package/archlinux/magnum-plugins/PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ build() {
-DWITH_FREETYPEFONT=ON \
-DWITH_JPEGIMAGECONVERTER=ON \
-DWITH_JPEGIMPORTER=ON \
-DWITH_MESHOPTIMIZERSCENECONVERTER=OFF \
-DWITH_MINIEXRIMAGECONVERTER=ON \
-DWITH_OPENGEXIMPORTER=ON \
-DWITH_PNGIMAGECONVERTER=ON \
Expand Down
15 changes: 15 additions & 0 deletions package/ci/appveyor-desktop-mingw.bat
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,20 @@ cmake .. ^
cmake --build . --target install || exit /b
cd .. && cd .. || exit /b

rem build meshoptimizer
IF NOT EXIST %APPVEYOR_BUILD_FOLDER%\v0.14.zip appveyor DownloadFile https://github.com/zeux/meshoptimizer/archive/v0.14.zip || exit /b
7z x v0.14.zip || exit /b
ren meshoptimizer-0.14 meshoptimizer || exit /b
cd meshoptimizer || exit /b
mkdir build && cd build || exit /b
cmake .. ^
-DCMAKE_CXX_FLAGS="--coverage" ^
-DCMAKE_BUILD_TYPE=Debug ^
-DCMAKE_INSTALL_PREFIX=%APPVEYOR_BUILD_FOLDER%/deps ^
-G Ninja || exit /b
cmake --build . --target install || exit /b
cd .. && cd .. || exit /b

rem Build Corrade
git clone --depth 1 git://github.com/mosra/corrade.git || exit /b
cd corrade || exit /b
Expand Down Expand Up @@ -78,6 +92,7 @@ cmake .. ^
-DWITH_HARFBUZZFONT=OFF ^
-DWITH_JPEGIMAGECONVERTER=ON ^
-DWITH_JPEGIMPORTER=ON ^
-DWITH_MESHOPTIMIZERSCENECONVERTER=ON ^
-DWITH_MINIEXRIMAGECONVERTER=ON ^
-DWITH_OPENGEXIMPORTER=ON ^
-DWITH_PNGIMAGECONVERTER=OFF ^
Expand Down
14 changes: 14 additions & 0 deletions package/ci/appveyor-desktop.bat
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,19 @@ IF "%APPVEYOR_BUILD_WORKER_IMAGE%" == "Visual Studio 2015" set EXCEPT_IF_VCPKG_I
IF NOT "%APPVEYOR_BUILD_WORKER_IMAGE%" == "Visual Studio 2015" set EXCEPT_IF_VCPKG_IS_BROKEN=ON
IF NOT "%APPVEYOR_BUILD_WORKER_IMAGE%" == "Visual Studio 2015" vcpkg install libpng:x64-windows || exit /b

rem build meshoptimizer
IF NOT EXIST %APPVEYOR_BUILD_FOLDER%\v0.14.zip appveyor DownloadFile https://github.com/zeux/meshoptimizer/archive/v0.14.zip || exit /b
7z x v0.14.zip || exit /b
ren meshoptimizer-0.14 meshoptimizer || exit /b
cd meshoptimizer || exit /b
mkdir build && cd build || exit /b
cmake .. ^
-DCMAKE_BUILD_TYPE=Debug ^
-DCMAKE_INSTALL_PREFIX=%APPVEYOR_BUILD_FOLDER%/deps ^
%COMPILER_EXTRA% -G Ninja || exit /b
cmake --build . --target install || exit /b
cd .. && cd .. || exit /b

rem Build Corrade
git clone --depth 1 git://github.com/mosra/corrade.git || exit /b
cd corrade || exit /b
Expand Down Expand Up @@ -89,6 +102,7 @@ cmake .. ^
-DWITH_HARFBUZZFONT=OFF ^
-DWITH_JPEGIMAGECONVERTER=ON ^
-DWITH_JPEGIMPORTER=ON ^
-DWITH_MESHOPTIMIZERSCENECONVERTER=ON ^
-DWITH_MINIEXRIMAGECONVERTER=ON ^
-DWITH_OPENGEXIMPORTER=ON ^
-DWITH_PNGIMAGECONVERTER=%EXCEPT_IF_VCPKG_IS_BROKEN% ^
Expand Down
1 change: 1 addition & 0 deletions package/ci/appveyor-rt.bat
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ cmake .. ^
-DWITH_HARFBUZZFONT=OFF ^
-DWITH_JPEGIMAGECONVERTER=OFF ^
-DWITH_JPEGIMPORTER=OFF ^
-DWITH_MESHOPTIMIZERSCENECONVERTER=OFF ^
-DWITH_MINIEXRIMAGECONVERTER=ON ^
-DWITH_OPENGEXIMPORTER=ON ^
-DWITH_PNGIMAGECONVERTER=OFF ^
Expand Down
2 changes: 2 additions & 0 deletions package/ci/appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -73,3 +73,5 @@ cache:
- libjpeg-turbo-1.5.0.tar.gz -> package/ci/appveyor-cache-reset.txt
- DevIL-SDK-x64-1.7.8.zip -> package/ci/appveyor-cache-reset.txt
- basis_universal-%BASIS_VERSION%.zip -> package/ci/appveyor-cache-reset.txt
# meshoptimizer
- v0.14.zip -> package/ci/appveyor-cache-reset.txt
1 change: 1 addition & 0 deletions package/ci/travis-android-arm.sh
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ cmake .. \
-DWITH_HARFBUZZFONT=OFF \
-DWITH_JPEGIMAGECONVERTER=OFF \
-DWITH_JPEGIMPORTER=OFF \
-DWITH_MESHOPTIMIZERSCENECONVERTER=OFF \
-DWITH_MINIEXRIMAGECONVERTER=ON \
-DWITH_OPENGEXIMPORTER=ON \
-DWITH_PNGIMAGECONVERTER=OFF \
Expand Down
1 change: 1 addition & 0 deletions package/ci/travis-desktop.sh
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ cmake .. \
-DWITH_HARFBUZZFONT=ON \
-DWITH_JPEGIMAGECONVERTER=ON \
-DWITH_JPEGIMPORTER=ON \
-DWITH_MESHOPTIMIZERSCENECONVERTER=ON \
-DWITH_MINIEXRIMAGECONVERTER=ON \
-DWITH_OPENGEXIMPORTER=ON \
-DWITH_PNGIMAGECONVERTER=ON \
Expand Down
1 change: 1 addition & 0 deletions package/ci/travis-emscripten.sh
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@ cmake .. \
-DWITH_HARFBUZZFONT=OFF \
-DWITH_JPEGIMAGECONVERTER=OFF \
-DWITH_JPEGIMPORTER=OFF \
-DWITH_MESHOPTIMIZERSCENECONVERTER=OFF \
-DWITH_MINIEXRIMAGECONVERTER=ON \
-DWITH_OPENGEXIMPORTER=ON \
-DWITH_PNGIMAGECONVERTER=OFF \
Expand Down
1 change: 1 addition & 0 deletions package/ci/travis-ios-simulator.sh
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ cmake .. \
-DWITH_HARFBUZZFONT=OFF \
-DWITH_JPEGIMAGECONVERTER=OFF \
-DWITH_JPEGIMPORTER=OFF \
-DWITH_MESHOPTIMIZERSCENECONVERTER=OFF \
-DWITH_MINIEXRIMAGECONVERTER=ON \
-DWITH_OPENGEXIMPORTER=ON \
-DWITH_PNGIMAGECONVERTER=OFF \
Expand Down
Loading

0 comments on commit ae69193

Please sign in to comment.