diff --git a/src/Magnum/Math/Matrix.h b/src/Magnum/Math/Matrix.h index 3d4525d89..3f165c07d 100644 --- a/src/Magnum/Math/Matrix.h +++ b/src/Magnum/Math/Matrix.h @@ -109,11 +109,7 @@ template class Matrix: public RectangularMatrix constexpr /*implicit*/ Matrix(const Vector& first, const U&... next) noexcept: RectangularMatrix(first, next...) {} /** diff --git a/src/Magnum/Math/Matrix3.h b/src/Magnum/Math/Matrix3.h index e3646f770..7c0891719 100644 --- a/src/Magnum/Math/Matrix3.h +++ b/src/Magnum/Math/Matrix3.h @@ -227,7 +227,7 @@ template class Matrix3: public Matrix3x3 { #endif {} - /** @brief Matrix from column vectors */ + /** @brief Construct matrix from column vectors */ constexpr /*implicit*/ Matrix3(const Vector3& first, const Vector3& second, const Vector3& third) noexcept: Matrix3x3(first, second, third) {} /** @copydoc Matrix::Matrix(const RectangularMatrix&) */ diff --git a/src/Magnum/Math/Matrix4.h b/src/Magnum/Math/Matrix4.h index 7c96f4f80..b66246246 100644 --- a/src/Magnum/Math/Matrix4.h +++ b/src/Magnum/Math/Matrix4.h @@ -398,7 +398,7 @@ template class Matrix4: public Matrix4x4 { #endif {} - /** @brief Matrix from column vectors */ + /** @brief Construct matrix from column vectors */ constexpr /*implicit*/ Matrix4(const Vector4& first, const Vector4& second, const Vector4& third, const Vector4& fourth) noexcept: Matrix4x4(first, second, third, fourth) {} /** @copydoc Matrix::Matrix(const RectangularMatrix&) */ diff --git a/src/Magnum/Math/RectangularMatrix.h b/src/Magnum/Math/RectangularMatrix.h index 4085ee08b..71479521c 100644 --- a/src/Magnum/Math/RectangularMatrix.h +++ b/src/Magnum/Math/RectangularMatrix.h @@ -125,13 +125,7 @@ template 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 constexpr /*implicit*/ RectangularMatrix(const Vector& 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 class RectangularMatrix { #else private: #endif - /* Implementation for RectangularMatrix::fromDiagonal() and Matrix(T) */ + /* Implementation for RectangularMatrix::fromDiagonal() and Matrix(IdentityInitT, T) */ template constexpr explicit RectangularMatrix(Implementation::Sequence, const Vector& diagonal); private: diff --git a/src/Magnum/Math/Vector.h b/src/Magnum/Math/Vector.h index 173b5d9e4..a6c0b578e 100644 --- a/src/Magnum/Math/Vector.h +++ b/src/Magnum/Math/Vector.h @@ -180,20 +180,14 @@ template 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 constexpr /*implicit*/ Vector(T first, U... next) noexcept; #else template::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