mosra · mosra · Oct 7, 2018 · Oct 2, 2018 · Jul 27, 2018 · Aug 3, 2018
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -64,7 +64,8 @@ cmake_dependent_option(BUILD_GL_TESTS "Build unit tests for OpenGL code" OFF "BU
 option(BUILD_STATIC "Build static libraries (default are dynamic)" OFF)
 cmake_dependent_option(BUILD_STATIC_PIC "Build static libraries with position-independent code" ON "BUILD_STATIC" OFF)
 
-option(WITH_UI "Build Ui library" OFF)
+option(WITH_PLAYER "Build the magnum-player application" OFF)
+cmake_dependent_option(WITH_UI "Build Ui library" OFF "WITH_PLAYER" ON)
 cmake_dependent_option(WITH_UI_GALLERY "Build magnum-ui-gallery executable" OFF "WITH_UI" OFF)
 
 # Dynamic linking is meaningless on Emscripten and too inconvenient on Android

diff --git a/doc/building-extras.dox b/doc/building-extras.dox
@@ -245,10 +245,12 @@ By default no libraries are built and you need to select them manually:
 
 -   `WITH_UI` --- Build the @ref Ui library. Does not work on
     @ref MAGNUM_TARGET_GLES2 "OpenGL ES 2.0" / WebGL 1.0 builds of Magnum.
+    Enabled automatically if `WITH_PLAYER` is enabled.
 
 Besides libraries, the following apps are available, also all disabled by
 default:
 
+-   `WITH_PLAYER` -- Build the @ref magnum-player "magnum-player" executable
 -   `WITH_UI_GALLERY` --- Build the @ref magnum-ui-gallery "magnum-ui-gallery"
     executable
 

diff --git a/doc/changelog-extras.dox b/doc/changelog-extras.dox
@@ -34,6 +34,8 @@ namespace Magnum {
 
 @subsection changelog-extras-latest-new New features
 
+-   New @ref magnum-player "magnum-player" app for previewing, playing back and
+    inspecting animated scene files
 -   Rudimentary support for user interface relayouting using
     @ref Ui::UserInterface::relayout()
 

diff --git a/doc/cmake-extras.dox b/doc/cmake-extras.dox
@@ -60,6 +60,7 @@ This command alone is useless without specifying the components:
 
 Besides libraries, the following apps are available:
 
+-   `player` --- @ref magnum-player "magnum-player" executable
 -   `ui-gallery` --- @ref magnum-ui-gallery "magnum-ui-gallery" executable
 
 Note that [each namespace](namespaces.html) contains more detailed information

diff --git a/doc/player.dox b/doc/player.dox
@@ -0,0 +1,97 @@
+/*
+    This file is part of Magnum.
+
+    Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018
+              Vladimír Vondruš <[email protected]>
+
+    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.
+*/
+
+namespace Magnum {
+
+/** @page magnum-player Magnum Player
+@brief Advanced app for loading and playing back scene files
+
+@m_footernavigation
+@m_keywords{magnum-player player}
+
+@image html player.jpg width=400px
+
+@m_div{m-button m-primary} <a href="http://magnum.graphics/showcase/player/">@m_div{m-big}Live web version @m_enddiv @m_div{m-small} uses WebAssembly & WebGL @m_enddiv </a> @m_enddiv
+
+This app is built if `WITH_PLAYER` is enabled when building Magnum Extras. To
+use this app with CMake, you need to request the `player` component of the
+`MagnumExtras` package and use the `MagnumExtras::player` target for example in
+a custom command:
+
+@code{.cmake}
+find_package(MagnumExtras REQUIRED player)
+
+add_custom_command(OUTPUT ... COMMAND MagnumExtras::player ...)
+@endcode
+
+@section magnum-player-controls Controls
+
+-   @m_class{m-label m-default} **Space** plays or pauses the animation
+-   @m_class{m-label m-default} **arrow keys** seek the animation forward or
+    backward
+-   @m_class{m-label m-default} **mouse drag** rotates the scene around the
+    cursor
+-   @m_class{m-label m-warning} **Shift** @m_class{m-label m-default} **mouse
+    drag** pans the scene at depth of the cursor
+-   @m_class{m-label m-default} **mouse wheel** zooms in/out relative to cursor
+    position
+-   @m_class{m-label m-default} **Num 1** / @m_class{m-label m-warning} **Ctrl**
+    @m_class{m-label m-default} **Num 1** switches to a front / back view
+-   @m_class{m-label m-default} **Num 3** / @m_class{m-label m-warning} **Ctrl**
+    @m_class{m-label m-default} **Num 3** switches to a right / left view
+-   @m_class{m-label m-default} **Num 7** / @m_class{m-label m-warning} **Ctrl**
+    @m_class{m-label m-default} **Num 7** switches to a top / bottom view
+-   @m_class{m-label m-default} **Num 0** resets the camera back to the
+    original view
+
+@section magnum-player-usage Usage
+
+@code{.sh}
+magnum-player [--magnum-...] [-h|--help] [--importer IMPORTER] \
+    [--no-merge-animations] [--msaa N] [--] file
+@endcode
+
+Arguments:
+
+-   `file` --- file to load
+-   `-h`, `--help` --- display this help message and exit
+-   `--importer IMPORTER` --- importer plugin to use (default:
+    @ref Trade::TinyGltfImporter "TinyGltfImporter")
+-   `--no-merge-animations` --- don't merge glTF animations into a single clip
+-   `--msaa N` --- MSAA level to use (if not set, defaults to 8x or 2x for
+    HiDPI)
+-   `--magnum-...` --- engine-specific options (see
+    @ref GL-Context-command-line for details)
+
+@section magnum-player-credits Credits
+
+The screenshot was made using the
+[Littlest Tokyo](https://sketchfab.com/models/94b24a60dc1b48248de50bf087c0f042)
+model by [Glen Fox](https://www.artstation.com/glenatron), licensed under the
+CC 4.0 Attribution license.
+
+*/
+
+}
diff --git a/doc/player.jpg b/doc/player.jpg
diff --git a/doc/ui-gallery.png b/doc/ui-gallery.png
diff --git a/modules/FindMagnumExtras.cmake b/modules/FindMagnumExtras.cmake
@@ -14,6 +14,7 @@
 #
 #  Ui                       - Ui library
 #  ui-gallery               - magnum-ui-gallery executable
+#  player                   - magnum-player executable
 #
 # Example usage with specifying additional components is:
 #
@@ -94,7 +95,7 @@ mark_as_advanced(MAGNUMEXTRAS_INCLUDE_DIR)
 # Component distinction (listing them explicitly to avoid mistakes with finding
 # components from other repositories)
 set(_MAGNUMEXTRAS_LIBRARY_COMPONENT_LIST Ui)
-set(_MAGNUMEXTRAS_EXECUTABLE_COMPONENT_LIST ui-gallery)
+set(_MAGNUMEXTRAS_EXECUTABLE_COMPONENT_LIST player ui-gallery)
 
 # Inter-component dependencies
 set(_MAGNUMEXTRAS_ui-gallery_DEPENDENCIES Ui)

diff --git a/package/archlinux/PKGBUILD b/package/archlinux/PKGBUILD
@@ -22,6 +22,7 @@ build() {
         -DCMAKE_INSTALL_PREFIX=/usr \
         -DBUILD_TESTS=ON \
         -DBUILD_GL_TESTS=ON \
+        -DWITH_PLAYER=ON \
         -DWITH_UI=ON \
         -DWITH_UI_GALLERY=ON \
         -G Ninja

diff --git a/package/archlinux/PKGBUILD-android-arm64 b/package/archlinux/PKGBUILD-android-arm64
@@ -32,7 +32,9 @@ build() {
         -DCMAKE_BUILD_TYPE=Release \
         -DCMAKE_INSTALL_PREFIX=/opt/android-ndk/platforms/android-22/arch-arm64/usr \
         -DMAGNUM_INCLUDE_INSTALL_PREFIX=/opt/android-ndk/sysroot/usr \
+        -DWITH_PLAYER=OFF \
         -DWITH_UI=ON \
+        -DWITH_UI_GALLERY=OFF \
         -DBUILD_TESTS=ON \
         -DBUILD_GL_TESTS=ON
     ninja

diff --git a/package/archlinux/PKGBUILD-coverage b/package/archlinux/PKGBUILD-coverage
@@ -23,6 +23,7 @@ build() {
         -DCMAKE_INSTALL_PREFIX=/usr \
         -DBUILD_TESTS=ON \
         -DBUILD_GL_TESTS=ON \
+        -DWITH_PLAYER=ON \
         -DWITH_UI=ON \
         -DWITH_UI_GALLERY=ON \
         -G Ninja

diff --git a/package/archlinux/PKGBUILD-emscripten b/package/archlinux/PKGBUILD-emscripten
@@ -29,6 +29,7 @@ build() {
         -DCMAKE_BUILD_TYPE=Release \
         -DCMAKE_INSTALL_PREFIX=/usr/lib/emscripten/system \
         -DMAGNUM_DEPLOY_PREFIX=/srv/http/emscripten \
+        -DWITH_PLAYER=OFF \
         -DWITH_UI=OFF \
         -DWITH_UI_GALLERY=OFF \
         -DBUILD_TESTS=OFF

diff --git a/package/archlinux/PKGBUILD-emscripten-wasm-webgl2 b/package/archlinux/PKGBUILD-emscripten-wasm-webgl2
@@ -29,6 +29,7 @@ build() {
         -DCMAKE_BUILD_TYPE=Release \
         -DCMAKE_INSTALL_PREFIX=/usr/lib/emscripten/system \
         -DMAGNUM_DEPLOY_PREFIX=/srv/http/emscripten-webgl2 \
+        -DWITH_PLAYER=ON \
         -DWITH_UI=ON \
         -DWITH_UI_GALLERY=ON \
         -DBUILD_TESTS=OFF

diff --git a/package/archlinux/PKGBUILD-emscripten-webgl2 b/package/archlinux/PKGBUILD-emscripten-webgl2
@@ -29,6 +29,7 @@ build() {
         -DCMAKE_BUILD_TYPE=Release \
         -DCMAKE_INSTALL_PREFIX=/usr/lib/emscripten/system \
         -DMAGNUM_DEPLOY_PREFIX=/srv/http/emscripten \
+        -DWITH_PLAYER=ON \
         -DWITH_UI=ON \
         -DWITH_UI_GALLERY=ON \
         -DBUILD_TESTS=OFF

diff --git a/package/archlinux/PKGBUILD-mingw-w64 b/package/archlinux/PKGBUILD-mingw-w64
@@ -36,6 +36,7 @@ build() {
         -DCMAKE_INSTALL_PREFIX=/usr/x86_64-w64-mingw32 \
         -DBUILD_TESTS=ON \
         -DBUILD_GL_TESTS=ON \
+        -DWITH_PLAYER=ON \
         -DWITH_UI=ON \
         -DWITH_UI_GALLERY=ON \
         -G Ninja

diff --git a/package/ci/appveyor-desktop-gles.bat b/package/ci/appveyor-desktop-gles.bat
@@ -29,10 +29,10 @@ cmake .. ^
     -DTARGET_DESKTOP_GLES=ON ^
     -DWITH_AUDIO=OFF ^
     -DWITH_DEBUGTOOLS=OFF ^
-    -DWITH_MESHTOOLS=OFF ^
+    -DWITH_MESHTOOLS=ON ^
     -DWITH_PRIMITIVES=OFF ^
-    -DWITH_SCENEGRAPH=OFF ^
-    -DWITH_SHADERS=OFF ^
+    -DWITH_SCENEGRAPH=ON ^
+    -DWITH_SHADERS=ON ^
     -DWITH_SHAPES=OFF ^
     -DWITH_TEXT=%TARGET_GLES3% ^
     -DWITH_TEXTURETOOLS=%TARGET_GLES3% ^
@@ -50,6 +50,7 @@ cmake .. ^
     -DCMAKE_BUILD_TYPE=Debug ^
     -DCMAKE_INSTALL_PREFIX=%APPVEYOR_BUILD_FOLDER%/deps ^
     -DCMAKE_PREFIX_PATH=%APPVEYOR_BUILD_FOLDER%/SDL ^
+    -DWITH_PLAYER=%TARGET_GLES3% ^
     -DWITH_UI=%TARGET_GLES3% ^
     -DWITH_UI_GALLERY=%TARGET_GLES3% ^
     -DBUILD_TESTS=ON ^

diff --git a/package/ci/appveyor-desktop-mingw.bat b/package/ci/appveyor-desktop-mingw.bat
@@ -28,10 +28,10 @@ cmake .. ^
     -DCMAKE_PREFIX_PATH=%APPVEYOR_BUILD_FOLDER%/SDL ^
     -DWITH_AUDIO=OFF ^
     -DWITH_DEBUGTOOLS=OFF ^
-    -DWITH_MESHTOOLS=OFF ^
+    -DWITH_MESHTOOLS=ON ^
     -DWITH_PRIMITIVES=OFF ^
-    -DWITH_SCENEGRAPH=OFF ^
-    -DWITH_SHADERS=OFF ^
+    -DWITH_SCENEGRAPH=ON ^
+    -DWITH_SHADERS=ON ^
     -DWITH_SHAPES=OFF ^
     -DWITH_TEXT=ON ^
     -DWITH_TEXTURETOOLS=ON ^
@@ -50,6 +50,7 @@ cmake .. ^
     -DCMAKE_BUILD_TYPE=Debug ^
     -DCMAKE_INSTALL_PREFIX=%APPVEYOR_BUILD_FOLDER%/deps ^
     -DCMAKE_PREFIX_PATH=%APPVEYOR_BUILD_FOLDER%/SDL ^
+    -DWITH_PLAYER=ON ^
     -DWITH_UI=ON ^
     -DWITH_UI_GALLERY=ON ^
     -DBUILD_TESTS=ON ^

diff --git a/package/ci/appveyor-desktop.bat b/package/ci/appveyor-desktop.bat
@@ -26,10 +26,10 @@ cmake .. ^
     -DCMAKE_PREFIX_PATH=%APPVEYOR_BUILD_FOLDER%/SDL ^
     -DWITH_AUDIO=OFF ^
     -DWITH_DEBUGTOOLS=OFF ^
-    -DWITH_MESHTOOLS=OFF ^
+    -DWITH_MESHTOOLS=ON ^
     -DWITH_PRIMITIVES=OFF ^
-    -DWITH_SCENEGRAPH=OFF ^
-    -DWITH_SHADERS=OFF ^
+    -DWITH_SCENEGRAPH=ON ^
+    -DWITH_SHADERS=ON ^
     -DWITH_SHAPES=OFF ^
     -DWITH_TEXT=ON ^
     -DWITH_TEXTURETOOLS=ON ^
@@ -47,6 +47,7 @@ cmake .. ^
     -DCMAKE_BUILD_TYPE=Debug ^
     -DCMAKE_INSTALL_PREFIX=%APPVEYOR_BUILD_FOLDER%/deps ^
     -DCMAKE_PREFIX_PATH=%APPVEYOR_BUILD_FOLDER%/SDL ^
+    -DWITH_PLAYER=ON ^
     -DWITH_UI=ON ^
     -DWITH_UI_GALLERY=ON ^
     -DBUILD_TESTS=ON ^

diff --git a/package/ci/appveyor-rt.bat b/package/ci/appveyor-rt.bat
@@ -80,6 +80,7 @@ cmake .. ^
     -DOPENGLES3_LIBRARY=%APPVEYOR_BUILD_FOLDER%/angle/winrt/10/src/Release_x64/lib/libGLESv2.lib ^
     -DOPENGLES3_INCLUDE_DIR=%APPVEYOR_BUILD_FOLDER%/angle/include ^
     -DBUILD_STATIC=ON ^
+    -DWITH_PLAYER=OFF ^
     -DWITH_UI=%TARGET_GLES3% ^
     -DWITH_UI_GALLERY=OFF ^
     -G "%GENERATOR%" -A x64 || exit /b

diff --git a/package/ci/travis-android-arm.sh b/package/ci/travis-android-arm.sh
@@ -79,6 +79,7 @@ cmake .. \
     -DCORRADE_RC_EXECUTABLE=$HOME/deps-native/bin/corrade-rc \
     -DCMAKE_INSTALL_PREFIX=$HOME/deps \
     -DCMAKE_FIND_ROOT_PATH=$HOME/deps \
+    -DWITH_PLAYER=OFF \
     -DWITH_UI=$TARGET_GLES3 \
     -DWITH_UI_GALLERY=OFF \
     -DBUILD_TESTS=ON \

diff --git a/package/ci/travis-desktop-gles.sh b/package/ci/travis-desktop-gles.sh
@@ -30,10 +30,10 @@ cmake .. \
     -DTARGET_DESKTOP_GLES=ON \
     -DWITH_AUDIO=OFF \
     -DWITH_DEBUGTOOLS=OFF \
-    -DWITH_MESHTOOLS=OFF \
+    -DWITH_MESHTOOLS=ON \
     -DWITH_PRIMITIVES=OFF \
-    -DWITH_SCENEGRAPH=OFF \
-    -DWITH_SHADERS=OFF \
+    -DWITH_SCENEGRAPH=ON \
+    -DWITH_SHADERS=ON \
     -DWITH_SHAPES=OFF \
     -DWITH_TEXT=$TARGET_GLES3 \
     -DWITH_TEXTURETOOLS=$TARGET_GLES3 \
@@ -52,6 +52,7 @@ cmake .. \
     -DCMAKE_INSTALL_PREFIX=$HOME/deps \
     -DCMAKE_INSTALL_RPATH=$HOME/deps/lib \
     -DCMAKE_BUILD_TYPE=Debug \
+    -DWITH_PLAYER=$TARGET_GLES3 \
     -DWITH_UI=$TARGET_GLES3 \
     -DWITH_UI_GALLERY=$TARGET_GLES3 \
     -DBUILD_TESTS=ON \

diff --git a/package/ci/travis-desktop.sh b/package/ci/travis-desktop.sh
@@ -28,10 +28,10 @@ cmake .. \
     -DCMAKE_BUILD_TYPE=Debug \
     -DWITH_AUDIO=OFF \
     -DWITH_DEBUGTOOLS=OFF \
-    -DWITH_MESHTOOLS=OFF \
+    -DWITH_MESHTOOLS=ON \
     -DWITH_PRIMITIVES=OFF \
-    -DWITH_SCENEGRAPH=OFF \
-    -DWITH_SHADERS=OFF \
+    -DWITH_SCENEGRAPH=ON \
+    -DWITH_SHADERS=ON \
     -DWITH_SHAPES=OFF \
     -DWITH_TEXT=ON \
     -DWITH_TEXTURETOOLS=ON \
@@ -50,6 +50,7 @@ cmake .. \
     -DCMAKE_INSTALL_PREFIX=$HOME/deps \
     -DCMAKE_INSTALL_RPATH=$HOME/deps/lib \
     -DCMAKE_BUILD_TYPE=Debug \
+    -DWITH_PLAYER=ON \
     -DWITH_UI=ON \
     -DWITH_UI_GALLERY=ON \
     -DBUILD_TESTS=ON \

diff --git a/package/ci/travis-emscripten.sh b/package/ci/travis-emscripten.sh
@@ -49,14 +49,15 @@ cmake .. \
     -DCMAKE_FIND_ROOT_PATH=$HOME/deps \
     -DWITH_AUDIO=OFF \
     -DWITH_DEBUGTOOLS=OFF \
-    -DWITH_MESHTOOLS=OFF \
+    -DWITH_MESHTOOLS=ON \
     -DWITH_PRIMITIVES=OFF \
-    -DWITH_SCENEGRAPH=OFF \
-    -DWITH_SHADERS=OFF \
+    -DWITH_SCENEGRAPH=ON \
+    -DWITH_SHADERS=ON \
     -DWITH_SHAPES=OFF \
     -DWITH_TEXT=$TARGET_GLES3 \
     -DWITH_TEXTURETOOLS=$TARGET_GLES3 \
     -DWITH_SDL2APPLICATION=$TARGET_GLES3 \
+    -DWITH_ANYIMAGEIMPORTER=$TARGET_GLES3 \
     -DTARGET_GLES2=$TARGET_GLES2 \
     -G Ninja
 ninja install
@@ -76,6 +77,8 @@ cmake .. \
     -DCMAKE_INSTALL_PREFIX=$HOME/deps \
     -DCMAKE_FIND_ROOT_PATH=$HOME/deps \
     -DWITH_STBTRUETYPEFONT=$TARGET_GLES3 \
+    -DWITH_STBIMAGEIMPORTER=$TARGET_GLES3 \
+    -DWITH_TINYGLTFIMPORTER=$TARGET_GLES3 \
     -G Ninja
 ninja install
 cd ../..
@@ -91,6 +94,7 @@ cmake .. \
     -DCMAKE_EXE_LINKER_FLAGS_RELEASE="-O1" \
     -DCMAKE_INSTALL_PREFIX=$HOME/deps \
     -DCMAKE_FIND_ROOT_PATH=$HOME/deps \
+    -DWITH_PLAYER=$TARGET_GLES3 \
     -DWITH_UI=$TARGET_GLES3 \
     -DWITH_UI_GALLERY=$TARGET_GLES3 \
     -DBUILD_TESTS=ON \

diff --git a/package/ci/travis-ios-simulator.sh b/package/ci/travis-ios-simulator.sh
@@ -48,10 +48,10 @@ cmake .. \
     -DCMAKE_PREFIX_PATH=$TRAVIS_BUILD_DIR/sdl2 \
     -DWITH_AUDIO=OFF \
     -DWITH_DEBUGTOOLS=OFF \
-    -DWITH_MESHTOOLS=OFF \
+    -DWITH_MESHTOOLS=ON \
     -DWITH_PRIMITIVES=OFF \
-    -DWITH_SCENEGRAPH=OFF \
-    -DWITH_SHADERS=OFF \
+    -DWITH_SCENEGRAPH=ON \
+    -DWITH_SHADERS=ON \
     -DWITH_SHAPES=OFF \
     -DWITH_TEXT=$TARGET_GLES3 \
     -DWITH_TEXTURETOOLS=$TARGET_GLES3 \
@@ -90,6 +90,7 @@ cmake .. \
     -DCORRADE_RC_EXECUTABLE=$HOME/deps-native/bin/corrade-rc \
     -DCMAKE_PREFIX_PATH="$HOME/deps;$TRAVIS_BUILD_DIR/sdl2" \
     -DBUILD_STATIC=ON \
+    -DWITH_PLAYER=$TARGET_GLES3 \
     -DWITH_UI=$TARGET_GLES3 \
     -DWITH_UI_GALLERY=$TARGET_GLES3 \
     -DBUILD_TESTS=ON \