From 31b2bfb980a85ff0cf9f78c83b2a721f3bade100 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Wed, 8 Sep 2021 17:01:11 +0200 Subject: [PATCH] Add typedefs for unsigned ranges. Later, if it proves to be useful for e.g. the SceneData, it might make sense to add 8- and 16-bit variants also. --- doc/changelog.dox | 2 ++ src/Magnum/Magnum.h | 18 ++++++++++++++++++ src/Magnum/Math/Range.h | 6 +++--- 3 files changed, 23 insertions(+), 3 deletions(-) diff --git a/doc/changelog.dox b/doc/changelog.dox index 1b2133c24..5a145fa17 100644 --- a/doc/changelog.dox +++ b/doc/changelog.dox @@ -53,6 +53,8 @@ See also: @ref DebugTools::CompareImage - New @ref Degh, @ref Radh, @ref Range1Dh, @ref Range2Dh and @ref Range3Dh typedefs for half-float angles and ranges +- New @ref Range1Dui, @ref Range2Dui and @ref Range3Dui typedefs for unsigned + integer ranges @subsubsection changelog-latest-new-debugtools DebugTools library diff --git a/src/Magnum/Magnum.h b/src/Magnum/Magnum.h index 12d7688cc..8717216a8 100644 --- a/src/Magnum/Magnum.h +++ b/src/Magnum/Magnum.h @@ -845,6 +845,24 @@ typedef Math::Range2D Range2D; /** @brief Three-dimensional float range */ typedef Math::Range3D Range3D; +/** +@brief One-dimensional unsigned integer range +@m_since_latest +*/ +typedef Math::Range1D Range1Dui; + +/** +@brief Two-dimensional unsigned integer range +@m_since_latest +*/ +typedef Math::Range2D Range2Dui; + +/** +@brief Three-dimensional unsigned integer range +@m_since_latest +*/ +typedef Math::Range3D Range3Dui; + /** @brief One-dimensional signed integer range */ typedef Math::Range1D Range1Di; diff --git a/src/Magnum/Math/Range.h b/src/Magnum/Math/Range.h index 2ad8c2df0..075b736e3 100644 --- a/src/Magnum/Math/Range.h +++ b/src/Magnum/Math/Range.h @@ -369,7 +369,7 @@ template class Range { Convenience alternative to @cpp Range<1, T> @ce. See @ref Range for more information. @see @ref Range2D, @ref Range3D, @ref Magnum::Range1D, @ref Magnum::Range1Dh, - @ref Magnum::Range1Dd, @ref Magnum::Range1Di + @ref Magnum::Range1Dd, @ref Magnum::Range1Dui, @ref Magnum::Range1Di */ #ifndef CORRADE_MSVC2015_COMPATIBILITY /* Multiple definitions still broken */ template using Range1D = Range<1, T>; @@ -380,7 +380,7 @@ template using Range1D = Range<1, T>; See @ref Range for more information. @see @ref Range1D, @ref Range3D, @ref Magnum::Range2D, @ref Magnum::Range2Dh, - @ref Magnum::Range2Dd, @ref Magnum::Range2Di + @ref Magnum::Range2Dd, @ref Magnum::Range2Dui, @ref Magnum::Range2Di */ template class Range2D: public Range<2, T> { public: @@ -534,7 +534,7 @@ template class Range2D: public Range<2, T> { See @ref Range for more information. @see @ref Range1D, @ref Range2D, @ref Magnum::Range3D, @ref Magnum::Range3Dh, - @ref Magnum::Range3Dd, @ref Magnum::Range3Di + @ref Magnum::Range3Dd, @ref Magnum::Range3Dui, @ref Magnum::Range3Di */ template class Range3D: public Range<3, T> { public: