UfbxImporter plugin

CMakeLists.txt

@@ -165,6 +165,7 @@ option(MAGNUM_WITH_STLIMPORTER "Build StlImporter plugin" OFF)
 if(MAGNUM_BUILD_DEPRECATED)
     option(MAGNUM_WITH_TINYGLTFIMPORTER "Build TinyGltfImporter plugin" OFF)
 endif()
+option(MAGNUM_WITH_UFBXIMPORTER "Build UfbxImporter plugin" OFF)
 option(MAGNUM_WITH_WEBPIMPORTER "Build WebPImporter plugin" OFF)
 
 option(MAGNUM_BUILD_TESTS "Build unit tests" OFF)

doc/building-plugins.dox

@@ -435,6 +435,8 @@ By default no plugins are built and you need to select them manually:
     @ref Audio::StbVorbisImporter "StbVorbisAudioImporter" plugin.
 -   `MAGNUM_WITH_TINYGLTFIMPORTER` @m_class{m-label m-danger} **deprecated**
     --- Build the @ref Trade::TinyGltfImporter "TinyGltfImporter" plugin.
+-   `MAGNUM_WITH_UFBXIMPORTER` --- Build the
+    @ref Trade::UfbxImporter "UfbxImporter" plugin.
 -   `MAGNUM_WITH_WEBPIMPORTER` --- Build the @relativeref{Trade,WebPImporter}
     plugin.
 

package/ci/android-x86.sh

@@ -146,6 +146,7 @@ cmake .. \
     -DMAGNUM_WITH_STBVORBISAUDIOIMPORTER=OFF \
     -DMAGNUM_WITH_STLIMPORTER=ON \
     -DMAGNUM_WITH_TINYGLTFIMPORTER=ON \
+    -DMAGNUM_WITH_UFBXIMPORTER=ON \
     -DMAGNUM_WITH_WEBPIMPORTER=OFF \
     -DMAGNUM_BUILD_TESTS=ON \
     -DMAGNUM_BUILD_GL_TESTS=ON \

package/ci/appveyor-desktop-mingw.bat

@@ -168,6 +168,7 @@ cmake .. ^
     -DMAGNUM_WITH_STBVORBISAUDIOIMPORTER=ON ^
     -DMAGNUM_WITH_STLIMPORTER=ON ^
     -DMAGNUM_WITH_TINYGLTFIMPORTER=ON ^
+    -DMAGNUM_WITH_UFBXIMPORTER=ON ^
     -DMAGNUM_WITH_WEBPIMPORTER=OFF ^
     -DMAGNUM_BUILD_TESTS=ON ^
     -DMAGNUM_BUILD_GL_TESTS=ON ^

package/ci/appveyor-desktop.bat

@@ -147,6 +147,7 @@ cmake .. ^
     -DMAGNUM_WITH_STBVORBISAUDIOIMPORTER=ON ^
     -DMAGNUM_WITH_STLIMPORTER=ON ^
     -DMAGNUM_WITH_TINYGLTFIMPORTER=ON ^
+    -DMAGNUM_WITH_UFBXIMPORTER=ON ^
     -DMAGNUM_WITH_WEBPIMPORTER=ON ^
     -DMAGNUM_BUILD_TESTS=ON ^
     -DMAGNUM_BUILD_GL_TESTS=ON ^

package/ci/appveyor-rt.bat

@@ -106,6 +106,7 @@ cmake .. ^
     -DMAGNUM_WITH_STBVORBISAUDIOIMPORTER=OFF ^
     -DMAGNUM_WITH_STLIMPORTER=ON ^
     -DMAGNUM_WITH_TINYGLTFIMPORTER=ON ^
+    -DMAGNUM_WITH_UFBXIMPORTER=ON ^
     -DMAGNUM_WITH_WEBPIMPORTER=OFF ^
     -DMAGNUM_BUILD_STATIC=ON ^
     -G "%GENERATOR%" -A x64 || exit /b

package/ci/emscripten.sh

@@ -147,6 +147,7 @@ cmake .. \
     -DMAGNUM_WITH_STBVORBISAUDIOIMPORTER=ON \
     -DMAGNUM_WITH_STLIMPORTER=ON \
     -DMAGNUM_WITH_TINYGLTFIMPORTER=ON \
