ic
/
magnum
mirror of https://github.com/mosra/magnum.git
6
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Use https for links. 

I thought I went over all these several years ago already, but
apparently not or maybe back then not all websites were HTTPS-ready. Now
they mostly are, except for maybe one or two.
pull/680/head
Vladimír Vondruš 7 months ago
parent
e9907a80ec
commit
0109548149
37 changed files with 81 additions and 83 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 9
      doc/building.dox
  2. 2
      doc/changelog-old.dox
  3. 2
      doc/conf.py
  4. 30
      doc/developers.dox
  5. 2
      doc/getting-started.dox
  6. 4
      doc/method-chaining.dox
  7. 2
      doc/opengl-wrapping.dox
  8. 2
      doc/platforms-android.dox
  9. 7
      doc/platforms-html5.dox
  10. 2
      doc/platforms-vk.dox
  11. 2
      modules/FindEGL.cmake
  12. 2
      modules/FindOpenAL.cmake
  13. 2
      modules/FindOpenGLES2.cmake
  14. 2
      modules/FindOpenGLES3.cmake
  15. 2
      package/ci/appveyor-cache-reset.txt
  16. 2
      src/Magnum/Animation/Easing.h
  17. 8
      src/Magnum/DebugTools/ColorMap.h
  18. 2
      src/Magnum/GL/Implementation/driverSpecific.cpp
  19. 2
      src/Magnum/Magnum.h
  20. 2
      src/Magnum/Math/Algorithms/GaussJordan.h
  21. 4
      src/Magnum/Math/Distance.h
  22. 2
      src/Magnum/Math/Intersection.h
  23. 6
      src/Magnum/Math/Test/ColorTest.cpp
  24. 2
      src/Magnum/Math/TypeTraits.h
  25. 8
      src/Magnum/PixelFormat.h
  26. 2
      src/Magnum/Platform/AndroidApplication.cpp
  27. 2
      src/Magnum/Platform/AndroidApplication.h
  28. 12
      src/Magnum/Platform/GlfwApplication.h
  29. 12
      src/Magnum/Platform/Implementation/DpiScaling.cpp
  30. 6
      src/Magnum/Platform/Sdl2Application.h
  31. 2
      src/Magnum/Platform/WindowlessWglApplication.cpp
  32. 2
      src/Magnum/Primitives/Cube.cpp
  33. 2
      src/Magnum/SceneGraph/AbstractGroupedFeature.h
  34. 2
      src/Magnum/Vk/CommandBuffer.h
  35. 6
      src/MagnumPlugins/AnyImageImporter/AnyImageImporter.cpp
  36. 4
      src/MagnumPlugins/TgaImporter/TgaImporter.cpp
  37. 2
      src/dummy.cpp

9
doc/building.dox
Unescape View File

