Browse Source

Math: doc++

The TODOs were removed and put into GitHub projects to be a bit more
visible to random strangers.
pull/196/head
Vladimír Vondruš 9 years ago
parent
commit
6e10b2e205
  1. 6
      src/Magnum/Math/Matrix.h
  2. 2
      src/Magnum/Math/Matrix3.h
  3. 2
      src/Magnum/Math/Matrix4.h
  4. 10
      src/Magnum/Math/RectangularMatrix.h
  5. 10
      src/Magnum/Math/Vector.h

6
src/Magnum/Math/Matrix.h

@ -109,11 +109,7 @@ template<std::size_t size, class T> class Matrix: public RectangularMatrix<size,
#endif
{}
/**
* @brief Matrix from column vectors
* @param first First column vector
* @param next Next column vectors
*/
/** @brief Construct matrix from column vectors */
template<class ...U> constexpr /*implicit*/ Matrix(const Vector<size, T>& first, const U&... next) noexcept: RectangularMatrix<size, size, T>(first, next...) {}
/**

2
src/Magnum/Math/Matrix3.h

@ -227,7 +227,7 @@ template<class T> class Matrix3: public Matrix3x3<T> {
#endif
{}
/** @brief Matrix from column vectors */
/** @brief Construct matrix from column vectors */
constexpr /*implicit*/ Matrix3(const Vector3<T>& first, const Vector3<T>& second, const Vector3<T>& third) noexcept: Matrix3x3<T>(first, second, third) {}
/** @copydoc Matrix::Matrix(const RectangularMatrix<size, size, U>&) */

2
src/Magnum/Math/Matrix4.h

@ -398,7 +398,7 @@ template<class T> class Matrix4: public Matrix4x4<T> {
#endif
{}
/** @brief Matrix from column vectors */
/** @brief Construct matrix from column vectors */
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) {}
/** @copydoc Matrix::Matrix(const RectangularMatrix<size, size, U>&) */

10
src/Magnum/Math/RectangularMatrix.h

@ -125,13 +125,7 @@ template<std::size_t cols, std::size_t rows, class T> class RectangularMatrix {
#endif
{}
/**
* @brief Construct matrix from column vectors
* @param first First column vector
* @param next Next column vectors
*
* @todo Creating matrix from arbitrary combination of matrices with n rows
*/
/** @brief Construct matrix from column vectors */
template<class ...U> constexpr /*implicit*/ RectangularMatrix(const Vector<rows, T>& first, const U&... next) noexcept: _data{first, next...} {
static_assert(sizeof...(next)+1 == cols, "Improper number of arguments passed to RectangularMatrix constructor");
}
@ -438,7 +432,7 @@ template<std::size_t cols, std::size_t rows, class T> class RectangularMatrix {
#else
private:
#endif
/* Implementation for RectangularMatrix<cols, rows, T>::fromDiagonal() and Matrix<size, T>(T) */
/* Implementation for RectangularMatrix<cols, rows, T>::fromDiagonal() and Matrix<size, T>(IdentityInitT, T) */
template<std::size_t ...sequence> constexpr explicit RectangularMatrix(Implementation::Sequence<sequence...>, const Vector<DiagonalSize, T>& diagonal);
private:

10
src/Magnum/Math/Vector.h

@ -180,20 +180,14 @@ template<std::size_t size, class T> class Vector {
/** @brief Construct vector without initializing the contents */
explicit Vector(NoInitT) noexcept {}
/** @todo Creating Vector from combination of vector and scalar types */
/**
* @brief Construct vector from values
* @param first First value
* @param next Next values
*/
/** @brief Construct vector from components */
#ifdef DOXYGEN_GENERATING_OUTPUT
template<class ...U> constexpr /*implicit*/ Vector(T first, U... next) noexcept;
#else
template<class ...U, class V = typename std::enable_if<sizeof...(U)+1 == size, T>::type> constexpr /*implicit*/ Vector(T first, U... next) noexcept: _data{first, next...} {}
#endif
/** @brief Construct vector with one value for all fields */
/** @brief Construct vector with one value for all components */
#ifdef DOXYGEN_GENERATING_OUTPUT
constexpr explicit Vector(T value) noexcept;
#else

Loading…
Cancel
Save