Browse Source

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.
pull/525/head
Vladimír Vondruš 5 years ago
parent
commit
31b2bfb980
  1. 2
      doc/changelog.dox
  2. 18
      src/Magnum/Magnum.h
  3. 6
      src/Magnum/Math/Range.h

2
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

18
src/Magnum/Magnum.h

@ -845,6 +845,24 @@ typedef Math::Range2D<Float> Range2D;
/** @brief Three-dimensional float range */
typedef Math::Range3D<Float> Range3D;
/**
@brief One-dimensional unsigned integer range
@m_since_latest
*/
typedef Math::Range1D<UnsignedInt> Range1Dui;
/**
@brief Two-dimensional unsigned integer range
@m_since_latest
*/
typedef Math::Range2D<UnsignedInt> Range2Dui;
/**
@brief Three-dimensional unsigned integer range
@m_since_latest
*/
typedef Math::Range3D<UnsignedInt> Range3Dui;
/** @brief One-dimensional signed integer range */
typedef Math::Range1D<Int> Range1Di;

6
src/Magnum/Math/Range.h

@ -369,7 +369,7 @@ template<UnsignedInt dimensions, class T> 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<class T> using Range1D = Range<1, T>;
@ -380,7 +380,7 @@ template<class T> 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 T> class Range2D: public Range<2, T> {
public:
@ -534,7 +534,7 @@ template<class T> 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 T> class Range3D: public Range<3, T> {
public:

Loading…
Cancel
Save