diff --git a/doc/changelog.dox b/doc/changelog.dox index c0bfb659f..215220e33 100644 --- a/doc/changelog.dox +++ b/doc/changelog.dox @@ -77,6 +77,12 @@ See also: - Added @ref MeshTools::generateQuadIndices() for quad triangulation including non-convex and non-planar quads +@subsubsection changelog-latest-new-platform Platform libraries + +- It's now possible to have multiple @ref Platform::EmscriptenApplication + canvases on a single page (see [mosra/magnum#480](https://github.com/mosra/magnum/pull/480), + [mosra/magnum#481](https://github.com/mosra/magnum/pull/481)) + @subsubsection changelog-latest-new-shaders Shaders library - Added @ref Shaders::Phong::setNormalTextureScale(), consuming the recently @@ -206,6 +212,16 @@ See also: @subsection changelog-latest-deprecated Deprecated APIs +- Markup styling for Emscripten application was switched to prefer using + CSS classes instead of the @cb{.css} #container @ce, @cb{.css} #sizer @ce, + @cb{.css} #expander @ce, @cb{.css} #listener @ce, @cb{.css} #canvas @ce, + @cb{.css} #log @ce, @cb{.css} #status @ce and + @cb{.css} #status-description @ce IDs as this enables having more than one + application on the page. Styling still supports the IDs for backwards + compatibility, from now the IDs are only required in order to reference + the canvas and status elements from the JS `Module`. See + @ref platforms-html5-apps and [mosra/magnum#481](https://github.com/mosra/magnum/pull/481) + for details. - @ref Shaders::Phong::setLightPositions() and @ref Shaders::Phong::setLightPosition() taking three-component vectors are deprecated in favor of variants taking four-component vectors, where the diff --git a/doc/credits.dox b/doc/credits.dox index 39bc02965..e727aaa04 100644 --- a/doc/credits.dox +++ b/doc/credits.dox @@ -178,7 +178,8 @@ Are the below lists missing your name or something's wrong? - **Olga Turanksaya** ([\@olga-python](https://github.com/olga-python)) --- Gentoo ebuild) - **Pablo Escobar** ([\@pezcode](https://github.com/pezcode)) --- @ref Math - additions, @ref Platform::EmscriptenApplication improvements + additions, support for multiple @ref Platform::EmscriptenApplication + canvases on one page - **Pascal Thomet** ([\@pthom](https://github.com/pthom)) --- C++17 compilation fixes, buildsystem improvements, Hunter package - **Sam Spilsbury** ([\@smspillaz](https://github.com/smspillaz)) --- WebGL diff --git a/doc/platforms-html5.dox b/doc/platforms-html5.dox index bdb1827a5..4ee4cc1a7 100644 --- a/doc/platforms-html5.dox +++ b/doc/platforms-html5.dox @@ -3,6 +3,7 @@ Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Vladimír Vondruš + Copyright © 2020 Pablo Escobar Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), diff --git a/src/Magnum/Platform/EmscriptenApplication.h b/src/Magnum/Platform/EmscriptenApplication.h index f75770e03..5e831e969 100644 --- a/src/Magnum/Platform/EmscriptenApplication.h +++ b/src/Magnum/Platform/EmscriptenApplication.h @@ -6,6 +6,7 @@ Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Vladimír Vondruš Copyright © 2018, 2019 Jonathan Hale + Copyright © 2020 Pablo Escobar Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), diff --git a/src/Magnum/Platform/EmscriptenApplication.js b/src/Magnum/Platform/EmscriptenApplication.js index 48ce2f79d..75382a2a0 100644 --- a/src/Magnum/Platform/EmscriptenApplication.js +++ b/src/Magnum/Platform/EmscriptenApplication.js @@ -3,6 +3,7 @@ Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Vladimír Vondruš + Copyright © 2020 Pablo Escobar Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), diff --git a/src/Magnum/Platform/Test/CMakeLists.txt b/src/Magnum/Platform/Test/CMakeLists.txt index 74bc57f2f..5477f9e75 100644 --- a/src/Magnum/Platform/Test/CMakeLists.txt +++ b/src/Magnum/Platform/Test/CMakeLists.txt @@ -3,6 +3,7 @@ # # Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, # 2020 Vladimír Vondruš +# Copyright © 2020 Pablo Escobar # # Permission is hereby granted, free of charge, to any person obtaining a # copy of this software and associated documentation files (the "Software"), diff --git a/src/Magnum/Platform/Test/EmscriptenApplicationTest.cpp b/src/Magnum/Platform/Test/EmscriptenApplicationTest.cpp index 1fd052a07..10f99d62a 100644 --- a/src/Magnum/Platform/Test/EmscriptenApplicationTest.cpp +++ b/src/Magnum/Platform/Test/EmscriptenApplicationTest.cpp @@ -4,6 +4,7 @@ Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 Vladimír Vondruš Copyright © 2018, 2019 Jonathan Hale + Copyright © 2020 Pablo Escobar Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"),