@ -603,13 +603,13 @@ going to build any of the @ref example-index "examples", you'll need it.
Available only on @ref CORRADE_TARGET_EMSCRIPTEN "Emscripten". Available only on @ref CORRADE_TARGET_EMSCRIPTEN "Emscripten".
- `MAGNUM_WITH_GLFWAPPLICATION` --- Build the - `MAGNUM_WITH_GLFWAPPLICATION` --- Build the
@ref Platform::GlfwApplication "GlfwApplication" library. Depends on @ref Platform::GlfwApplication "GlfwApplication" library. Depends on
[GLFW](http://glfw.org). [GLFW](https://www.glfw.org).
- `MAGNUM_WITH_GLXAPPLICATION` --- Build the - `MAGNUM_WITH_GLXAPPLICATION` --- Build the
@ref Platform::GlxApplication "GlxApplication" library. Depends on **X11**. @ref Platform::GlxApplication "GlxApplication" library. Depends on **X11**.
Requires `MAGNUM_TARGET_GL` to be enabled. Requires `MAGNUM_TARGET_GL` to be enabled.
- `MAGNUM_WITH_SDL2APPLICATION` --- Build the - `MAGNUM_WITH_SDL2APPLICATION` --- Build the
@ref Platform::Sdl2Application "Sdl2Application" library. Depends on @ref Platform::Sdl2Application "Sdl2Application" library. Depends on
[SDL2](http://www.libsdl.org). [SDL2](https://www.libsdl.org).
- `MAGNUM_WITH_XEGLAPPLICATION` --- Build the - `MAGNUM_WITH_XEGLAPPLICATION` --- Build the
@ref Platform::XEglApplication "XEglApplication" library. Enables also @ref Platform::XEglApplication "XEglApplication" library. Enables also
building of the @ref GL library. building of the @ref GL library.
@ -909,7 +909,7 @@ information.
@section building-doc Building documentation @section building-doc Building documentation
The documentation is generated using [Doxygen](http://doxygen.org) with the The documentation is generated using [Doxygen](https://doxygen.org) with the
[m.css Doxygen theme](https://mcss.mosra.cz/documentation/doxygen/) and [m.css Doxygen theme](https://mcss.mosra.cz/documentation/doxygen/) and
additionally uses **LaTeX** for math formulas. Use `doc/conf.py` for a local additionally uses **LaTeX** for math formulas. Use `doc/conf.py` for a local
build, the `doc/conf-public.py` is meant for the publicly available build, the `doc/conf-public.py` is meant for the publicly available
@ -1070,8 +1070,7 @@ to make it available to depending projects.
@subsection building-cross-emscripten Cross-compiling for Emscripten @subsection building-cross-emscripten Cross-compiling for Emscripten
You will need [Emscripten](http://kripken.github.io/emscripten-site/) installed You will need [Emscripten](https://emscripten.org) installed and configured and
and configured and
@ref building-corrade-cross-emscripten "Corrade built for Emscripten". The @ref building-corrade-cross-emscripten "Corrade built for Emscripten". The
toolchains require CMake 3.7 or newer to properly set compiler and linker toolchains require CMake 3.7 or newer to properly set compiler and linker
flags. If you are on Windows, [this blog post](https://blog.squareys.de/magnum-emscripten-on-windows/) flags. If you are on Windows, [this blog post](https://blog.squareys.de/magnum-emscripten-on-windows/)

2
doc/changelog-old.dox
Unescape View File

@ -1187,7 +1187,7 @@ a high-level overview.
@subsection changelog-2018-02-docs Documentation @subsection changelog-2018-02-docs Documentation
- New documentation theme powered by [m.css](http://mcss.mosra.cz) and - New documentation theme powered by [m.css](https://mcss.mosra.cz) and
related massive updates of *everything* (see related massive updates of *everything* (see
[mosra/magnum#113](https://github.com/mosra/magnum/issues/113)) [mosra/magnum#113](https://github.com/mosra/magnum/issues/113))
- Explicit list of extensions that are available in WebGL builds - Explicit list of extensions that are available in WebGL builds

2
doc/conf.py
Unescape View File

@ -30,7 +30,7 @@ LINKS_NAVBAR2 = [
("<a href=\"../../../../magnum-bindings/build/doc/python/index.html\">Python API</a>", []) ("<a href=\"../../../../magnum-bindings/build/doc/python/index.html\">Python API</a>", [])
] ]
FINE_PRINT = """<p>Magnum docs. Part of the <a href="https://magnum.graphics/">Magnum project</a>, copyright © <a href="http://mosra.cz/">Vladimír Vondruš</a> and <a href="credits-contributors.html">contributors</a>, 2010&ndash;2025.<br />Generated by <a href="https://doxygen.org/">Doxygen</a> {doxygen_version} and <a href="https://mcss.mosra.cz/">m.css</a>. Contact the team via <a href="https://github.com/mosra/magnum">GitHub</a>, <a href="https://gitter.im/mosra/magnum">Gitter</a>, <a href="mailto:info@magnum.graphics">e-mail</a> or <a href="https://twitter.com/czmosra">Twitter</a>.</p>""" FINE_PRINT = """<p>Magnum docs. Part of the <a href="https://magnum.graphics/">Magnum project</a>, copyright © <a href="https://mosra.cz/">Vladimír Vondruš</a> and <a href="credits-contributors.html">contributors</a>, 2010&ndash;2025.<br />Generated by <a href="https://doxygen.org/">Doxygen</a> {doxygen_version} and <a href="https://mcss.mosra.cz/">m.css</a>. Contact the team via <a href="https://github.com/mosra/magnum">GitHub</a>, <a href="https://gitter.im/mosra/magnum">Gitter</a>, <a href="mailto:info@magnum.graphics">e-mail</a> or <a href="https://twitter.com/czmosra">Twitter</a>.</p>"""
SEARCH_HELP = """<p class="m-noindent">Search for symbols, directories, files, pages, OpenGL, GLSL, Vulkan and OpenAL APIs. You can omit any prefix from the symbol or file path; adding a <code>:</code> or <code>/</code> suffix lists all members of given symbol or directory.</p> <p class="m-noindent">Use <span class="m-label m-dim">&darr;</span> / <span class="m-label m-dim">&uarr;</span> to navigate through the list, <span class="m-label m-dim">Enter</span> to go. <span class="m-label m-dim">Tab</span> autocompletes common prefix, you can copy a link to the result using <span class="m-label m-dim">⌘</span> <span class="m-label m-dim">L</span> while <span class="m-label m-dim">⌘</span> <span class="m-label m-dim">M</span> produces a Markdown link.</p>""" SEARCH_HELP = """<p class="m-noindent">Search for symbols, directories, files, pages, OpenGL, GLSL, Vulkan and OpenAL APIs. You can omit any prefix from the symbol or file path; adding a <code>:</code> or <code>/</code> suffix lists all members of given symbol or directory.</p> <p class="m-noindent">Use <span class="m-label m-dim">&darr;</span> / <span class="m-label m-dim">&uarr;</span> to navigate through the list, <span class="m-label m-dim">Enter</span> to go. <span class="m-label m-dim">Tab</span> autocompletes common prefix, you can copy a link to the result using <span class="m-label m-dim">⌘</span> <span class="m-label m-dim">L</span> while <span class="m-label m-dim">⌘</span> <span class="m-label m-dim">M</span> produces a Markdown link.</p>"""

30
doc/developers.dox
Unescape View File

@ -394,8 +394,8 @@ in inverse.
7. Mention the new functionality in `doc/changelog.dox` (and similar files in 7. Mention the new functionality in `doc/changelog.dox` (and similar files in
other repos) other repos)
8. @ref building-doc "Build documentation": 8. @ref building-doc "Build documentation":
- run [doxygen.py](http://mcss.mosra.cz/doxygen/) on `Doxyfile-mcss` - run [doxygen.py](https://mcss.mosra.cz/documentation/doxygen/) on
and verify there are no new warnings `doc/conf.py` and verify there are no new warnings
- eyeball the relevant docs and fix suspicious things - eyeball the relevant docs and fix suspicious things
9. Build a coverage build (`package/archlinux/PKGBUILD-coverage`), or abuse 9. Build a coverage build (`package/archlinux/PKGBUILD-coverage`), or abuse
the CI for that later the CI for that later
@ -417,8 +417,8 @@ in inverse --- but usually @ref developers-deprecation "deprecate first".
5. Mention the new functionality in `doc/changelog.dox` (and similar files in 5. Mention the new functionality in `doc/changelog.dox` (and similar files in
other repos) other repos)
6. @ref building-doc "Build documentation": 6. @ref building-doc "Build documentation":
- run [doxygen.py](http://mcss.mosra.cz/doxygen/) on `Doxyfile-mcss` - run [doxygen.py](https://mcss.mosra.cz/documentation/doxygen/) on
and verify there are no new warnings `doc/conf.py` and verify there are no new warnings
- eyeball the relevant docs and fix suspicious things - eyeball the relevant docs and fix suspicious things
7. Build a coverage build (`package/archlinux/PKGBUILD-coverage`), or abuse 7. Build a coverage build (`package/archlinux/PKGBUILD-coverage`), or abuse
the CI for that later the CI for that later
@ -443,8 +443,8 @@ in inverse --- but usually @ref developers-deprecation "deprecate first".
6. Mention the new page in `doc/changelog.dox` (and similar files in other 6. Mention the new page in `doc/changelog.dox` (and similar files in other
repos) repos)
7. @ref building-doc "Build documentation": 7. @ref building-doc "Build documentation":
- run [doxygen.py](http://mcss.mosra.cz/doxygen/) on `Doxyfile-mcss` - run [doxygen.py](https://mcss.mosra.cz/documentation/doxygen/) on
and verify there are no new warnings `doc/conf.py` and verify there are no new warnings
- eyeball the relevant docs and fix suspicious things - eyeball the relevant docs and fix suspicious things
8. Push to `master` 8. Push to `master`
@ -488,8 +488,8 @@ in inverse --- but usually @ref developers-deprecation "deprecate first".
8. Mention the deprecated API in the deprecation section of `doc/changelog.dox` 8. Mention the deprecated API in the deprecation section of `doc/changelog.dox`
(and similar files in other repos) (and similar files in other repos)
9. @ref building-doc "Build documentation": 9. @ref building-doc "Build documentation":
- run [doxygen.py](http://mcss.mosra.cz/doxygen/) on `Doxyfile-mcss` - run [doxygen.py](https://mcss.mosra.cz/documentation/doxygen/) on
and verify there are no new warnings `doc/conf.py` and verify there are no new warnings
- eyeball the relevant docs and fix suspicious things - eyeball the relevant docs and fix suspicious things
10. Push to a temporary branch (e.g., `next`) 10. Push to a temporary branch (e.g., `next`)
11. Iterate until the CIs are green 11. Iterate until the CIs are green
@ -563,9 +563,9 @@ in inverse --- but usually @ref developers-deprecation "deprecate first".
3. Mention the removed API in the compatibility section of `doc/changelog.dox` 3. Mention the removed API in the compatibility section of `doc/changelog.dox`
(or similar files in other repos) (or similar files in other repos)
4. @ref building-doc "Build documentation": 4. @ref building-doc "Build documentation":
- run [doxygen.py](http://mcss.mosra.cz/doxygen/) on `Doxyfile-mcss` - run [doxygen.py](https://mcss.mosra.cz/documentation/doxygen/) on
and verify there are no new warnings --- sometimes it happens that a `doc/conf.py` and verify there are no new warnings --- sometimes it
deprecated API is still being referenced happens that a deprecated API is still being referenced
5. Push to a temporary branch (e.g., `next`) 5. Push to a temporary branch (e.g., `next`)
6. Iterate until the CIs are green 6. Iterate until the CIs are green
7. Merge to `master` 7. Merge to `master`
@ -1157,8 +1157,8 @@ inverse.
1. (Optionally) remove `build/doc-public` to get rid of stale files 1. (Optionally) remove `build/doc-public` to get rid of stale files
2. Verify there are no untracked files, modifications or branches different 2. Verify there are no untracked files, modifications or branches different
than `master` checked out that could mess up the docs than `master` checked out that could mess up the docs
3. Run [doxygen.py](http://mcss.mosra.cz/doxygen/) on `Doxyfile-public`, 3. Run [doxygen.py](https://mcss.mosra.cz/documentation/doxygen/) on
look for suspicious warnings `doc/conf-public.py`, look for suspicious warnings
4. Upload contents of `build/doc-public/html/` to `doc/magnum-new/` and remove 4. Upload contents of `build/doc-public/html/` to `doc/magnum-new/` and remove
`doc/magnum-old/` if any `doc/magnum-old/` if any
5. Once the upload is finished, rename `doc/magnum/` to `doc/magnum-old/` and 5. Once the upload is finished, rename `doc/magnum/` to `doc/magnum-old/` and
@ -1178,8 +1178,8 @@ inverse.
6. Update `doc/changelog.dox` (and similar files in other repos), if not 6. Update `doc/changelog.dox` (and similar files in other repos), if not
already done already done
7. @ref building-doc "Build documentation: 7. @ref building-doc "Build documentation:
- run [doxygen.py](http://mcss.mosra.cz/doxygen/) on `Doxyfile-mcss` - run [doxygen.py](https://mcss.mosra.cz/documentation/doxygen/) on
and verify there are no new warnings `doc/conf.py` and verify there are no new warnings
- eyeball the relevant docs and fix suspicious things - eyeball the relevant docs and fix suspicious things
8. Push to a temporary branch (e.g., `next`) 8. Push to a temporary branch (e.g., `next`)
9. Iterate until the CIs are green 9. Iterate until the CIs are green

2
doc/getting-started.dox
Unescape View File

@ -83,7 +83,7 @@ add_subdirectory(magnum EXCLUDE_FROM_ALL)
add_subdirectory(src) add_subdirectory(src)
@endcode @endcode
The last missing piece before you can continue is the [SDL](http://libsdl.org/) The last missing piece before you can continue is the [SDL](https://libsdl.org)
library --- the bootstrap project (and most examples) use it to do window library --- the bootstrap project (and most examples) use it to do window
management and event handling. If you are on Linux or macOS, you can get it management and event handling. If you are on Linux or macOS, you can get it
easily from your package manager: easily from your package manager:

4
doc/method-chaining.dox
Unescape View File

@ -30,8 +30,8 @@ namespace Magnum {
@m_footernavigation @m_footernavigation
Method chaining ([Wikipedia](http://en.wikipedia.org/wiki/Method_chaining)) is a Method chaining ([Wikipedia](https://en.wikipedia.org/wiki/Method_chaining)) is
feature which allows you to chain method calls one after another without a feature which allows you to chain method calls one after another without
repeatedly specifying variable the method is called on. Its primary goal is to repeatedly specifying variable the method is called on. Its primary goal is to
reduce unnecessary repeated names, improving code readability. reduce unnecessary repeated names, improving code readability.

2
doc/opengl-wrapping.dox
Unescape View File

@ -120,7 +120,7 @@ previous values --- it would involve impractically large amount of queries and
state switches with serious performance impact. It's thus expected that state switches with serious performance impact. It's thus expected that
third-party code either does no state tracking or provides similar means to third-party code either does no state tracking or provides similar means to
reset their state tracker (for example Qt has reset their state tracker (for example Qt has
[QQuickWindow::resetOpenGLState()](http://doc.qt.io/qt-5/qquickwindow.html#resetOpenGLState) [QQuickWindow::resetOpenGLState()](https://doc.qt.io/archives/qt-5.15/qquickwindow.html#resetOpenGLState)
that's advised to call before giving the control back to Qt). that's advised to call before giving the control back to Qt).
@section opengl-wrapping-dsa Extension-dependent functionality @section opengl-wrapping-dsa Extension-dependent functionality

2
doc/platforms-android.dox
Unescape View File

@ -182,7 +182,7 @@ different version.
The @cb{.xml} <uses-sdk android:minSdkVersion="4" android:targetSdkVersion="11" /> @ce The @cb{.xml} <uses-sdk android:minSdkVersion="4" android:targetSdkVersion="11" /> @ce
line requests the minimal and target Android SDK version. Setting the version line requests the minimal and target Android SDK version. Setting the version
lower than this (or accidentally omitting this element) will enable the lower than this (or accidentally omitting this element) will enable the
[Screen Compatibility Mode](http://www.androiddocs.com/guide/practices/screen-compat-mode.html), [Screen Compatibility Mode](https://developer.android.com/guide/topics/manifest/supports-screens-element#compat-mode),
which doesn't report events in coordinates that match underlying framebuffer which doesn't report events in coordinates that match underlying framebuffer
pixel size. That is not supported by @ref Platform::AndroidApplication since pixel size. That is not supported by @ref Platform::AndroidApplication since
there's [no reliable way](https://stackoverflow.com/q/17481341) to get the there's [no reliable way](https://stackoverflow.com/q/17481341) to get the

7
doc/platforms-html5.dox
Unescape View File

@ -38,8 +38,7 @@ namespace Magnum {
@todoc static plugins @todoc static plugins
The following guide explains basic workflow of using The following guide explains basic workflow of using
[Emscripten](http://kripken.github.io/emscripten-site/) for deploying HTML5 [Emscripten](https://emscripten.org) for deploying HTML5 apps using WebGL.
apps using WebGL.
At the very least you need to have Emscripten installed. Running console At the very least you need to have Emscripten installed. Running console
applications requires Node.js, running browser apps require a webserver that's applications requires Node.js, running browser apps require a webserver that's
@ -559,8 +558,8 @@ See @ref GL-Buffer-webgl-restrictions "GL::Buffer",
documentation for more information. The corresponding sections in official documentation for more information. The corresponding sections in official
WebGL specification provide even more detail: WebGL specification provide even more detail:
- [Differences Between WebGL and OpenGL ES 2.0](http://www.khronos.org/registry/webgl/specs/latest/1.0/#6) - [Differences Between WebGL and OpenGL ES 2.0](https://registry.khronos.org/webgl/specs/latest/1.0/#6)
- [Differences Between WebGL and OpenGL ES 3.0](https://www.khronos.org/registry/webgl/specs/latest/2.0/#5) - [Differences Between WebGL and OpenGL ES 3.0](https://registry.khronos.org/webgl/specs/latest/2.0/#5)
@subsection platforms-html5-webgl-timer-queries Timer queries not available in the browser @subsection platforms-html5-webgl-timer-queries Timer queries not available in the browser

2
doc/platforms-vk.dox
Unescape View File

@ -116,7 +116,7 @@ Qualcomm best practices:
Various useful links: Various useful links:
- [Yet another blog explaining Vulkan synchronization](http://themaister.net/blog/2019/08/14/yet-another-blog-explaining-vulkan-synchronization/) - [Yet another blog explaining Vulkan synchronization](https://themaister.net/blog/2019/08/14/yet-another-blog-explaining-vulkan-synchronization/)
- [Writing an efficient Vulkan renderer](https://zeux.io/2020/02/27/writing-an-efficient-vulkan-renderer/) - [Writing an efficient Vulkan renderer](https://zeux.io/2020/02/27/writing-an-efficient-vulkan-renderer/)
- [Custom memory allocators](https://rastergrid.com/blog/sw-eng/2021/03/custom-memory-allocators/) - [Custom memory allocators](https://rastergrid.com/blog/sw-eng/2021/03/custom-memory-allocators/)

2
modules/FindEGL.cmake
Unescape View File

@ -69,7 +69,7 @@ find_package_handle_standard_args(EGL DEFAULT_MSG
if(NOT TARGET EGL::EGL) if(NOT TARGET EGL::EGL)
# Work around BUGGY framework support on macOS. Do this also in case of # Work around BUGGY framework support on macOS. Do this also in case of
# Emscripten, since there we don't have a location either. # Emscripten, since there we don't have a location either.
# http://public.kitware.com/pipermail/cmake/2016-April/063179.html # https://cmake.org/pipermail/cmake/2016-April/063179.html
if((APPLE AND EGL_LIBRARY MATCHES "\\.framework$") OR CORRADE_TARGET_EMSCRIPTEN) if((APPLE AND EGL_LIBRARY MATCHES "\\.framework$") OR CORRADE_TARGET_EMSCRIPTEN)
add_library(EGL::EGL INTERFACE IMPORTED) add_library(EGL::EGL INTERFACE IMPORTED)
set_property(TARGET EGL::EGL APPEND PROPERTY set_property(TARGET EGL::EGL APPEND PROPERTY

2
modules/FindOpenAL.cmake
Unescape View File

@ -166,7 +166,7 @@ find_package_handle_standard_args(OpenAL DEFAULT_MSG
if(NOT TARGET OpenAL::OpenAL) if(NOT TARGET OpenAL::OpenAL)
# Work around BUGGY framework support on macOS. Do this also in case of # Work around BUGGY framework support on macOS. Do this also in case of
# Emscripten, since there we don't have a location either. # Emscripten, since there we don't have a location either.
# http://public.kitware.com/pipermail/cmake/2016-April/063179.html # https://cmake.org/pipermail/cmake/2016-April/063179.html
if((APPLE AND OPENAL_LIBRARY MATCHES "\\.framework$") OR CORRADE_TARGET_EMSCRIPTEN) if((APPLE AND OPENAL_LIBRARY MATCHES "\\.framework$") OR CORRADE_TARGET_EMSCRIPTEN)
add_library(OpenAL::OpenAL INTERFACE IMPORTED) add_library(OpenAL::OpenAL INTERFACE IMPORTED)
set_property(TARGET OpenAL::OpenAL APPEND PROPERTY set_property(TARGET OpenAL::OpenAL APPEND PROPERTY

2
modules/FindOpenGLES2.cmake
Unescape View File

@ -64,7 +64,7 @@ find_package_handle_standard_args(OpenGLES2 DEFAULT_MSG
if(NOT TARGET OpenGLES2::OpenGLES2) if(NOT TARGET OpenGLES2::OpenGLES2)
# Work around BUGGY framework support on macOS. Do this also in case of # Work around BUGGY framework support on macOS. Do this also in case of
# Emscripten, since there we don't have a location either. # Emscripten, since there we don't have a location either.
# http://public.kitware.com/pipermail/cmake/2016-April/063179.html # https://cmake.org/pipermail/cmake/2016-April/063179.html
if((CORRADE_TARGET_APPLE AND OPENGLES2_LIBRARY MATCHES "\\.framework$") OR CORRADE_TARGET_EMSCRIPTEN) if((CORRADE_TARGET_APPLE AND OPENGLES2_LIBRARY MATCHES "\\.framework$") OR CORRADE_TARGET_EMSCRIPTEN)
add_library(OpenGLES2::OpenGLES2 INTERFACE IMPORTED) add_library(OpenGLES2::OpenGLES2 INTERFACE IMPORTED)
set_property(TARGET OpenGLES2::OpenGLES2 APPEND PROPERTY set_property(TARGET OpenGLES2::OpenGLES2 APPEND PROPERTY

2
modules/FindOpenGLES3.cmake
Unescape View File

@ -69,7 +69,7 @@ find_package_handle_standard_args("OpenGLES3" DEFAULT_MSG
if(NOT TARGET OpenGLES3::OpenGLES3) if(NOT TARGET OpenGLES3::OpenGLES3)
# Work around BUGGY framework support on macOS. Do this also in case of # Work around BUGGY framework support on macOS. Do this also in case of
# Emscripten, since there we don't have a location either. # Emscripten, since there we don't have a location either.
# http://public.kitware.com/pipermail/cmake/2016-April/063179.html # https://cmake.org/pipermail/cmake/2016-April/063179.html
if((CORRADE_TARGET_APPLE AND OPENGLES3_LIBRARY MATCHES "\\.framework$") OR CORRADE_TARGET_EMSCRIPTEN) if((CORRADE_TARGET_APPLE AND OPENGLES3_LIBRARY MATCHES "\\.framework$") OR CORRADE_TARGET_EMSCRIPTEN)
add_library(OpenGLES3::OpenGLES3 INTERFACE IMPORTED) add_library(OpenGLES3::OpenGLES3 INTERFACE IMPORTED)
set_property(TARGET OpenGLES3::OpenGLES3 APPEND PROPERTY set_property(TARGET OpenGLES3::OpenGLES3 APPEND PROPERTY

2
package/ci/appveyor-cache-reset.txt
Unescape View File

@ -1,3 +1,3 @@
# Increase this number every time you want to reset AppVeyor cache. # Increase this number every time you want to reset AppVeyor cache.
# http://help.appveyor.com/discussions/questions/1310-delete-cache # https://help.appveyor.com/discussions/questions/1310-delete-cache
0 0

2
src/Magnum/Animation/Easing.h
Unescape View File

@ -295,7 +295,7 @@ point as needed:
@section Animation-Easing-references References @section Animation-Easing-references References
Functions follow the common naming from Robert Penner's Easing functions, Functions follow the common naming from Robert Penner's Easing functions,
http://robertpenner.com/easing/. Implementation based on and inspired by https://robertpenner.com/easing/. Implementation based on and inspired by
https://easings.net/, https://easings.net/,
[https://github.com/warrenm/AHEasing](https://github.com/warrenm/AHEasing/blob/master/AHEasing/easing.c), [https://github.com/warrenm/AHEasing](https://github.com/warrenm/AHEasing/blob/master/AHEasing/easing.c),
[https://github.com/bkaradzic/bx](https://github.com/bkaradzic/bx/blob/master/include/bx/inline/easing.inl), [https://github.com/bkaradzic/bx](https://github.com/bkaradzic/bx/blob/master/include/bx/inline/easing.inl),

8
src/Magnum/DebugTools/ColorMap.h
Unescape View File

@ -178,7 +178,7 @@ MAGNUM_DEBUGTOOLS_EXPORT Containers::StaticArrayView<256, const Vector3ub> turbo
@thirdparty Created by [Stéfan van der Walt](https://github.com/stefanv) and @thirdparty Created by [Stéfan van der Walt](https://github.com/stefanv) and
[Nathaniel Smith](https://github.com/njsmith) for the matplotlib library [Nathaniel Smith](https://github.com/njsmith) for the matplotlib library
([source](http://bids.github.io/colormap/)), released under a ([source](https://bids.github.io/colormap/)), released under a
@m_class{m-label m-primary} **CC0** license @m_class{m-label m-primary} **CC0** license
([choosealicense.com](https://choosealicense.com/licenses/cc0-1.0/)). ([choosealicense.com](https://choosealicense.com/licenses/cc0-1.0/)).
*/ */
@ -194,7 +194,7 @@ MAGNUM_DEBUGTOOLS_EXPORT Containers::StaticArrayView<256, const Vector3ub> magma
@thirdparty Created by [Stéfan van der Walt](https://github.com/stefanv) and @thirdparty Created by [Stéfan van der Walt](https://github.com/stefanv) and
[Nathaniel Smith](https://github.com/njsmith) for the matplotlib library [Nathaniel Smith](https://github.com/njsmith) for the matplotlib library
([source](http://bids.github.io/colormap/)), released under a ([source](https://bids.github.io/colormap/)), released under a
@m_class{m-label m-primary} **CC0** license @m_class{m-label m-primary} **CC0** license
([choosealicense.com](https://choosealicense.com/licenses/cc0-1.0/)). ([choosealicense.com](https://choosealicense.com/licenses/cc0-1.0/)).
*/ */
@ -210,7 +210,7 @@ MAGNUM_DEBUGTOOLS_EXPORT Containers::StaticArrayView<256, const Vector3ub> plasm
@thirdparty Created by [Stéfan van der Walt](https://github.com/stefanv) and @thirdparty Created by [Stéfan van der Walt](https://github.com/stefanv) and
[Nathaniel Smith](https://github.com/njsmith) for the matplotlib library [Nathaniel Smith](https://github.com/njsmith) for the matplotlib library
([source](http://bids.github.io/colormap/)), released under a ([source](https://bids.github.io/colormap/)), released under a
@m_class{m-label m-primary} **CC0** license @m_class{m-label m-primary} **CC0** license
([choosealicense.com](https://choosealicense.com/licenses/cc0-1.0/)). ([choosealicense.com](https://choosealicense.com/licenses/cc0-1.0/)).
*/ */
@ -226,7 +226,7 @@ MAGNUM_DEBUGTOOLS_EXPORT Containers::StaticArrayView<256, const Vector3ub> infer
@thirdparty Created by [Stéfan van der Walt](https://github.com/stefanv) and @thirdparty Created by [Stéfan van der Walt](https://github.com/stefanv) and
[Nathaniel Smith](https://github.com/njsmith) for the matplotlib library [Nathaniel Smith](https://github.com/njsmith) for the matplotlib library
based on a design by Eric Firing ([source](http://bids.github.io/colormap/)), based on a design by Eric Firing ([source](https://bids.github.io/colormap/)),
released under a @m_class{m-label m-primary} **CC0** license released under a @m_class{m-label m-primary} **CC0** license
([choosealicense.com](https://choosealicense.com/licenses/cc0-1.0/)). ([choosealicense.com](https://choosealicense.com/licenses/cc0-1.0/)).
*/ */

2
src/Magnum/GL/Implementation/driverSpecific.cpp
Unescape View File

@ -626,7 +626,7 @@ auto Context::detectedDriver() -> DetectedDrivers {
/* Otherwise try to detect a D3D ANGLE backend by querying line width. /* Otherwise try to detect a D3D ANGLE backend by querying line width.
It's always exactly just 1 on D3D, usually (but not always) more on It's always exactly just 1 on D3D, usually (but not always) more on
GL, not sure about Metal. So this is not a 100% match. Sources: GL, not sure about Metal. So this is not a 100% match. Sources:
http://stackoverflow.com/a/20149090 and http://webglreport.com */ https://stackoverflow.com/a/20149090 and https://webglreport.com */
else { else {
Range1Di range; Range1Di range;
glGetIntegerv(GL_ALIASED_LINE_WIDTH_RANGE, range.data()); glGetIntegerv(GL_ALIASED_LINE_WIDTH_RANGE, range.data());

2
src/Magnum/Magnum.h
Unescape View File

@ -154,7 +154,7 @@ Defined if the engine is built for OpenGL ES 3.0 or OpenGL ES 2.0.
Defined if the engine is built for WebGL (using Emscripten). WebGL 1 is nearly Defined if the engine is built for WebGL (using Emscripten). WebGL 1 is nearly
equivalent to OpenGL ES 2.0 and WebGL 2 to OpenGL ES 3.0, thus in most cases equivalent to OpenGL ES 2.0 and WebGL 2 to OpenGL ES 3.0, thus in most cases
you don't need to treat it differently, but there are some specific you don't need to treat it differently, but there are some specific
restrictions and differences [compared to OpenGL ES 2.0](http://www.khronos.org/registry/webgl/specs/latest/1.0/#6) restrictions and differences [compared to OpenGL ES 2.0](https://registry.khronos.org/webgl/specs/latest/1.0/#6)
and to [OpenGL ES 3.0](https://registry.khronos.org/webgl/specs/latest/2.0/#5) and to [OpenGL ES 3.0](https://registry.khronos.org/webgl/specs/latest/2.0/#5)
which you might want to be aware of. Implies also @ref MAGNUM_TARGET_GLES. which you might want to be aware of. Implies also @ref MAGNUM_TARGET_GLES.
@see @ref MAGNUM_TARGET_GLES2 @ref CORRADE_TARGET_EMSCRIPTEN, @ref building, @ref cmake @see @ref MAGNUM_TARGET_GLES2 @ref CORRADE_TARGET_EMSCRIPTEN, @ref building, @ref cmake

2
src/Magnum/Math/Algorithms/GaussJordan.h
Unescape View File

@ -52,7 +52,7 @@ backsubstitution is done only on @p t, as @p a would always end with identity
matrix anyway. matrix anyway.
Based on an ultra-compact Python code by Jarno Elonen, Based on an ultra-compact Python code by Jarno Elonen,
http://elonen.iki.fi/code/misc-notes/python-gaussj/index.html. https://elonen.iki.fi/code/misc-notes/python-gaussj/.
*/ */
template<std::size_t size, std::size_t rows, class T> bool gaussJordanInPlaceTransposed(RectangularMatrix<size, size, T>& a, RectangularMatrix<size, rows, T>& t) { template<std::size_t size, std::size_t rows, class T> bool gaussJordanInPlaceTransposed(RectangularMatrix<size, size, T>& a, RectangularMatrix<size, rows, T>& t) {
for(std::size_t row = 0; row != size; ++row) { for(std::size_t row = 0; row != size; ++row) {

4
src/Magnum/Math/Distance.h
Unescape View File

@ -126,7 +126,7 @@ defined by @f$ \boldsymbol{a} @f$ and @f$ \boldsymbol{b} @f$ using a
d = \frac{|(\boldsymbol b - \boldsymbol a) \times (\boldsymbol a - \boldsymbol p)|}{|\boldsymbol b - \boldsymbol a|} d = \frac{|(\boldsymbol b - \boldsymbol a) \times (\boldsymbol a - \boldsymbol p)|}{|\boldsymbol b - \boldsymbol a|}
= \frac{|(\boldsymbol b - \boldsymbol a)_\bot \cdot (\boldsymbol a - \boldsymbol p)|}{|\boldsymbol b - \boldsymbol a|} = \frac{|(\boldsymbol b - \boldsymbol a)_\bot \cdot (\boldsymbol a - \boldsymbol p)|}{|\boldsymbol b - \boldsymbol a|}
@f] @f]
Source: http://mathworld.wolfram.com/Point-LineDistance2-Dimensional.html Source: https://mathworld.wolfram.com/Point-LineDistance2-Dimensional.html
@see @ref linePointSquared(const Vector2<T>&, const Vector2<T>&, const Vector2<T>&), @see @ref linePointSquared(const Vector2<T>&, const Vector2<T>&, const Vector2<T>&),
@ref linePoint(const Vector3<T>&, const Vector3<T>&, const Vector3<T>&) @ref linePoint(const Vector3<T>&, const Vector3<T>&, const Vector3<T>&)
*/ */
@ -158,7 +158,7 @@ defined by @f$ \boldsymbol{a} @f$ and @f$ \boldsymbol{b} @f$ using a
@ref cross(const Vector3<T>&, const Vector3<T>&) "cross product": @f[ @ref cross(const Vector3<T>&, const Vector3<T>&) "cross product": @f[
d = \frac{|(\boldsymbol b - \boldsymbol a) \times (\boldsymbol a - \boldsymbol p)|}{|\boldsymbol b - \boldsymbol a|} d = \frac{|(\boldsymbol b - \boldsymbol a) \times (\boldsymbol a - \boldsymbol p)|}{|\boldsymbol b - \boldsymbol a|}
@f] @f]
Source: http://mathworld.wolfram.com/Point-LineDistance3-Dimensional.html Source: https://mathworld.wolfram.com/Point-LineDistance3-Dimensional.html
@see @ref linePointSquared(const Vector3<T>&, const Vector3<T>&, const Vector3<T>&), @see @ref linePointSquared(const Vector3<T>&, const Vector3<T>&, const Vector3<T>&),
@ref linePoint(const Vector2<T>&, const Vector2<T>&, const Vector2<T>&) @ref linePoint(const Vector2<T>&, const Vector2<T>&, const Vector2<T>&)
*/ */

2
src/Magnum/Math/Intersection.h
Unescape View File

@ -242,7 +242,7 @@ The purpose for this is to reduce the number of times you have to compute
a ray inverse, when doing multiple ray / range intersections (for example a ray inverse, when doing multiple ray / range intersections (for example
when traversing an AABB tree). The algorithm implemented is a version of the when traversing an AABB tree). The algorithm implemented is a version of the
classical slabs algorithm, see *Listing 1* in classical slabs algorithm, see *Listing 1* in
[Majercik et al.](http://jcgt.org/published/0007/03/04/). [Majercik et al.](https://jcgt.org/published/0007/03/04/).
@see @ref MeshTools::boundingRange() @see @ref MeshTools::boundingRange()
*/ */
template<class T> bool rayRange(const Vector3<T>& rayOrigin, const Vector3<T>& inverseRayDirection, const Range3D<T>& range); template<class T> bool rayRange(const Vector3<T>& rayOrigin, const Vector3<T>& inverseRayDirection, const Range3D<T>& range);

6
src/Magnum/Math/Test/ColorTest.cpp
Unescape View File

@ -1099,8 +1099,8 @@ void ColorTest::srgb8bitRoundtrip() {
} }
void ColorTest::xyz() { void ColorTest::xyz() {
/* Verified using http://colormine.org/convert/rgb-to-xyz and /* Verified using https://colormine.org/convert/rgb-to-xyz and
http://www.easyrgb.com/index.php?X=CALC. The results have slight https://www.easyrgb.com/en/convert.php. The results have slight
precision differences, because most of the code out there uses just the precision differences, because most of the code out there uses just the
rounded matrices from Wikipedia which don't round-trip perfectly. I'm rounded matrices from Wikipedia which don't round-trip perfectly. I'm
having Y in 0-1 instead of 0-100, thus the values are 100 times smaller. */ having Y in 0-1 instead of 0-100, thus the values are 100 times smaller. */
@ -1155,7 +1155,7 @@ void ColorTest::fromXyzDefaultAlpha() {
} }
void ColorTest::xyY() { void ColorTest::xyY() {
/* Verified using http://www.easyrgb.com/index.php?X=CALC */ /* Verified using https://www.easyrgb.com/en/convert.php */
Vector3 xyz{0.454279f, 0.413092f, 0.0607124f}; Vector3 xyz{0.454279f, 0.413092f, 0.0607124f};
Vector3 xyY{0.489481f, 0.445102f, 0.413092f}; Vector3 xyY{0.489481f, 0.445102f, 0.413092f};

2
src/Magnum/Math/TypeTraits.h
Unescape View File

@ -377,7 +377,7 @@ template<class T> struct TypeTraits: Implementation::TypeTraitsDefault<T> {
* the @ref epsilon() value), pure equality comparison everywhere else. * the @ref epsilon() value), pure equality comparison everywhere else.
* The @ref Half type has representable values sparse enough that no fuzzy * The @ref Half type has representable values sparse enough that no fuzzy
* comparison needs to be done. Algorithm adapted from * comparison needs to be done. Algorithm adapted from
* http://floating-point-gui.de/errors/comparison/. * https://floating-point-gui.de/errors/comparison/.
* @see @ref Math::equal(T, T), @ref Math::notEqual(T, T) * @see @ref Math::equal(T, T), @ref Math::notEqual(T, T)
*/ */
static bool equals(T a, T b); static bool equals(T a, T b);

8
src/Magnum/PixelFormat.h
Unescape View File

@ -701,7 +701,7 @@ enum class PixelFormat: UnsignedInt {
/** /**
* 24-bit unsigned normalized depth. Data layout consistent with the * 24-bit unsigned normalized depth. Data layout consistent with the
* [KTX2 specification](http://github.khronos.org/KTX-Specification/#_depth_and_stencil_formats) * [KTX2 specification](https://github.khronos.org/KTX-Specification/ktxspec.v2.html#_depth_and_stencil_formats)
* --- aligned to 32 bits with the 8 most significant bits unused. * --- aligned to 32 bits with the 8 most significant bits unused.
* *
* Corresponds to @ref GL::PixelFormat::DepthComponent and * Corresponds to @ref GL::PixelFormat::DepthComponent and
@ -742,7 +742,7 @@ enum class PixelFormat: UnsignedInt {
/** /**
* 16-bit unsigned normalized depth with 8-bit unsigned integral stencil. * 16-bit unsigned normalized depth with 8-bit unsigned integral stencil.
* Data layout consistent with the [KTX2 specification](http://github.khronos.org/KTX-Specification/#_depth_and_stencil_formats) * Data layout consistent with the [KTX2 specification](https://github.khronos.org/KTX-Specification/ktxspec.v2.html#_depth_and_stencil_formats)
* --- aligned to 32 bits with depth in the 16 least significant bits and * --- aligned to 32 bits with depth in the 16 least significant bits and
* the 8 most significant bits unused. * the 8 most significant bits unused.
* *
@ -754,7 +754,7 @@ enum class PixelFormat: UnsignedInt {
/** /**
* 24-bit unsigned normalized depth with 8-bit unsigned integral stencil. * 24-bit unsigned normalized depth with 8-bit unsigned integral stencil.
* Data layout consistent with the [KTX2 specification](http://github.khronos.org/KTX-Specification/#_depth_and_stencil_formats) * Data layout consistent with the [KTX2 specification](https://github.khronos.org/KTX-Specification/ktxspec.v2.html#_depth_and_stencil_formats)
* --- packed to 32 bits with depth in the 24 least significant bits * --- packed to 32 bits with depth in the 24 least significant bits
* and stencil being in the 8 most significant bits. * and stencil being in the 8 most significant bits.
* *
@ -771,7 +771,7 @@ enum class PixelFormat: UnsignedInt {
/** /**
* 32-bit float depth with 8-bit unsigned integral stencil. Data layout * 32-bit float depth with 8-bit unsigned integral stencil. Data layout
* consistent with the [KTX2 specification](http://github.khronos.org/KTX-Specification/#_depth_and_stencil_formats) * consistent with the [KTX2 specification](https://github.khronos.org/KTX-Specification/ktxspec.v2.html#_depth_and_stencil_formats)
* --- packed to 64 bits with the depth in the 32 least significant * --- packed to 64 bits with the depth in the 32 least significant
* bits and the 24 most significant bits unused. * bits and the 24 most significant bits unused.
* *

2
src/Magnum/Platform/AndroidApplication.cpp
Unescape View File

@ -466,7 +466,7 @@ std::int32_t AndroidApplication::inputEvent(android_app* state, AInputEvent* eve
there's no way to reliably know what concrete mouse / pen there's no way to reliably know what concrete mouse / pen
button caused the event. */ button caused the event. */
Pointer pointer; Pointer pointer;
/* http://www.graphics.stanford.edu/~seander/bithacks.html#DetermineIfPowerOf2 */ /* https://graphics.stanford.edu/~seander/bithacks.html#DetermineIfPowerOf2 */
if(sourcePointers.second() && !(UnsignedByte(sourcePointers.second()) & (UnsignedByte(sourcePointers.second()) - 1))) if(sourcePointers.second() && !(UnsignedByte(sourcePointers.second()) & (UnsignedByte(sourcePointers.second()) - 1)))
pointer = Pointer(UnsignedByte(sourcePointers.second())); pointer = Pointer(UnsignedByte(sourcePointers.second()));
else else

2
src/Magnum/Platform/AndroidApplication.h
Unescape View File

@ -356,7 +356,7 @@ class AndroidApplication {
* @ref framebufferSize(). * @ref framebufferSize().
* *
* @attention The reported value will be incorrect in case you use * @attention The reported value will be incorrect in case you use
* the [Screen Compatibility Mode](http://www.androiddocs.com/guide/practices/screen-compat-mode.html). * the [Screen Compatibility Mode](https://developer.android.com/guide/topics/manifest/supports-screens-element#compat-mode)).
* See @ref platforms-android-apps-manifest-screen-compatibility-mode * See @ref platforms-android-apps-manifest-screen-compatibility-mode
* for details. * for details.
*/ */

12
src/Magnum/Platform/GlfwApplication.h
Unescape View File

@ -67,9 +67,9 @@ namespace Implementation {
@m_keywords{Application} @m_keywords{Application}
Application using the [GLFW](http://glfw.org) toolkit. Supports keyboard and Application using the [GLFW](https://www.glfw.org) toolkit. Supports keyboard
mouse handling with support for changing cursor and mouse tracking and warping. and mouse handling with support for changing cursor and mouse tracking and
Available on all platforms where GLFW is ported. warping. Available on all platforms where GLFW is ported.
@m_class{m-block m-success} @m_class{m-block m-success}
@ -100,9 +100,9 @@ See @ref cmake for more information.
@section Platform-GlfwApplication-usage General usage @section Platform-GlfwApplication-usage General usage
This application library depends on [GLFW](http://glfw.org) 3.2 and newer and This application library depends on [GLFW](https://www.glfw.org) 3.2 and newer
is built if `MAGNUM_WITH_GLFWAPPLICATION` is enabled when building Magnum. To use and is built if `MAGNUM_WITH_GLFWAPPLICATION` is enabled when building Magnum.
this library with CMake, request the `GlfwApplication` component of the To use this library with CMake, request the `GlfwApplication` component of the
`Magnum` package and link to the `Magnum::GlfwApplication` target: `Magnum` package and link to the `Magnum::GlfwApplication` target:
@code{.cmake} @code{.cmake}

12
src/Magnum/Platform/Implementation/DpiScaling.cpp
Unescape View File

@ -82,27 +82,27 @@ Float x11DpiScaling() {
won't be and that's okay -- it may be using Wayland or something else. */ won't be and that's okay -- it may be using Wayland or something else. */
void* xlib = dlopen(nullptr, RTLD_NOW|RTLD_GLOBAL); void* xlib = dlopen(nullptr, RTLD_NOW|RTLD_GLOBAL);
Containers::ScopeGuard closeXlib{xlib, dlclose}; Containers::ScopeGuard closeXlib{xlib, dlclose};
#ifdef CORRADE_TARGET_GCC /* http://www.mr-edd.co.uk/blog/supressing_gcc_warnings */ #ifdef CORRADE_TARGET_GCC /* https://web.archive.org/web/20160826013457/http://www.mr-edd.co.uk/blog/supressing_gcc_warnings */
__extension__ __extension__
#endif #endif
auto xOpenDisplay = reinterpret_cast<Display*(*)(char*)>(dlsym(xlib, "XOpenDisplay")); auto xOpenDisplay = reinterpret_cast<Display*(*)(char*)>(dlsym(xlib, "XOpenDisplay"));
#ifdef CORRADE_TARGET_GCC /* http://www.mr-edd.co.uk/blog/supressing_gcc_warnings */ #ifdef CORRADE_TARGET_GCC /* see above */
__extension__ __extension__
#endif #endif
auto xCloseDisplay = reinterpret_cast<int(*)(Display*)>(dlsym(xlib, "XCloseDisplay")); auto xCloseDisplay = reinterpret_cast<int(*)(Display*)>(dlsym(xlib, "XCloseDisplay"));
#ifdef CORRADE_TARGET_GCC /* http://www.mr-edd.co.uk/blog/supressing_gcc_warnings */ #ifdef CORRADE_TARGET_GCC /* see above */
__extension__ __extension__
#endif #endif
auto xResourceManagerString = reinterpret_cast<char*(*)(Display*)>(dlsym(xlib, "XResourceManagerString")); auto xResourceManagerString = reinterpret_cast<char*(*)(Display*)>(dlsym(xlib, "XResourceManagerString"));
#ifdef CORRADE_TARGET_GCC /* http://www.mr-edd.co.uk/blog/supressing_gcc_warnings */ #ifdef CORRADE_TARGET_GCC /* see above */
__extension__ __extension__
#endif #endif
auto xrmGetStringDatabase = reinterpret_cast<XrmDatabase(*)(const char*)>(dlsym(xlib, "XrmGetStringDatabase")); auto xrmGetStringDatabase = reinterpret_cast<XrmDatabase(*)(const char*)>(dlsym(xlib, "XrmGetStringDatabase"));
#ifdef CORRADE_TARGET_GCC /* http://www.mr-edd.co.uk/blog/supressing_gcc_warnings */ #ifdef CORRADE_TARGET_GCC /* see above */
__extension__ __extension__
#endif #endif
auto xrmGetResource = reinterpret_cast<int(*)(XrmDatabase, const char*, const char*, char**, XrmValue*)>(dlsym(xlib, "XrmGetResource")); auto xrmGetResource = reinterpret_cast<int(*)(XrmDatabase, const char*, const char*, char**, XrmValue*)>(dlsym(xlib, "XrmGetResource"));
#ifdef CORRADE_TARGET_GCC /* http://www.mr-edd.co.uk/blog/supressing_gcc_warnings */ #ifdef CORRADE_TARGET_GCC /* see above */
__extension__ __extension__
#endif #endif
auto xrmDestroyDatabase = reinterpret_cast<void(*)(XrmDatabase)>(dlsym(xlib, "XrmDestroyDatabase")); auto xrmDestroyDatabase = reinterpret_cast<void(*)(XrmDatabase)>(dlsym(xlib, "XrmDestroyDatabase"));

6
src/Magnum/Platform/Sdl2Application.h
Unescape View File

@ -113,7 +113,7 @@ namespace Implementation {
@m_keywords{Application} @m_keywords{Application}
Application using the [Simple DirectMedia Layer](http://www.libsdl.org/) Application using the [Simple DirectMedia Layer](https://www.libsdl.org)
toolkit. Supports keyboard and mouse handling. This application library is toolkit. Supports keyboard and mouse handling. This application library is
available for all platforms for which SDL2 is ported except Android (thus is available for all platforms for which SDL2 is ported except Android (thus is
avaiable also on @ref CORRADE_TARGET_EMSCRIPTEN "Emscripten", see respective avaiable also on @ref CORRADE_TARGET_EMSCRIPTEN "Emscripten", see respective
@ -124,7 +124,7 @@ sections in @ref building-corrade-cross-emscripten "Corrade's" and
@thirdparty This plugin makes use of the [SDL2](https://www.libsdl.org/) @thirdparty This plugin makes use of the [SDL2](https://www.libsdl.org/)
library, released under the @m_class{m-label m-success} **zlib license** library, released under the @m_class{m-label m-success} **zlib license**
([license text](http://www.gzip.org/zlib/zlib_license.html), ([license text](https://zlib.net/zlib_license.html),
[choosealicense.com](https://choosealicense.com/licenses/zlib/)). [choosealicense.com](https://choosealicense.com/licenses/zlib/)).
Attribution is appreciated but not required. Attribution is appreciated but not required.
@ -221,7 +221,7 @@ final package along with a PowerShell script for easy local installation.
@section Platform-Sdl2Application-usage General usage @section Platform-Sdl2Application-usage General usage
This application library depends on the [SDL2](http://www.libsdl.org) library This application library depends on the [SDL2](https://www.libsdl.org) library
version 2.0.6 and newer. On Emscripten, the builtin minimal SDL implementation version 2.0.6 and newer. On Emscripten, the builtin minimal SDL implementation
is used. The application library is built if `MAGNUM_WITH_SDL2APPLICATION` is is used. The application library is built if `MAGNUM_WITH_SDL2APPLICATION` is
enabled when building Magnum. To use this library with CMake, request the enabled when building Magnum. To use this library with CMake, request the

2
src/Magnum/Platform/WindowlessWglApplication.cpp
Unescape View File

@ -122,7 +122,7 @@ WindowlessWglContext::WindowlessWglContext(const Configuration& configuration, G
/* Get pointer to proper context creation function */ /* Get pointer to proper context creation function */
typedef HGLRC(WINAPI*PFNWGLCREATECONTEXTATTRIBSARBPROC)(HDC, HGLRC, const int*); typedef HGLRC(WINAPI*PFNWGLCREATECONTEXTATTRIBSARBPROC)(HDC, HGLRC, const int*);
#ifdef CORRADE_TARGET_GCC #ifdef CORRADE_TARGET_GCC
__extension__ /* http://web.archive.org/web/20160826013457/http://www.mr-edd.co.uk/blog/supressing_gcc_warnings */ __extension__ /* https://web.archive.org/web/20160826013457/http://www.mr-edd.co.uk/blog/supressing_gcc_warnings */
#endif #endif
const PFNWGLCREATECONTEXTATTRIBSARBPROC wglCreateContextAttribsARB = reinterpret_cast<PFNWGLCREATECONTEXTATTRIBSARBPROC>( wglGetProcAddress(reinterpret_cast<LPCSTR>("wglCreateContextAttribsARB"))); const PFNWGLCREATECONTEXTATTRIBSARBPROC wglCreateContextAttribsARB = reinterpret_cast<PFNWGLCREATECONTEXTATTRIBSARBPROC>( wglGetProcAddress(reinterpret_cast<LPCSTR>("wglCreateContextAttribsARB")));

2
src/Magnum/Primitives/Cube.cpp
Unescape View File

@ -592,7 +592,7 @@ constexpr struct VertexSolidStrip {
} VerticesSolidStrip[]{ } VerticesSolidStrip[]{
/* Sources: /* Sources:
https://twitter.com/Donzanoid/status/436843034966507520 https://twitter.com/Donzanoid/status/436843034966507520
http://www.asmcommunity.net/forums/topic/?id=6284#post-45209 https://www.asmcommunity.net/forums/topic/6284/#post-45209
https://gist.github.com/cdwfs/2cab675b333632d940cf https://gist.github.com/cdwfs/2cab675b333632d940cf
0---2---3---1 0---2---3---1

2
src/Magnum/SceneGraph/AbstractGroupedFeature.h
Unescape View File

@ -44,7 +44,7 @@ Used together with @ref FeatureGroup.
@section SceneGraph-AbstractGroupedFeature-subclassing Subclassing @section SceneGraph-AbstractGroupedFeature-subclassing Subclassing
Usage is via subclassing the feature using [CRTP](http://en.wikipedia.org/wiki/Curiously_recurring_template_pattern) Usage is via subclassing the feature using [CRTP](https://en.wikipedia.org/wiki/Curiously_recurring_template_pattern)
and @cpp typedef @ce'ing @ref FeatureGroup to accept only given type, e.g.: and @cpp typedef @ce'ing @ref FeatureGroup to accept only given type, e.g.:
@snippet SceneGraph.cpp AbstractGroupedFeature-subclassing @snippet SceneGraph.cpp AbstractGroupedFeature-subclassing

2
src/Magnum/Vk/CommandBuffer.h
Unescape View File

@ -449,7 +449,7 @@ class MAGNUM_VK_EXPORT CommandBuffer {
* @par * @par
* Even though it may seem counterintuitive, it's recommended * Even though it may seem counterintuitive, it's recommended
* ([1](https://github.com/KhronosGroup/Vulkan-Docs/wiki/Synchronization-Examples#three-dispatches-first-dispatch-writes-to-one-storage-buffer-second-dispatch-writes-to-a-different-storage-buffer-third-dispatch-reads-both), * ([1](https://github.com/KhronosGroup/Vulkan-Docs/wiki/Synchronization-Examples#three-dispatches-first-dispatch-writes-to-one-storage-buffer-second-dispatch-writes-to-a-different-storage-buffer-third-dispatch-reads-both),
* [2](http://themaister.net/blog/2019/08/14/yet-another-blog-explaining-vulkan-synchronization/)) * [2](https://themaister.net/blog/2019/08/14/yet-another-blog-explaining-vulkan-synchronization/))
* to do global memory barriers than per-resource barriers, except * to do global memory barriers than per-resource barriers, except
* for cases where layout transition or queue ownership transfer * for cases where layout transition or queue ownership transfer
* needs to be done on a particular image or buffer. * needs to be done on a particular image or buffer.

6
src/MagnumPlugins/AnyImageImporter/AnyImageImporter.cpp
Unescape View File

@ -215,7 +215,7 @@ void AnyImageImporter::doOpenData(Containers::Array<char>&& data, DataFlags) {
/* https://docs.microsoft.com/cs-cz/windows/desktop/direct3ddds/dx-graphics-dds-pguide */ /* https://docs.microsoft.com/cs-cz/windows/desktop/direct3ddds/dx-graphics-dds-pguide */
else if(dataString.hasPrefix("DDS "_s)) else if(dataString.hasPrefix("DDS "_s))
plugin = "DdsImporter"_s; plugin = "DdsImporter"_s;
/* http://www.openexr.com/openexrfilelayout.pdf */ /* https://openexr.com/en/latest/OpenEXRFileLayout.html#magic-number */
else if(dataString.hasPrefix("\x76\x2f\x31\x01"_s)) else if(dataString.hasPrefix("\x76\x2f\x31\x01"_s))
plugin = "OpenExrImporter"_s; plugin = "OpenExrImporter"_s;
/* https://en.wikipedia.org/wiki/Radiance_(software)#HDR_image_format and /* https://en.wikipedia.org/wiki/Radiance_(software)#HDR_image_format and
@ -247,8 +247,8 @@ void AnyImageImporter::doOpenData(Containers::Array<char>&& data, DataFlags) {
/* https://en.wikipedia.org/wiki/Portable_Network_Graphics#File_header */ /* https://en.wikipedia.org/wiki/Portable_Network_Graphics#File_header */
} else if(dataString.hasPrefix("\x89PNG\x0d\x0a\x1a\x0a"_s)) } else if(dataString.hasPrefix("\x89PNG\x0d\x0a\x1a\x0a"_s))
plugin = "PngImporter"_s; plugin = "PngImporter"_s;
/* http://paulbourke.net/dataformats/tiff/, /* https://paulbourke.net/dataformats/tiff/,
http://paulbourke.net/dataformats/tiff/tiff_summary.pdf */ https://paulbourke.net/dataformats/tiff/tiff_summary.pdf */
else if(dataString.hasPrefix("II\x2a\x00"_s) || else if(dataString.hasPrefix("II\x2a\x00"_s) ||
dataString.hasPrefix("MM\x00\x2a"_s)) dataString.hasPrefix("MM\x00\x2a"_s))
plugin = "TiffImporter"_s; plugin = "TiffImporter"_s;

4
src/MagnumPlugins/TgaImporter/TgaImporter.cpp
Unescape View File

@ -96,7 +96,7 @@ Containers::Optional<ImageData2D> TgaImporter::doImage2D(UnsignedInt, UnsignedIn
return {}; return {};
} }
/* RLE encoding. Reference: http://www.paulbourke.net/dataformats/tga/ */ /* RLE encoding. Reference: https://paulbourke.net/dataformats/tga/ */
const bool rle = (header.imageType & 8); const bool rle = (header.imageType & 8);
/* Color */ /* Color */
@ -201,7 +201,7 @@ Containers::Optional<ImageData2D> TgaImporter::doImage2D(UnsignedInt, UnsignedIn
} else { } else {
Containers::ArrayView<char> dstPixels = data; Containers::ArrayView<char> dstPixels = data;
while(!srcPixels.isEmpty()) { while(!srcPixels.isEmpty()) {
/* Reference: http://www.paulbourke.net/dataformats/tga/ */ /* Reference: https://paulbourke.net/dataformats/tga/ */
/* 8-bit RLE header. First bit denotes the operation, last 7 bits /* 8-bit RLE header. First bit denotes the operation, last 7 bits
denotes operation count minus 1. */ denotes operation count minus 1. */

2
src/dummy.cpp
Unescape View File

@ -28,4 +28,4 @@
library target from OBJECT sources only and you have to provide at least one library target from OBJECT sources only and you have to provide at least one
file. Otherwise the generated library gets replaced with self-pointing file. Otherwise the generated library gets replaced with self-pointing
symlink and the build then obviously fails with "File not found" error. symlink and the build then obviously fails with "File not found" error.
Related: http://public.kitware.com/pipermail/cmake/2016-April/063178.html */ Related: https://cmake.org/pipermail/cmake/2016-April/063178.html */

Write Preview
Loading…
Cancel
Save