player: visualize also primitive / object IDs.

mosra · Apr 22, 2020 · e50f8b8 · e50f8b8
1 parent f2234ab
commit e50f8b8
Show file tree

Hide file tree

Showing 11 changed files with 141 additions and 62 deletions.
diff --git a/doc/changelog-extras.dox b/doc/changelog-extras.dox
@@ -42,7 +42,8 @@ namespace Magnum {
     well
 -   @ref magnum-player "magnum-player" now supports normal maps and texture
     transformation in materials
--   Tangent space visualization in @ref magnum-player "magnum-player"
+-   Tangent space, object and primitive ID visualization in
+    @ref magnum-player "magnum-player"
 
 @subsection changelog-extras-latest-buildsystem Build system
 

diff --git a/package/ci/appveyor-desktop-gles.bat b/package/ci/appveyor-desktop-gles.bat
@@ -28,7 +28,7 @@ cmake .. ^
     -DTARGET_GLES2=%TARGET_GLES2% ^
     -DTARGET_DESKTOP_GLES=ON ^
     -DWITH_AUDIO=OFF ^
-    -DWITH_DEBUGTOOLS=OFF ^
+    -DWITH_DEBUGTOOLS=%TARGET_GLES3% ^
     -DWITH_MESHTOOLS=ON ^
     -DWITH_PRIMITIVES=%TARGET_GLES3% ^
     -DWITH_SCENEGRAPH=ON ^

diff --git a/package/ci/appveyor-desktop-mingw.bat b/package/ci/appveyor-desktop-mingw.bat
@@ -27,7 +27,7 @@ cmake .. ^
     -DCMAKE_INSTALL_PREFIX=%APPVEYOR_BUILD_FOLDER%/deps ^
     -DCMAKE_PREFIX_PATH=%APPVEYOR_BUILD_FOLDER%/SDL ^
     -DWITH_AUDIO=OFF ^
-    -DWITH_DEBUGTOOLS=OFF ^
+    -DWITH_DEBUGTOOLS=ON ^
     -DWITH_MESHTOOLS=ON ^
     -DWITH_PRIMITIVES=ON ^
     -DWITH_SCENEGRAPH=ON ^

diff --git a/package/ci/appveyor-desktop.bat b/package/ci/appveyor-desktop.bat
@@ -26,7 +26,7 @@ cmake .. ^
     -DCMAKE_INSTALL_PREFIX=%APPVEYOR_BUILD_FOLDER%/deps ^
     -DCMAKE_PREFIX_PATH=%APPVEYOR_BUILD_FOLDER%/SDL ^
     -DWITH_AUDIO=OFF ^
-    -DWITH_DEBUGTOOLS=OFF ^
+    -DWITH_DEBUGTOOLS=ON ^
     -DWITH_MESHTOOLS=ON ^
     -DWITH_PRIMITIVES=ON ^
     -DWITH_SCENEGRAPH=ON ^

diff --git a/package/ci/travis-android-arm.sh b/package/ci/travis-android-arm.sh
@@ -50,7 +50,7 @@ cmake .. \
     -DCMAKE_INSTALL_PREFIX=$HOME/deps \
     -DCMAKE_FIND_ROOT_PATH=$HOME/deps \
     -DWITH_AUDIO=OFF \
-    -DWITH_DEBUGTOOLS=OFF \
+    -DWITH_DEBUGTOOLS=$TARGET_GLES3 \
     -DWITH_MESHTOOLS=OFF \
     -DWITH_PRIMITIVES=$TARGET_GLES3 \
     -DWITH_SCENEGRAPH=OFF \

diff --git a/package/ci/travis-desktop-gles.sh b/package/ci/travis-desktop-gles.sh
@@ -32,7 +32,7 @@ cmake .. \
     -DTARGET_GLES=ON \
     -DTARGET_GLES2=$TARGET_GLES2 \
     -DWITH_AUDIO=OFF \
-    -DWITH_DEBUGTOOLS=OFF \
+    -DWITH_DEBUGTOOLS=$TARGET_GLES3 \
     -DWITH_MESHTOOLS=ON \
     -DWITH_PRIMITIVES=$TARGET_GLES3 \
     -DWITH_SCENEGRAPH=ON \

diff --git a/package/ci/travis-desktop.sh b/package/ci/travis-desktop.sh
@@ -27,7 +27,7 @@ cmake .. \
     -DCMAKE_INSTALL_RPATH=$HOME/deps/lib \
     -DCMAKE_BUILD_TYPE=$CONFIGURATION \
     -DWITH_AUDIO=OFF \
-    -DWITH_DEBUGTOOLS=OFF \
+    -DWITH_DEBUGTOOLS=ON \
     -DWITH_MESHTOOLS=ON \
     -DWITH_PRIMITIVES=ON \
     -DWITH_SCENEGRAPH=ON \

diff --git a/package/ci/travis-emscripten.sh b/package/ci/travis-emscripten.sh
@@ -48,7 +48,7 @@ cmake .. \
     -DCMAKE_INSTALL_PREFIX=$HOME/deps \
     -DCMAKE_FIND_ROOT_PATH=$HOME/deps \
     -DWITH_AUDIO=OFF \
-    -DWITH_DEBUGTOOLS=OFF \
+    -DWITH_DEBUGTOOLS=$TARGET_GLES3 \
     -DWITH_MESHTOOLS=ON \
     -DWITH_PRIMITIVES=$TARGET_GLES3 \
     -DWITH_SCENEGRAPH=ON \

diff --git a/package/ci/travis-ios-simulator.sh b/package/ci/travis-ios-simulator.sh
@@ -47,7 +47,7 @@ cmake .. \
     -DCMAKE_INSTALL_PREFIX=$HOME/deps \
     -DCMAKE_PREFIX_PATH=$TRAVIS_BUILD_DIR/sdl2 \
     -DWITH_AUDIO=OFF \
-    -DWITH_DEBUGTOOLS=OFF \
+    -DWITH_DEBUGTOOLS=$TARGET_GLES3 \
     -DWITH_MESHTOOLS=ON \
     -DWITH_PRIMITIVES=$TARGET_GLES3 \
     -DWITH_SCENEGRAPH=ON \

diff --git a/src/player/CMakeLists.txt b/src/player/CMakeLists.txt
@@ -24,6 +24,7 @@
 #
 
 find_package(Magnum REQUIRED
+    DebugTools
     GL
     MeshTools
     Primitives
@@ -68,6 +69,7 @@ if(CORRADE_TARGET_WINDOWS AND NOT CORRADE_TARGET_WINDOWS_RT)
 endif()
 target_link_libraries(magnum-player PRIVATE
     Magnum::Application
+    Magnum::DebugTools
     Magnum::GL
     Magnum::Magnum
     Magnum::MeshTools