Emscripten application

CMakeLists.txt

@@ -122,6 +122,10 @@ option(WITH_EGLCONTEXT "Build EglContext library" OFF)
 if(CORRADE_TARGET_ANDROID)
     option(WITH_ANDROIDAPPLICATION "Build AndroidApplication library" OFF)
 
+# Emscripten-specific application libraries
+elseif(CORRADE_TARGET_EMSCRIPTEN)
+    option(WITH_EMSCRIPTENAPPLICATION "Build EmscriptenApplication library" OFF)
+
 # iOS-specific application libraries
 elseif(CORRADE_TARGET_IOS)
     option(WITH_WINDOWLESSIOSAPPLICATION "Build WindowlessIosApplication library" OFF)

doc/building.dox

@@ -526,6 +526,9 @@ going to build any of the @ref example-index "examples", you'll need it.
     @ref Platform::AndroidApplication "AndroidApplication" library. Available
     only on @ref CORRADE_TARGET_ANDROID "Android". Enables also building of the
     GL library.
+-   `WITH_EMSCRIPTENAPPLICATION` --- Build the
+    @ref Platform::EmscriptenApplication "EmscriptenApplication" library.
+    Available only on @ref CORRADE_TARGET_EMSCRIPTEN "Emscripten".
 -   `WITH_GLFWAPPLICATION` --- Build the
     @ref Platform::GlfwApplication "GlfwApplication" library. Depends on
     [GLFW](http://glfw.org).

doc/changelog.dox

@@ -151,6 +151,10 @@ See also:
 
 @subsubsection changelog-latest-new-platform Platform libraries
 
+-   Added @ref Platform::EmscriptenApplication, implementing a lightweight and
+    more flexible alternative to @ref Platform::Sdl2Application for Emscripten.
+    This is now the recommended application to use for WebGL builds. See
+    [mosra/magnum#300](https://github.com/mosra/magnum/pull/300).
 -   @ref Platform::Sdl2Application and @ref Platform::GlfwApplication are now
     DPI-aware on Windows as well. See their documentation,
     @ref platforms-windows-hidpi and [mosra/magnum#243](https://github.com/mosra/magnum/issues/243)

doc/cmake.dox

@@ -122,6 +122,8 @@ the components. The optional components are:
 
 Platform namespace is split into more components:
 
+-   `AndroidApplication` --- @ref Platform::AndroidApplication "AndroidApplication"
+-   `EmscriptenApplication` --- @ref Platform::EmscriptenApplication "EmscriptenApplication"
 -   `GlfwApplication` --- @ref Platform::GlfwApplication "GlfwApplication"
 -   `GlxApplication` --- @ref Platform::GlxApplication "GlxApplication"
 -   `Sdl2Application` --- @ref Platform::Sdl2Application "Sdl2Application"

doc/credits.dox

@@ -121,10 +121,11 @@ Are the below lists missing your name or something's wrong?
     improvements to @cb{.cmake} android_create_apk() @ce
 -   **Ivan P.** ([\@uzername](https://github.com/uzername)) --- documentation
     improvements
--   **Jonathan Hale** ([\@Squareys](https://github.com/Squareys)) --- @ref Audio
-    library enhancements, @ref Platform::GlfwApplication implementation,
-    frustum and cone culling, bug reports, Windows build improvements,
-    documentation improvements and tons of other stuff
+-   **Jonathan Hale** ([\@Squareys](https://github.com/Squareys)) ---
+    @ref Audio library enhancements, @ref Platform::GlfwApplication and
+    @ref Platform::EmscriptenApplication implementation, frustum and cone
+    culling, bug reports, Windows build improvements, documentation
+    improvements and tons of other stuff
 -   **Joel Clay** ([\@jclay](https://github.com/jclay)) --- Vcpkg packages
 -   **Konstantinos Chatzilygeroudis** ([\@costashatz](https://github.com/costashatz))
     --- Debian package

doc/developers.dox

@@ -122,8 +122,8 @@ required to follow them to the point.
         support)
 13. Mention the library in `doc/changelog.dox` (or similar files in other
     repos)
-14. Build documentation:
-    -   run [dox2html5.py](http://mcss.mosra.cz/doxygen/) on `Doxyfile-mcss`
+14. @ref building-doc "Build documentation":
+    -   run [doxygen.py](http://mcss.mosra.cz/doxygen/) on `Doxyfile-mcss`
         and verify there are no new warnings
     -   eyeball the namespace and directory docs, fix suspicious things, look
         also in the building and cmake docs
@@ -307,8 +307,8 @@ in inverse.
     more information.
 6.  Mention the new functionality in `doc/changelog.dox` (and similar files in
     other repos)
-7.  Build documentation:
-    -   run [dox2html5.py](http://mcss.mosra.cz/doxygen/) on `Doxyfile-mcss`
+7.  @ref building-doc "Build documentation":
+    -   run [doxygen.py](http://mcss.mosra.cz/doxygen/) on `Doxyfile-mcss`
         and verify there are no new warnings
     -   eyeball the relevant docs and fix suspicious things
 8.  Build a coverage build (`package/archlinux/PKGBUILD-coverage`), or abuse
@@ -328,8 +328,8 @@ in inverse --- but usually @ref developers-deprecation "deprecate first".
 3.  Add a test for it to corresponding file, verify the test gets actually run
 4.  Mention the new functionality in `doc/changelog.dox` (and similar files in
     other repos)
-5.  Build documentation:
-    -   run [dox2html5.py](http://mcss.mosra.cz/doxygen/) on `Doxyfile-mcss`
+5.  @ref building-doc "Build documentation":
+    -   run [doxygen.py](http://mcss.mosra.cz/doxygen/) on `Doxyfile-mcss`
         and verify there are no new warnings
     -   eyeball the relevant docs and fix suspicious things
 6.  Build a coverage build (`package/archlinux/PKGBUILD-coverage`), or abuse
@@ -354,8 +354,8 @@ in inverse --- but usually @ref developers-deprecation "deprecate first".
 5.  Populate it, see @ref coding-style for more information
 6.  Mention the new page in `doc/changelog.dox` (and similar files in other
     repos)
-7.  Build documentation:
-    -   run [dox2html5.py](http://mcss.mosra.cz/doxygen/) on `Doxyfile-mcss`
+7.  @ref building-doc "Build documentation":
+    -   run [doxygen.py](http://mcss.mosra.cz/doxygen/) on `Doxyfile-mcss`
         and verify there are no new warnings
     -   eyeball the relevant docs and fix suspicious things
 8.  Push to `master`
@@ -399,8 +399,8 @@ in inverse --- but usually @ref developers-deprecation "deprecate first".
 7.  Upon verifying the above, start updating dependent code
 8.  Mention the deprecated API in the deprecation section of `doc/changelog.dox`
     (and similar files in other repos)
-9.  Build documentation:
-    -   run [dox2html5.py](http://mcss.mosra.cz/doxygen/) on `Doxyfile-mcss`
+9.  @ref building-doc "Build documentation":
+    -   run [doxygen.py](http://mcss.mosra.cz/doxygen/) on `Doxyfile-mcss`
         and verify there are no new warnings
     -   eyeball the relevant docs and fix suspicious things
 10.  Push to a temporary branch (e.g., `next`)
@@ -474,8 +474,8 @@ in inverse --- but usually @ref developers-deprecation "deprecate first".
     remove relevant deprecated files and update `CMakeLists.txt`
 3.  Mention the removed API in the compatibility section of `doc/changelog.dox`
     (or similar files in other repos)
-4.  Build documentation:
-    -   run [dox2html5.py](http://mcss.mosra.cz/doxygen/) on `Doxyfile-mcss`
+4.  @ref building-doc "Build documentation":
+    -   run [doxygen.py](http://mcss.mosra.cz/doxygen/) on `Doxyfile-mcss`
         and verify there are no new warnings --- sometimes it happens that a
         deprecated API is still being referenced
 5.  Push to a temporary branch (e.g., `next`)
@@ -603,8 +603,8 @@ unless it doesn't affect public API at all.
     possibly to multiple places
 9.  Update relevant extension support in tables in `doc/opengl-support.dox`
 10. Mention the new stuff in `doc/changelog.dox`
-11. Build documentation:
-    -   run [dox2html5.py](http://mcss.mosra.cz/doxygen/) on `Doxyfile-mcss`
+11. @ref building-doc "Build documentation":
+    -   run [doxygen.py](http://mcss.mosra.cz/doxygen/) on `Doxyfile-mcss`
         and verify there are no new warnings
     -   eyeball the relevant docs and fix suspicious things
 12. Build and test for relevant platforms locally (as the public CI can't test
@@ -790,7 +790,7 @@ inverse.
 1.  (Optionally) remove `build/doc-public` to get rid of stale files
 2.  Verify there are no untracked files, modifications or branches different
     than `master` checked out that could mess up the docs
-3.  Run [dox2html5.py](http://mcss.mosra.cz/doxygen/) on `Doxyfile-public`,
+3.  Run [doxygen.py](http://mcss.mosra.cz/doxygen/) on `Doxyfile-public`,
     look for suspicious warnings
 4.  Upload contents of `build/doc-public/html/` to `doc/magnum-new/` and remove
     `doc/magnum-old/` if any
@@ -810,8 +810,8 @@ inverse.
 5.  Add the contributor to `CREDITS.md`, if not already there
 6.  Update `doc/changelog.dox` (and similar files in other repos), if not
     already done
-7.  Build documentation:
-    -   run [dox2html5.py](http://mcss.mosra.cz/doxygen/) on `Doxyfile-mcss`
+7.  @ref building-doc "Build documentation:
+    -   run [doxygen.py](http://mcss.mosra.cz/doxygen/) on `Doxyfile-mcss`
         and verify there are no new warnings
     -   eyeball the relevant docs and fix suspicious things
 8.  Push to a temporary branch (e.g., `next`)

doc/platforms-html5.dox

@@ -97,14 +97,14 @@ In case you don't have an OpenGL ES build set up yet, you need to copy
 Magnum source to the `modules/` dir in your project so it is able to find the
 WebGL libraries.
 
-Magnum provides an Emscripten application wrapper in
-@ref Platform::Sdl2Application. See its documentation for more information
-about general usage. You can also use the Emscripten APIs directly or any other
-way.
+Magnum provides Emscripten application wrappers in @ref Platform::Sdl2Application
+and @ref Platform::EmscriptenApplication. See their documentation for more
+information about general usage. You can also use the Emscripten APIs directly
+or any other way.
 
-@note The @ref Platform::Sdl2Application also contains a fully configured
-    bootstrap project that's ready to build and deploy. Check its documentation
-    for details.
+@note @ref Platform::EmscriptenApplication also contains a fully configured
+    bootstrap project that is ready to build and deploy. Check its
+    documentation for details.
 
 To target the web browser, you need to provide a HTML markup for your
 application. Template one is below. The markup references two files,
@@ -198,9 +198,8 @@ EGL and WebGL libraries.
 
 Windowless Magnum apps (i.e. apps that use the OpenGL context without a window)
 can be run in the browser as well using the @ref Platform::WindowlessEglApplication
-class. See its documentation for more information
-about general usage. You can also use the Emscripten APIs directly or any other
-way.
+class. See its documentation for more information about general usage. You can
+also use the Emscripten APIs directly or any other way.
 
 @note @ref Platform::WindowlessEglApplication also contains a fully configured
     bootstrap project that's ready to build and deploy. Check its documentation
@@ -330,7 +329,8 @@ the @cb{.css} div#sizer @ce will center it, following the canvas width. If you
 need more advanced styling, check out [m.css](http://mcss.mosra.cz).
 
 @note It's also possible to modify the container CSS classes from the C++ side
-    using @ref Platform::Sdl2Application::setContainerCssClass().
+    using @ref Platform::EmscriptenApplication::setContainerCssClass() /
+    @ref Platform::Sdl2Application::setContainerCssClass().
 
 @section platforms-html5-events Controlling event behavior
 
@@ -350,8 +350,11 @@ Module.doNotCaptureKeyboard = true;
 </script>
 @endcode
 
-The above is implicitly set for windowless apps, because these don't have any
-event loop.
+The above is implicitly set for @ref Platform::WindowlessEglApplication,
+because it does not have an event loop.
+
+@cb{.js} Module.doNotCaptureKeyboard @ce is not supported by
+@ref Platform::EmscriptenApplication.
 
 Another solution is to specify the element on which it should capture keybard
 using @cb{.js} Module.keyboardListeningElement @ce --- it requires the actual
@@ -367,7 +370,7 @@ like this:
 
 After that, the canvas can be focused with a @m_class{m-label m-default} **Tab**
 key. But because Emscripten eats all mouse input, the `mousedown` event won't
-be propagated to focus the canvas unlesss you do that manually:
+be propagated to focus the canvas unless you do that manually:
 
 @code{.js}
 Module.keyboardListeningElement = Module.canvas;

modules/FindMagnum.cmake

@@ -67,6 +67,8 @@
 #  TextureTools                 - TextureTools library
 #  Trade                        - Trade library
 #  Vk                           - Vk library
+#  AndroidApplication           - Android application
+#  EmscriptenApplication        - Emscripten application
 #  GlfwApplication              - GLFW application
 #  GlxApplication               - GLX application
 #  Sdl2Application              - SDL2 application
@@ -338,10 +340,10 @@ endif()
 set(_MAGNUM_LIBRARY_COMPONENT_LIST
     Audio DebugTools GL MeshTools Primitives SceneGraph Shaders Text
     TextureTools Trade Vk
-    AndroidApplication GlfwApplication GlxApplication Sdl2Application
-    XEglApplication WindowlessCglApplication WindowlessEglApplication
-    WindowlessGlxApplication WindowlessIosApplication WindowlessWglApplication
-    WindowlessWindowsEglApplication
+    AndroidApplication EmscriptenApplication GlfwApplication GlxApplication
+    Sdl2Application XEglApplication WindowlessCglApplication
+    WindowlessEglApplication WindowlessGlxApplication WindowlessIosApplication
+    WindowlessWglApplication WindowlessWindowsEglApplication
     CglContext EglContext GlxContext WglContext
     OpenGLTester)
 set(_MAGNUM_PLUGIN_COMPONENT_LIST
@@ -410,6 +412,10 @@ endif()
 
 set(_MAGNUM_Trade_DEPENDENCIES )
 set(_MAGNUM_AndroidApplication_DEPENDENCIES GL)
+set(_MAGNUM_EmscriptenApplication_DEPENDENCIES)
+if(MAGNUM_TARGET_GL)
+    list(APPEND _MAGNUM_EmscriptenApplication_DEPENDENCIES GL)
+endif()
 
 set(_MAGNUM_GlfwApplication_DEPENDENCIES )
 if(MAGNUM_TARGET_GL)

package/archlinux/PKGBUILD-emscripten

@@ -29,6 +29,7 @@ build() {
         -DCMAKE_INSTALL_PREFIX=/usr/lib/emscripten/system \
         -DMAGNUM_DEPLOY_PREFIX=/srv/http/emscripten \
         -DWITH_AUDIO=ON \
+        -DWITH_EMSCRIPTENAPPLICATION=ON \
         -DWITH_SDL2APPLICATION=ON \
         -DWITH_WINDOWLESSEGLAPPLICATION=ON \
         -DWITH_ANYAUDIOIMPORTER=ON \

package/archlinux/PKGBUILD-emscripten-wasm

@@ -29,6 +29,7 @@ build() {
         -DCMAKE_INSTALL_PREFIX=/usr/lib/emscripten/system \
         -DMAGNUM_DEPLOY_PREFIX=/srv/http/emscripten \
         -DWITH_AUDIO=ON \
+        -DWITH_EMSCRIPTENAPPLICATION=ON \
         -DWITH_SDL2APPLICATION=ON \
         -DWITH_WINDOWLESSEGLAPPLICATION=ON \
         -DWITH_ANYAUDIOIMPORTER=ON \

package/archlinux/PKGBUILD-emscripten-wasm-webgl2

@@ -30,6 +30,7 @@ build() {
         -DMAGNUM_DEPLOY_PREFIX=/srv/http/emscripten-webgl2 \
         -DTARGET_GLES2=OFF \
         -DWITH_AUDIO=ON \
+        -DWITH_EMSCRIPTENAPPLICATION=ON \
         -DWITH_SDL2APPLICATION=ON \
         -DWITH_WINDOWLESSEGLAPPLICATION=ON \
         -DWITH_ANYAUDIOIMPORTER=ON \

package/archlinux/PKGBUILD-emscripten-webgl2

@@ -30,6 +30,7 @@ build() {
         -DMAGNUM_DEPLOY_PREFIX=/srv/http/emscripten-webgl2 \
         -DTARGET_GLES2=OFF \
         -DWITH_AUDIO=ON \
+        -DWITH_EMSCRIPTENAPPLICATION=ON \
         -DWITH_SDL2APPLICATION=ON \
         -DWITH_WINDOWLESSEGLAPPLICATION=ON \
         -DWITH_ANYAUDIOIMPORTER=ON \

package/ci/travis-emscripten.sh

@@ -50,6 +50,7 @@ cmake .. \
     -DCMAKE_FIND_ROOT_PATH=$HOME/deps \
     -DWITH_AUDIO=ON \
     -DWITH_VK=OFF \
+    -DWITH_EMSCRIPTENAPPLICATION=ON \
     -DWITH_SDL2APPLICATION=ON \
     -DWITH_WINDOWLESSEGLAPPLICATION=ON \
     -DWITH_ANYAUDIOIMPORTER=ON \

src/Magnum/Animation/Easing.h

@@ -731,7 +731,7 @@ Combination of @ref circularIn() and @ref circularOut().
 @see @ref sineInOut()
 */
 inline Float circularInOut(Float t) {
-    if(t < 0.5f) return 0.5f*(1.0f - std::sqrt(1.0f - 4*t*t));
+    if(t < 0.5f) return 0.5f*(1.0f - std::sqrt(1.0f - 4.0f*t*t));
     return 0.5f*(1.0f + std::sqrt(-4.0f*t*t + 8.0f*t - 3.0f));
 }
 

src/Magnum/GL/TimeQuery.h

@@ -47,7 +47,8 @@ usage of both methods:
 
 @snippet MagnumGL.cpp TimeQuery-usage2
 
-Using the latter results in fewer OpenGL calls when doing more measures.
+Using the latter results in fewer OpenGL calls when doing more measures. All
+times are reported in nanoseconds.
 
 @requires_gl33 Extension @gl_extension{ARB,timer_query}
 @requires_es_extension Extension @gl_extension{EXT,disjoint_timer_query}
@@ -66,8 +67,8 @@ class TimeQuery: public AbstractQuery {
          */
         enum class Target: GLenum {
             /**
-             * Elapsed time. Use @ref result<UnsignedLong>() or @ref result<Long>()
-             * to retrieve the result.
+             * Elapsed time, in nanoseconds. Use @ref result<UnsignedLong>() or
+             * @ref result<Long>() to retrieve the result.
              * @see @ref timestamp()
              */
             #ifndef MAGNUM_TARGET_GLES
@@ -77,9 +78,9 @@ class TimeQuery: public AbstractQuery {
             #endif
 
             /**
-             * Timestamp. For use with @ref timestamp() only, use
-             * @ref result<UnsignedLong>() or @ref result<Long>() to retrieve
-             * the result.
+             * Timestamp, in nanoseconds. For use with @ref timestamp() only,
+             * use @ref result<UnsignedLong>() or @ref result<Long>() to
+             * retrieve the result.
              */
             #ifndef MAGNUM_TARGET_GLES
             Timestamp = GL_TIMESTAMP