player: Use EmscriptenApplication

Signed-off-by: Squareys <squareys@googlemail.com>
mosra · May 23, 2019 · 2bb3909 · 2bb3909
1 parent 7216bf3
commit 2bb3909
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/src/player/CMakeLists.txt b/src/player/CMakeLists.txt
@@ -28,8 +28,13 @@ find_package(Magnum REQUIRED
     MeshTools
     Shaders
     SceneGraph
-    Trade
-    Sdl2Application)
+    Trade)
+
+if(CORRADE_TARGET_EMSCRIPTEN)
+    find_package(Magnum REQUIRED EmscriptenApplication)
+else()
+    find_package(Magnum REQUIRED Sdl2Application)
+endif()
 
 set_directory_properties(PROPERTIES CORRADE_USE_PEDANTIC_FLAGS ON)
 

diff --git a/src/player/Player.cpp b/src/player/Player.cpp
@@ -48,7 +48,11 @@
 #include <Magnum/GL/TextureFormat.h>
 #include <Magnum/Math/FunctionsBatch.h>
 #include <Magnum/MeshTools/Compile.h>
+#ifdef CORRADE_TARGET_EMSCRIPTEN
+#include <Magnum/Platform/EmscriptenApplication.h>
+#else
 #include <Magnum/Platform/Sdl2Application.h>
+#endif
 #include <Magnum/SceneGraph/Camera.h>
 #include <Magnum/SceneGraph/Drawable.h>
 #include <Magnum/SceneGraph/TranslationRotationScalingTransformation3D.h>
@@ -158,7 +162,7 @@ struct BaseUiPlane: Ui::Plane {
         stop{*this, {Ui::Snap::Right, play, ControlSize}, "Stop", Ui::Style::Danger},
         forward{*this, {Ui::Snap::Right, stop, HalfControlSize}, "»"},
         modelInfo{*this, {Ui::Snap::Top|Ui::Snap::Left, LabelSize}, "", Text::Alignment::LineLeft, 128, Ui::Style::Dim},
-        animationProgress{*this, {Ui::Snap::Right, forward, LabelSize}, "", Text::Alignment::LineLeft, 17}
+        animationProgress{*this, {Ui::Snap::Right, forward, LabelSize}, "", Text::Alignment::LineLeft, 18}
         #ifdef CORRADE_TARGET_EMSCRIPTEN
         ,
         fullsize{*this, {Ui::Snap::Bottom, controls, ButtonSize}, "Full size"},
@@ -456,7 +460,10 @@ Player::Player(const Arguments& arguments): Platform::Application{arguments, NoC
     load({}, *importer);
     #endif
 
+    #ifndef CORRADE_TARGET_EMSCRIPTEN
     setSwapInterval(1);
+    #endif
+
     #ifdef CORRADE_TARGET_EMSCRIPTEN
     app = this;
     #endif