Trade: new magnum-sceneconverter tool.

Currently provides just the --info option similarly to magnum-imageconverter, nothing else.
mosra · Mar 28, 2020 · 1c51b98 · 1c51b98
1 parent 92655c7
commit 1c51b98
Show file tree

Hide file tree

Showing 33 changed files with 300 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -71,6 +71,7 @@ endif()
 
 # API-independent utilities
 option(WITH_IMAGECONVERTER "Build magnum-imageconverter utility" OFF)
+option(WITH_SCENECONVERTER "Build magnum-sceneconverter utility" OFF)
 
 # Magnum AL Info
 option(WITH_AL_INFO "Build magnum-al-info utility" OFF)

diff --git a/Doxyfile b/Doxyfile
@@ -921,6 +921,7 @@ INPUT                  = src/Magnum \
                          src/Magnum/Text/fontconverter.cpp \
                          src/Magnum/TextureTools/distancefieldconverter.cpp \
                          src/Magnum/Trade/imageconverter.cpp \
+                         src/Magnum/Trade/sceneconverter.cpp \
                          doc/ \
                          ../magnum-plugins/src/Magnum \
                          ../magnum-plugins/src/MagnumPlugins \

diff --git a/doc/utilities.dox b/doc/utilities.dox
@@ -54,6 +54,7 @@ namespace Magnum {
 -   @subpage magnum-distancefieldconverter --- @copybrief magnum-distancefieldconverter
 -   @subpage magnum-fontconverter --- @copybrief magnum-fontconverter
 -   @subpage magnum-imageconverter --- @copybrief magnum-imageconverter
+-   @subpage magnum-sceneconverter --- @copybrief magnum-sceneconverter
 
 */
 }
diff --git a/modules/FindMagnum.cmake b/modules/FindMagnum.cmake
@@ -91,6 +91,7 @@
 #  distancefieldconverter       - magnum-distancefieldconverter executable
 #  fontconverter                - magnum-fontconverter executable
 #  imageconverter               - magnum-imageconverter executable
+#  sceneconverterter            - magnum-sceneconverter executable
 #  gl-info                      - magnum-gl-info executable
 #  al-info                      - magnum-al-info executable
 #
@@ -357,7 +358,8 @@ set(_MAGNUM_PLUGIN_COMPONENT_LIST
     MagnumFont MagnumFontConverter ObjImporter TgaImageConverter TgaImporter
     WavAudioImporter)
 set(_MAGNUM_EXECUTABLE_COMPONENT_LIST
-    distancefieldconverter fontconverter imageconverter gl-info al-info)
+    distancefieldconverter fontconverter imageconverter sceneconverter gl-info
+    al-info)
 
 # Inter-component dependencies
 set(_MAGNUM_Audio_DEPENDENCIES )