+    -DMAGNUM_WITH_UFBXIMPORTER=ON \
     -DMAGNUM_WITH_WEBPIMPORTER=OFF \
     -DMAGNUM_BUILD_TESTS=ON \
     -DMAGNUM_BUILD_GL_TESTS=ON \

package/ci/ios-simulator.sh

@@ -133,6 +133,7 @@ cmake .. \
     -DMAGNUM_WITH_STBVORBISAUDIOIMPORTER=ON \
     -DMAGNUM_WITH_STLIMPORTER=ON \
     -DMAGNUM_WITH_TINYGLTFIMPORTER=ON \
+    -DMAGNUM_WITH_UFBXIMPORTER=ON \
     -DMAGNUM_WITH_WEBPIMPORTER=OFF \
     -DMAGNUM_BUILD_STATIC=ON \
     -DMAGNUM_BUILD_TESTS=ON \

package/ci/unix-desktop.sh

@@ -95,6 +95,7 @@ cmake .. \
     -DMAGNUM_WITH_STBVORBISAUDIOIMPORTER=ON \
     -DMAGNUM_WITH_STLIMPORTER=ON \
     -DMAGNUM_WITH_TINYGLTFIMPORTER=$BUILD_DEPRECATED \
+    -DMAGNUM_WITH_UFBXIMPORTER=ON \
     -DMAGNUM_WITH_WEBPIMPORTER=ON \
     -DMAGNUM_BUILD_TESTS=ON \
     -DMAGNUM_BUILD_GL_TESTS=ON \

src/MagnumPlugins/CMakeLists.txt

@@ -209,6 +209,10 @@ if(MAGNUM_BUILD_DEPRECATED AND MAGNUM_WITH_TINYGLTFIMPORTER)
     add_subdirectory(TinyGltfImporter)
 endif()
 
+if(MAGNUM_WITH_UFBXIMPORTER)
+    add_subdirectory(UfbxImporter)
+endif()
+
 if(MAGNUM_WITH_WEBPIMPORTER)
     add_subdirectory(WebPImporter)
 endif()

src/MagnumPlugins/UfbxImporter/CMakeLists.txt

