Browse Source

Workaround for that one damn Doxygen bug.

pull/197/head
Vladimír Vondruš 9 years ago
parent
commit
025ef780b2
  1. 7
      src/Magnum/Math/Matrix.h
  2. 7
      src/Magnum/Math/Matrix3.h
  3. 7
      src/Magnum/Math/Matrix4.h
  4. 7
      src/Magnum/Math/RectangularMatrix.h
  5. 7
      src/Magnum/Shaders/DistanceFieldVector.h
  6. 7
      src/Magnum/Shaders/Vector.h

7
src/Magnum/Math/Matrix.h

@ -113,7 +113,12 @@ template<std::size_t size, class T> class Matrix: public RectangularMatrix<size,
template<class ...U> constexpr /*implicit*/ Matrix(const Vector<size, T>& first, const U&... next) noexcept: RectangularMatrix<size, size, T>(first, next...) {}
/** @brief Construct matrix with one value for all elements */
constexpr explicit Matrix(T value) noexcept: RectangularMatrix<size, size, T>{typename Implementation::GenerateSequence<size>::Type(), value} {}
constexpr explicit Matrix(T value) noexcept
/** @todoc remove workaround when doxygen is sane */
#ifndef DOXYGEN_GENERATING_OUTPUT
: RectangularMatrix<size, size, T>{typename Implementation::GenerateSequence<size>::Type(), value}
#endif
{}
/**
* @brief Construct matrix from another of different type

7
src/Magnum/Math/Matrix3.h

@ -231,7 +231,12 @@ template<class T> class Matrix3: public Matrix3x3<T> {
constexpr /*implicit*/ Matrix3(const Vector3<T>& first, const Vector3<T>& second, const Vector3<T>& third) noexcept: Matrix3x3<T>(first, second, third) {}
/** @brief Construct matrix with one value for all elements */
constexpr explicit Matrix3(T value) noexcept: Matrix3x3<T>{value} {}
constexpr explicit Matrix3(T value) noexcept
/** @todoc remove workaround when doxygen is sane */
#ifndef DOXYGEN_GENERATING_OUTPUT
: Matrix3x3<T>{value}
#endif
{}
/** @copydoc Matrix::Matrix(const RectangularMatrix<size, size, U>&) */
template<class U> constexpr explicit Matrix3(const RectangularMatrix<3, 3, U>& other) noexcept: Matrix3x3<T>(other) {}

7
src/Magnum/Math/Matrix4.h

@ -402,7 +402,12 @@ template<class T> class Matrix4: public Matrix4x4<T> {
constexpr /*implicit*/ Matrix4(const Vector4<T>& first, const Vector4<T>& second, const Vector4<T>& third, const Vector4<T>& fourth) noexcept: Matrix4x4<T>(first, second, third, fourth) {}
/** @brief Construct matrix with one value for all elements */
constexpr explicit Matrix4(T value) noexcept: Matrix4x4<T>{value} {}
constexpr explicit Matrix4(T value) noexcept
/** @todoc remove workaround when doxygen is sane */
#ifndef DOXYGEN_GENERATING_OUTPUT
: Matrix4x4<T>{value}
#endif
{}
/** @copydoc Matrix::Matrix(const RectangularMatrix<size, size, U>&) */
template<class U> constexpr explicit Matrix4(const RectangularMatrix<4, 4, U>& other) noexcept: Matrix4x4<T>(other) {}

7
src/Magnum/Math/RectangularMatrix.h

@ -131,7 +131,12 @@ template<std::size_t cols, std::size_t rows, class T> class RectangularMatrix {
}
/** @brief Construct matrix with one value for all components */
constexpr explicit RectangularMatrix(T value) noexcept: RectangularMatrix{typename Implementation::GenerateSequence<cols>::Type(), value} {}
constexpr explicit RectangularMatrix(T value) noexcept
/** @todoc remove workaround when doxygen is sane */
#ifndef DOXYGEN_GENERATING_OUTPUT
: RectangularMatrix{typename Implementation::GenerateSequence<cols>::Type(), value}
#endif
{}
/**
* @brief Construct matrix from another of different type

7
src/Magnum/Shaders/DistanceFieldVector.h

@ -105,7 +105,12 @@ template<UnsignedInt dimensions> class MAGNUM_SHADERS_EXPORT DistanceFieldVector
* This function can be safely used for constructing (and later
* destructing) objects even without any OpenGL context being active.
*/
explicit DistanceFieldVector(NoCreateT) noexcept: AbstractVector<dimensions>{NoCreate} {}
explicit DistanceFieldVector(NoCreateT) noexcept
/** @todoc remove workaround when doxygen is sane */
#ifndef DOXYGEN_GENERATING_OUTPUT
: AbstractVector<dimensions>{NoCreate}
#endif
{}
/**
* @brief Set transformation and projection matrix

7
src/Magnum/Shaders/Vector.h

@ -99,7 +99,12 @@ template<UnsignedInt dimensions> class MAGNUM_SHADERS_EXPORT Vector: public Abst
* This function can be safely used for constructing (and later
* destructing) objects even without any OpenGL context being active.
*/
explicit Vector(NoCreateT) noexcept: AbstractVector<dimensions>{NoCreate} {}
explicit Vector(NoCreateT) noexcept
/** @todoc remove workaround when doxygen is sane */
#ifndef DOXYGEN_GENERATING_OUTPUT
: AbstractVector<dimensions>{NoCreate}
#endif
{}
/**
* @brief Set transformation and projection matrix

Loading…
Cancel
Save