diff --git a/package/archlinux/PKGBUILD b/package/archlinux/PKGBUILD
@@ -48,6 +48,7 @@ build() {
         -DWITH_DISTANCEFIELDCONVERTER=ON \
         -DWITH_FONTCONVERTER=ON \
         -DWITH_IMAGECONVERTER=ON \
+        -DWITH_SCENECONVERTER=ON \
         -DWITH_GL_INFO=ON \
         -DWITH_AL_INFO=ON \
         -DBUILD_TESTS=ON \

diff --git a/package/archlinux/PKGBUILD-clang b/package/archlinux/PKGBUILD-clang
@@ -51,6 +51,7 @@ build() {
         -DWITH_DISTANCEFIELDCONVERTER=ON \
         -DWITH_FONTCONVERTER=ON \
         -DWITH_IMAGECONVERTER=ON \
+        -DWITH_SCENECONVERTER=ON \
         -DWITH_GL_INFO=ON \
         -DWITH_AL_INFO=ON \
         -DBUILD_TESTS=ON \

diff --git a/package/archlinux/PKGBUILD-clang-addressanitizer b/package/archlinux/PKGBUILD-clang-addressanitizer
@@ -52,6 +52,7 @@ build() {
         -DWITH_DISTANCEFIELDCONVERTER=ON \
         -DWITH_FONTCONVERTER=ON \
         -DWITH_IMAGECONVERTER=ON \
+        -DWITH_SCENECONVERTER=ON \
         -DWITH_GL_INFO=ON \
         -DWITH_AL_INFO=ON \
         -DBUILD_TESTS=ON \

diff --git a/package/archlinux/PKGBUILD-clang-analyzer b/package/archlinux/PKGBUILD-clang-analyzer
@@ -43,6 +43,7 @@ build() {
         -DWITH_DISTANCEFIELDCONVERTER=ON \
         -DWITH_FONTCONVERTER=ON \
         -DWITH_IMAGECONVERTER=ON \
+        -DWITH_SCENECONVERTER=ON \
         -DWITH_GL_INFO=ON \
         -DWITH_AL_INFO=ON \
         -DBUILD_TESTS=ON \

diff --git a/package/archlinux/PKGBUILD-clang-libc++ b/package/archlinux/PKGBUILD-clang-libc++
@@ -54,6 +54,7 @@ build() {
         -DWITH_DISTANCEFIELDCONVERTER=ON \
         -DWITH_FONTCONVERTER=ON \
         -DWITH_IMAGECONVERTER=ON \
+        -DWITH_SCENECONVERTER=ON \
         -DWITH_GL_INFO=ON \
         -DWITH_AL_INFO=ON \
         -DBUILD_TESTS=ON \

diff --git a/package/archlinux/PKGBUILD-coverage b/package/archlinux/PKGBUILD-coverage
@@ -49,6 +49,7 @@ build() {
         -DWITH_DISTANCEFIELDCONVERTER=ON \
         -DWITH_FONTCONVERTER=ON \
         -DWITH_IMAGECONVERTER=ON \
+        -DWITH_SCENECONVERTER=ON \
         -DWITH_GL_INFO=ON \
         -DWITH_AL_INFO=ON \
         -DBUILD_TESTS=ON \

diff --git a/package/archlinux/PKGBUILD-es2 b/package/archlinux/PKGBUILD-es2
@@ -38,6 +38,7 @@ build() {
         -DWITH_TGAIMPORTER=ON \
         -DWITH_WAVAUDIOIMPORTER=ON \
         -DWITH_IMAGECONVERTER=ON \
+        -DWITH_SCENECONVERTER=ON \
         -DWITH_GL_INFO=ON \
         -DWITH_AL_INFO=ON \
         -DBUILD_TESTS=ON \

diff --git a/package/archlinux/PKGBUILD-es2desktop b/package/archlinux/PKGBUILD-es2desktop
@@ -42,6 +42,7 @@ build() {
         -DWITH_TGAIMPORTER=ON \
         -DWITH_WAVAUDIOIMPORTER=ON \
         -DWITH_IMAGECONVERTER=ON \
+        -DWITH_SCENECONVERTER=ON \
         -DWITH_GL_INFO=ON \
         -DWITH_AL_INFO=ON \
         -DBUILD_TESTS=ON \

diff --git a/package/archlinux/PKGBUILD-es3 b/package/archlinux/PKGBUILD-es3
@@ -38,6 +38,7 @@ build() {
         -DWITH_TGAIMPORTER=ON \
         -DWITH_WAVAUDIOIMPORTER=ON \
         -DWITH_IMAGECONVERTER=ON \
+        -DWITH_SCENECONVERTER=ON \
         -DWITH_GL_INFO=ON \
         -DWITH_AL_INFO=ON \
         -DBUILD_TESTS=ON \

diff --git a/package/archlinux/PKGBUILD-es3desktop b/package/archlinux/PKGBUILD-es3desktop
@@ -42,6 +42,7 @@ build() {
         -DWITH_TGAIMPORTER=ON \
         -DWITH_WAVAUDIOIMPORTER=ON \
         -DWITH_IMAGECONVERTER=ON \
+        -DWITH_SCENECONVERTER=ON \
         -DWITH_GL_INFO=ON \
         -DWITH_AL_INFO=ON \
         -DBUILD_TESTS=ON \

diff --git a/package/archlinux/PKGBUILD-gcc48 b/package/archlinux/PKGBUILD-gcc48
@@ -54,6 +54,7 @@ build() {
         -DWITH_DISTANCEFIELDCONVERTER=ON \
         -DWITH_FONTCONVERTER=ON \
         -DWITH_IMAGECONVERTER=ON \
+        -DWITH_SCENECONVERTER=ON \
         -DWITH_GL_INFO=ON \
         -DWITH_AL_INFO=ON \
         -DBUILD_TESTS=ON \

diff --git a/package/archlinux/PKGBUILD-mingw-w64 b/package/archlinux/PKGBUILD-mingw-w64
@@ -38,6 +38,7 @@ build() {
         -DWITH_DISTANCEFIELDCONVERTER=ON \
         -DWITH_FONTCONVERTER=ON \
         -DWITH_IMAGECONVERTER=ON \
+        -DWITH_SCENECONVERTER=ON \
         -DWITH_GL_INFO=ON \
         -DWITH_AL_INFO=ON \
         -DBUILD_TESTS=ON \
@@ -66,6 +67,7 @@ build() {
         -DWITH_DISTANCEFIELDCONVERTER=ON \
         -DWITH_FONTCONVERTER=ON \
         -DWITH_IMAGECONVERTER=ON \
+        -DWITH_SCENECONVERTER=ON \
         -DWITH_GL_INFO=ON \
         -DWITH_AL_INFO=ON \
         -DBUILD_TESTS=ON \

diff --git a/package/archlinux/PKGBUILD-release b/package/archlinux/PKGBUILD-release
@@ -43,6 +43,7 @@ build() {
         -DWITH_DISTANCEFIELDCONVERTER=ON \
         -DWITH_FONTCONVERTER=ON \
         -DWITH_IMAGECONVERTER=ON \
+        -DWITH_SCENECONVERTER=ON \
         -DWITH_GL_INFO=ON \
         -DWITH_AL_INFO=ON \
         -DBUILD_TESTS=ON \
@@ -79,6 +80,7 @@ build() {
         -DWITH_DISTANCEFIELDCONVERTER=ON \
         -DWITH_FONTCONVERTER=ON \
         -DWITH_IMAGECONVERTER=ON \
+        -DWITH_SCENECONVERTER=ON \
         -DWITH_GL_INFO=ON \
         -DWITH_AL_INFO=ON \
         -DBUILD_TESTS=ON \

diff --git a/package/archlinux/magnum-git/PKGBUILD b/package/archlinux/magnum-git/PKGBUILD
@@ -46,6 +46,7 @@ build() {
         -DWITH_DISTANCEFIELDCONVERTER=ON \
         -DWITH_FONTCONVERTER=ON \
         -DWITH_IMAGECONVERTER=ON \
+        -DWITH_SCENECONVERTER=ON \
         -DWITH_GL_INFO=ON \
         -DWITH_AL_INFO=ON
     make

diff --git a/package/archlinux/magnum/PKGBUILD b/package/archlinux/magnum/PKGBUILD
@@ -31,6 +31,7 @@ build() {
     -DWITH_GLXAPPLICATION=ON \
     -DWITH_GLXCONTEXT=ON \
     -DWITH_IMAGECONVERTER=ON \
+    -DWITH_SCENECONVERTER=ON \
     -DWITH_MAGNUMFONT=ON \
     -DWITH_MAGNUMFONTCONVERTER=ON \
     -DWITH_OBJIMPORTER=ON \

diff --git a/package/ci/appveyor-desktop-gles.bat b/package/ci/appveyor-desktop-gles.bat
@@ -43,6 +43,7 @@ cmake .. ^
     -DWITH_DISTANCEFIELDCONVERTER=OFF ^
     -DWITH_FONTCONVERTER=OFF ^
     -DWITH_IMAGECONVERTER=ON ^
+    -DWITH_SCENECONVERTER=ON ^
     -DWITH_GL_INFO=ON ^
     -DWITH_AL_INFO=ON ^
     -DBUILD_TESTS=ON ^

diff --git a/package/ci/appveyor-desktop-mingw.bat b/package/ci/appveyor-desktop-mingw.bat
@@ -42,6 +42,7 @@ cmake .. ^
     -DWITH_DISTANCEFIELDCONVERTER=ON ^
     -DWITH_FONTCONVERTER=ON ^
     -DWITH_IMAGECONVERTER=ON ^
+    -DWITH_SCENECONVERTER=ON ^
     -DWITH_GL_INFO=ON ^
     -DWITH_AL_INFO=ON ^
     -DBUILD_TESTS=ON ^

diff --git a/package/ci/appveyor-desktop-vulkan.bat b/package/ci/appveyor-desktop-vulkan.bat
@@ -53,6 +53,7 @@ cmake .. ^
     -DWITH_DISTANCEFIELDCONVERTER=OFF ^
     -DWITH_FONTCONVERTER=OFF ^
     -DWITH_IMAGECONVERTER=OFF ^
+    -DWITH_SCENECONVERTER=OFF ^
     -DWITH_GL_INFO=OFF ^
     -DWITH_AL_INFO=OFF ^
     -DWITH_SDL2APPLICATION=ON ^

diff --git a/package/ci/appveyor-desktop.bat b/package/ci/appveyor-desktop.bat
@@ -55,6 +55,7 @@ cmake .. ^
     -DWITH_DISTANCEFIELDCONVERTER=ON ^
     -DWITH_FONTCONVERTER=ON ^
     -DWITH_IMAGECONVERTER=ON ^
+    -DWITH_SCENECONVERTER=ON ^
     -DWITH_GL_INFO=ON ^
     -DWITH_AL_INFO=ON ^
     -DBUILD_TESTS=ON ^

diff --git a/package/ci/travis-desktop-gles.sh b/package/ci/travis-desktop-gles.sh
@@ -47,6 +47,7 @@ cmake .. \
     -DWITH_DISTANCEFIELDCONVERTER=OFF \
     -DWITH_FONTCONVERTER=OFF \
     -DWITH_IMAGECONVERTER=ON \
+    -DWITH_SCENECONVERTER=ON \
     -DWITH_GL_INFO=ON \
     -DWITH_AL_INFO=ON \
     -DBUILD_TESTS=ON \

diff --git a/package/ci/travis-desktop-vulkan.sh b/package/ci/travis-desktop-vulkan.sh
@@ -57,6 +57,7 @@ cmake .. \
     -DWITH_DISTANCEFIELDCONVERTER=OFF \
     -DWITH_FONTCONVERTER=OFF \
     -DWITH_IMAGECONVERTER=OFF \
+    -DWITH_SCENECONVERTER=OFF \
     -DWITH_SDL2APPLICATION=ON \
     -DWITH_GLFWAPPLICATION=ON \
     -DBUILD_TESTS=ON \

diff --git a/package/ci/travis-desktop.sh b/package/ci/travis-desktop.sh
@@ -43,6 +43,7 @@ cmake .. \
     -DWITH_DISTANCEFIELDCONVERTER=ON \
     -DWITH_FONTCONVERTER=ON \
     -DWITH_IMAGECONVERTER=ON \
+    -DWITH_SCENECONVERTER=ON \
     -DWITH_GL_INFO=ON \
     -DWITH_AL_INFO=ON \
     -DBUILD_TESTS=ON \

diff --git a/package/debian/rules b/package/debian/rules
@@ -35,6 +35,7 @@ override_dh_auto_configure:
 		-DWITH_WAVAUDIOIMPORTER=ON \
 		-DWITH_DISTANCEFIELDCONVERTER=ON \
 		-DWITH_IMAGECONVERTER=ON \
+		-DWITH_SCENECONVERTER=ON \
 		-DWITH_FONTCONVERTER=ON \
 		-DWITH_GL_INFO=ON \
 		-DWITH_AL_INFO=ON

diff --git a/package/gentoo/dev-libs/magnum/magnum-9999.ebuild b/package/gentoo/dev-libs/magnum/magnum-9999.ebuild
@@ -44,6 +44,7 @@ src_configure() {
 		-DWITH_WAVAUDIOIMPORTER=ON
 		-DWITH_DISTANCEFIELDCONVERTER=ON
 		-DWITH_IMAGECONVERTER=ON
+		-DWITH_SCENECONVERTER=ON
 		-DWITH_FONTCONVERTER=ON
 		-DWITH_GL_INFO=ON
 		-DWITH_AL_INFO=ON

diff --git a/package/homebrew/magnum.rb b/package/homebrew/magnum.rb
@@ -14,7 +14,7 @@ class Magnum < Formula
   def install
     system "mkdir build"
     cd "build" do
-      system "cmake", "-DCMAKE_BUILD_TYPE=Release", "-DCMAKE_INSTALL_PREFIX=#{prefix}", "-DMAGNUM_PLUGINS_DIR=#{HOMEBREW_PREFIX}/lib/magnum", "-DWITH_AUDIO=ON", "-DWITH_GLFWAPPLICATION=ON", "-DWITH_SDL2APPLICATION=ON", "-DWITH_WINDOWLESSCGLAPPLICATION=ON", "-DWITH_CGLCONTEXT=ON", "-DWITH_OPENGLTESTER=ON", "-DWITH_ANYAUDIOIMPORTER=ON", "-DWITH_ANYIMAGECONVERTER=ON", "-DWITH_ANYIMAGEIMPORTER=ON", "-DWITH_ANYSCENEIMPORTER=ON", "-DWITH_MAGNUMFONT=ON", "-DWITH_MAGNUMFONTCONVERTER=ON", "-DWITH_OBJIMPORTER=ON", "-DWITH_TGAIMAGECONVERTER=ON", "-DWITH_TGAIMPORTER=ON", "-DWITH_WAVAUDIOIMPORTER=ON", "-DWITH_DISTANCEFIELDCONVERTER=ON", "-DWITH_FONTCONVERTER=ON", "-DWITH_IMAGECONVERTER=ON", "-DWITH_GL_INFO=ON", "-DWITH_AL_INFO=ON", ".."
+      system "cmake", "-DCMAKE_BUILD_TYPE=Release", "-DCMAKE_INSTALL_PREFIX=#{prefix}", "-DMAGNUM_PLUGINS_DIR=#{HOMEBREW_PREFIX}/lib/magnum", "-DWITH_AUDIO=ON", "-DWITH_GLFWAPPLICATION=ON", "-DWITH_SDL2APPLICATION=ON", "-DWITH_WINDOWLESSCGLAPPLICATION=ON", "-DWITH_CGLCONTEXT=ON", "-DWITH_OPENGLTESTER=ON", "-DWITH_ANYAUDIOIMPORTER=ON", "-DWITH_ANYIMAGECONVERTER=ON", "-DWITH_ANYIMAGEIMPORTER=ON", "-DWITH_ANYSCENEIMPORTER=ON", "-DWITH_MAGNUMFONT=ON", "-DWITH_MAGNUMFONTCONVERTER=ON", "-DWITH_OBJIMPORTER=ON", "-DWITH_TGAIMAGECONVERTER=ON", "-DWITH_TGAIMPORTER=ON", "-DWITH_WAVAUDIOIMPORTER=ON", "-DWITH_DISTANCEFIELDCONVERTER=ON", "-DWITH_FONTCONVERTER=ON", "-DWITH_IMAGECONVERTER=ON", "-DWITH_SCENECONVERTER=ON", "-DWITH_GL_INFO=ON", "-DWITH_AL_INFO=ON", ".."
       system "cmake", "--build", "."
       system "cmake", "--build", ".", "--target", "install"
     end

diff --git a/package/msys/PKGBUILD b/package/msys/PKGBUILD
@@ -50,6 +50,7 @@ build() {
             -DWITH_DISTANCEFIELDCONVERTER=ON \
             -DWITH_FONTCONVERTER=ON \
             -DWITH_IMAGECONVERTER=ON \
+            -DWITH_SCENECONVERTER=ON \
             -DWITH_GL_INFO=ON \
             -DWITH_AL_INFO=ON
     ninja

diff --git a/src/Magnum/Trade/CMakeLists.txt b/src/Magnum/Trade/CMakeLists.txt
@@ -149,6 +149,19 @@ if(WITH_IMAGECONVERTER)
     add_executable(Magnum::imageconverter ALIAS magnum-imageconverter)
 endif()
 
+if(WITH_SCENECONVERTER)
+    add_executable(magnum-sceneconverter sceneconverter.cpp)
+    target_link_libraries(magnum-sceneconverter PRIVATE
+        Magnum
+        MagnumTrade)
+    set_target_properties(magnum-sceneconverter PROPERTIES FOLDER "Magnum/Trade")
+
+    install(TARGETS magnum-sceneconverter DESTINATION ${MAGNUM_BINARY_INSTALL_DIR})
+
+    # Magnum sceneconverter target alias for superprojects
+    add_executable(Magnum::sceneconverter ALIAS magnum-sceneconverter)
+endif()
+
 if(BUILD_TESTS)
     # Library with graceful assert for testing
     add_library(MagnumTradeTestLib ${SHARED_OR_STATIC}

diff --git a/src/Magnum/Trade/imageconverter.cpp b/src/Magnum/Trade/imageconverter.cpp
@@ -126,6 +126,8 @@ Extracting raw (uncompressed, compressed) data from a DDS file for manual
 @code{.sh}
 magnum-imageconverter image.dds --converter raw data.dat
 @endcode
+
+@see @ref magnum-sceneconverter
 */
 
 }