@@ -0,0 +1,74 @@
+#
+#   This file is part of Magnum.
+#
+#   Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019,
+#               2020, 2021, 2022 Vladimír Vondruš <mosra@centrum.cz>
+#   Copyright © 2022 Samuli Raivio <bqqbarbhg@gmail.com>
+#
+#   Permission is hereby granted, free of charge, to any person obtaining a
+#   copy of this software and associated documentation files (the "Software"),
+#   to deal in the Software without restriction, including without limitation
+#   the rights to use, copy, modify, merge, publish, distribute, sublicense,
+#   and/or sell copies of the Software, and to permit persons to whom the
+#   Software is furnished to do so, subject to the following conditions:
+#
+#   The above copyright notice and this permission notice shall be included
+#   in all copies or substantial portions of the Software.
+#
+#   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+#   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+#   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+#   THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+#   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+#   FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+#   DEALINGS IN THE SOFTWARE.
+#
+
+find_package(Magnum REQUIRED Trade MeshTools AnyImageImporter)
+
+if(MAGNUM_BUILD_PLUGINS_STATIC AND NOT DEFINED MAGNUM_UFBXIMPORTER_BUILD_STATIC)
+    set(MAGNUM_UFBXIMPORTER_BUILD_STATIC 1)
+endif()
+
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/configure.h.cmake
+               ${CMAKE_CURRENT_BINARY_DIR}/configure.h)
+
+# UfbxImporter plugin
+add_plugin(UfbxImporter
+    importers
+    "${MAGNUM_PLUGINS_IMPORTER_DEBUG_BINARY_INSTALL_DIR};${MAGNUM_PLUGINS_IMPORTER_DEBUG_LIBRARY_INSTALL_DIR}"
+    "${MAGNUM_PLUGINS_IMPORTER_RELEASE_BINARY_INSTALL_DIR};${MAGNUM_PLUGINS_IMPORTER_RELEASE_LIBRARY_INSTALL_DIR}"
+    UfbxImporter.conf
+    UfbxImporter.cpp
+    UfbxImporter.h)
+if(MAGNUM_UFBXIMPORTER_BUILD_STATIC AND MAGNUM_BUILD_STATIC_PIC)
+    set_target_properties(UfbxImporter PROPERTIES POSITION_INDEPENDENT_CODE ON)
+endif()
+target_include_directories(UfbxImporter PUBLIC
+    ${PROJECT_SOURCE_DIR}/src
+    ${PROJECT_BINARY_DIR}/src)
+
+# Include the ufbx files as a system directory to supress warnings
+target_include_directories(UfbxImporter PRIVATE ${PROJECT_SOURCE_DIR}/src/external/ufbx)
+target_link_libraries(UfbxImporter PUBLIC Magnum::Trade Magnum::MeshTools)
+if(CORRADE_TARGET_WINDOWS)
+    target_link_libraries(UfbxImporter PUBLIC Magnum::AnyImageImporter)
+elseif(MAGNUM_UFBXIMPORTER_BUILD_STATIC)
+    target_link_libraries(UfbxImporter INTERFACE Magnum::AnyImageImporter)
+endif()
+
+install(FILES UfbxImporter.h ${CMAKE_CURRENT_BINARY_DIR}/configure.h
+    DESTINATION ${MAGNUM_PLUGINS_INCLUDE_INSTALL_DIR}/UfbxImporter)
+
+# Automatic static plugin import
+if(MAGNUM_UFBXIMPORTER_BUILD_STATIC)
+    install(FILES importStaticPlugin.cpp DESTINATION ${MAGNUM_PLUGINS_INCLUDE_INSTALL_DIR}/UfbxImporter)
+    target_sources(UfbxImporter INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/importStaticPlugin.cpp)
+endif()
+
+if(MAGNUM_BUILD_TESTS)
+    add_subdirectory(Test ${EXCLUDE_FROM_ALL_IF_TEST_TARGET})
+endif()
+
+# MagnumPlugins UfbxImporter target alias for superprojects
+add_library(MagnumPlugins::UfbxImporter ALIAS UfbxImporter)

src/MagnumPlugins/UfbxImporter/Test/.gitattributes

@@ -0,0 +1,12 @@
+# You have to add the following to your .git/config or global
+# ~/.gitconfig to make the binary diffs work (without the comment
+# character, of course):
+#
+# [diff "hex"]
+#     textconv = hexdump -v -C
+#     binary = true
+#
+
+*.fbx binary diff=hex
+*.png binary diff=hex
+*.dds binary diff=hex

src/MagnumPlugins/UfbxImporter/Test/CMakeLists.txt

@@ -0,0 +1,130 @@
+#
+#   This file is part of Magnum.
+#
+#   Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019,
+#               2020, 2021, 2022 Vladimír Vondruš <mosra@centrum.cz>
+#   Copyright © 2022 Samuli Raivio <bqqbarbhg@gmail.com>
+#
+#   Permission is hereby granted, free of charge, to any person obtaining a
+#   copy of this software and associated documentation files (the "Software"),
+#   to deal in the Software without restriction, including without limitation
+#   the rights to use, copy, modify, merge, publish, distribute, sublicense,
+#   and/or sell copies of the Software, and to permit persons to whom the
+#   Software is furnished to do so, subject to the following conditions:
+#
+#   The above copyright notice and this permission notice shall be included
+#   in all copies or substantial portions of the Software.
+#
+#   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+#   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+#   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+#   THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+#   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+#   FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+#   DEALINGS IN THE SOFTWARE.
+#
+
+# IDE folder in VS, Xcode etc. CMake 3.12+, older versions have only the FOLDER
+# property that would have to be set on each target separately.
+set(CMAKE_FOLDER "MagnumPlugins/UfbxImporter/Test")
+
+if(CORRADE_TARGET_EMSCRIPTEN OR CORRADE_TARGET_ANDROID)
+    set(UFBXIMPORTER_TEST_DIR ".")
+else()
+    set(UFBXIMPORTER_TEST_DIR ${CMAKE_CURRENT_SOURCE_DIR})
+endif()
+
+find_package(Magnum REQUIRED DebugTools)
+
+if(NOT MAGNUM_UFBXIMPORTER_BUILD_STATIC)
+    if(MAGNUM_WITH_DDSIMPORTER)
+        set(DDSIMPORTER_PLUGIN_FILENAME $<TARGET_FILE:DdsImporter>)
+    endif()
+    if(MAGNUM_WITH_STBIMAGEIMPORTER)
+        set(STBIMAGEIMPORTER_PLUGIN_FILENAME $<TARGET_FILE:StbImageImporter>)
+    endif()
+endif()
+
+if(NOT MAGNUM_UFBXIMPORTER_BUILD_STATIC)
+    set(UFBXIMPORTER_PLUGIN_FILENAME $<TARGET_FILE:UfbxImporter>)
+endif()
+
+# First replace ${} variables, then $<> generator expressions
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/configure.h.cmake
+               ${CMAKE_CURRENT_BINARY_DIR}/configure.h.in)
+file(GENERATE OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/configure.h
+    INPUT ${CMAKE_CURRENT_BINARY_DIR}/configure.h.in)
+
+corrade_add_test(UfbxImporterTest UfbxImporterTest.cpp
+    LIBRARIES
+        Magnum::DebugTools
+        Magnum::Trade
+    FILES
+        blender-default.fbx
+        blender-materials.fbx
+        instanced-material.fbx
+        maya-material-arnold.fbx
+        maya-material-phong.fbx
+        max-material-physical.fbx
+        max-material-spec-gloss.fbx
+        layered-pbr-textures.fbx
+        geometric-transform.fbx
+        texture-transform.fbx
+        texture-wrap-modes.fbx
+        mesh-point-line.fbx
+        triangle.fbx
+        cameras.fbx
+        lights.fbx
+        bad-decay-lights.fbx
+        image-absolute-path.fbx
+        image-broken-external.fbx
+        image-broken-embedded.fbx
+        units-cm-z-up.fbx
+        maya-camera-light-orientation.fbx
+        geometry-cache.fbx
+        static-skin.fbx
+        warning-cube.fbx
+        cube.obj
+        cube.mtl
+        missing-mtl.obj
+        image-3d.obj
+        image-3d.mtl
+        image-3d.dds
+        tex-black.png
+        tex-blue.png
+        tex-cyan.png
+        tex-green.png
+        tex-pink.png
+        tex-red.png
+        tex-white.png
+        tex-yellow.png
+        tex-broken.png)
+
+
+target_include_directories(UfbxImporterTest PRIVATE ${PROJECT_SOURCE_DIR}/src/external/ufbx)
+target_include_directories(UfbxImporterTest PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>)
+if(MAGNUM_UFBXIMPORTER_BUILD_STATIC)
+    target_link_libraries(UfbxImporterTest PRIVATE UfbxImporter)
+    if(MAGNUM_WITH_DDSIMPORTER)
+        target_link_libraries(UfbxImporterTest PRIVATE DdsImporter)
+    endif()
+    if(MAGNUM_WITH_STBIMAGEIMPORTER)
+        target_link_libraries(UfbxImporterTest PRIVATE StbImageImporter)
+    endif()
+else()
+    # So the plugins get properly built when building the test
+    add_dependencies(UfbxImporterTest UfbxImporter)
+    if(MAGNUM_WITH_DDSIMPORTER)
+        add_dependencies(UfbxImporterTest DdsImporter)
+    endif()
+    if(MAGNUM_WITH_STBIMAGEIMPORTER)
+        add_dependencies(UfbxImporterTest StbImageImporter)
+    endif()
+endif()
+if(CORRADE_BUILD_STATIC AND NOT MAGNUM_UFBXIMPORTER_BUILD_STATIC)
+    # CMake < 3.4 does this implicitly, but 3.4+ not anymore (see CMP0065).
+    # That's generally okay, *except if* the build is static, the executable
+    # uses a plugin manager and needs to share globals with the plugins (such
+    # as output redirection and so on).
+    set_target_properties(UfbxImporterTest PROPERTIES ENABLE_EXPORTS ON)
+endif()