From 7413d2053fd5146a02530f21b44a035871263a32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sun, 2 May 2021 15:50:08 +0200 Subject: [PATCH] Math: doc++ --- src/Magnum/Math/Matrix.h | 4 ++-- src/Magnum/Math/Matrix3.h | 2 +- src/Magnum/Math/Matrix4.h | 2 +- src/Magnum/Math/RectangularMatrix.h | 8 ++++---- src/Magnum/Math/Vector.h | 2 +- src/Magnum/Math/Vector2.h | 2 +- src/Magnum/Math/Vector3.h | 2 +- src/Magnum/Math/Vector4.h | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/Magnum/Math/Matrix.h b/src/Magnum/Math/Matrix.h index 6fa8a068d..098640728 100644 --- a/src/Magnum/Math/Matrix.h +++ b/src/Magnum/Math/Matrix.h @@ -78,7 +78,7 @@ template class Matrix: public RectangularMatrix{typename Corrade::Containers::Implementation::GenerateSequence::Type{}, Vector(value)} {} @@ -95,7 +95,7 @@ template class Matrix: public RectangularMatrix{typename Corrade::Containers::Implementation::GenerateSequence::Type{}, value} {} /** - * @brief Construct from a matrix of adifferent type + * @brief Construct from a matrix of a different type * * Performs only default casting on the values, no rounding or * anything else. Example usage: diff --git a/src/Magnum/Math/Matrix3.h b/src/Magnum/Math/Matrix3.h index b1679ba7c..6124241e2 100644 --- a/src/Magnum/Math/Matrix3.h +++ b/src/Magnum/Math/Matrix3.h @@ -231,7 +231,7 @@ template class Matrix3: public Matrix3x3 { /** @copydoc Matrix::Matrix(const RectangularMatrix&) */ template constexpr explicit Matrix3(const RectangularMatrix<3, 3, U>& other) noexcept: Matrix3x3(other) {} - /** @brief Construct from external representation */ + /** @brief Construct a matrix from external representation */ template::from(std::declval()))> constexpr explicit Matrix3(const U& other) noexcept: Matrix3x3(Implementation::RectangularMatrixConverter<3, 3, T, U>::from(other)) {} /** diff --git a/src/Magnum/Math/Matrix4.h b/src/Magnum/Math/Matrix4.h index 2008ac00f..fe03d0709 100644 --- a/src/Magnum/Math/Matrix4.h +++ b/src/Magnum/Math/Matrix4.h @@ -464,7 +464,7 @@ template class Matrix4: public Matrix4x4 { /** @copydoc Matrix::Matrix(const RectangularMatrix&) */ template constexpr explicit Matrix4(const RectangularMatrix<4, 4, U>& other) noexcept: Matrix4x4(other) {} - /** @brief Construct from external representation */ + /** @brief Construct a matrix from external representation */ template::from(std::declval()))> constexpr explicit Matrix4(const U& other): Matrix4x4(Implementation::RectangularMatrixConverter<4, 4, T, U>::from(other)) {} /** diff --git a/src/Magnum/Math/RectangularMatrix.h b/src/Magnum/Math/RectangularMatrix.h index 583088325..64e5cdda1 100644 --- a/src/Magnum/Math/RectangularMatrix.h +++ b/src/Magnum/Math/RectangularMatrix.h @@ -139,7 +139,7 @@ template class RectangularMatrix { constexpr explicit RectangularMatrix(T value) noexcept: RectangularMatrix{typename Corrade::Containers::Implementation::GenerateSequence::Type{}, value} {} /** - * @brief Construct matrix from another of different type + * @brief Construct from a matrix of a different type * * Performs only default casting on the values, no rounding or * anything else. Example usage: @@ -148,13 +148,13 @@ template class RectangularMatrix { */ template constexpr explicit RectangularMatrix(const RectangularMatrix& other) noexcept: RectangularMatrix(typename Corrade::Containers::Implementation::GenerateSequence::Type{}, other) {} - /** @brief Construct matrix from external representation */ + /** @brief Construct a matrix from external representation */ template::from(std::declval()))> constexpr explicit RectangularMatrix(const U& other): RectangularMatrix(Implementation::RectangularMatrixConverter::from(other)) {} /** @brief Copy constructor */ constexpr /*implicit*/ RectangularMatrix(const RectangularMatrix&) noexcept = default; - /** @brief Convert matrix to external representation */ + /** @brief Convert a matrix to external representation */ template::to(std::declval>()))> constexpr explicit operator U() const { return Implementation::RectangularMatrixConverter::to(*this); } @@ -212,7 +212,7 @@ template class RectangularMatrix { } /** - * @brief Non-equality operator + * @brief Non-equality comparison * * @see @ref Vector::operator<(), @ref Vector::operator<=(), * @ref Vector::operator>=(), @ref Vector::operator>() diff --git a/src/Magnum/Math/Vector.h b/src/Magnum/Math/Vector.h index 1b911666a..5aac086ce 100644 --- a/src/Magnum/Math/Vector.h +++ b/src/Magnum/Math/Vector.h @@ -170,7 +170,7 @@ template class Vector { } /** - * @brief Pad vector + * @brief Pad a vector * * If size of @p a is smaller than @ref Size, it is padded from right * with @p value, otherwise it's cut. diff --git a/src/Magnum/Math/Vector2.h b/src/Magnum/Math/Vector2.h index 7e44cea14..2613a8009 100644 --- a/src/Magnum/Math/Vector2.h +++ b/src/Magnum/Math/Vector2.h @@ -129,7 +129,7 @@ template class Vector2: public Vector<2, T> { /** @copydoc Vector::Vector(const Vector&) */ template constexpr explicit Vector2(const Vector<2, U>& other) noexcept: Vector<2, T>(other) {} - /** @brief Construct vector from external representation */ + /** @brief Construct a vector from external representation */ template::from(std::declval())) diff --git a/src/Magnum/Math/Vector3.h b/src/Magnum/Math/Vector3.h index 7dd5b2248..aa77fc635 100644 --- a/src/Magnum/Math/Vector3.h +++ b/src/Magnum/Math/Vector3.h @@ -160,7 +160,7 @@ template class Vector3: public Vector<3, T> { /** @copydoc Vector::Vector(const Vector&) */ template constexpr explicit Vector3(const Vector<3, U>& other) noexcept: Vector<3, T>(other) {} - /** @brief Construct vector from external representation */ + /** @brief Construct a vector from external representation */ template::from(std::declval())) diff --git a/src/Magnum/Math/Vector4.h b/src/Magnum/Math/Vector4.h index 57b70df5d..7a64af83e 100644 --- a/src/Magnum/Math/Vector4.h +++ b/src/Magnum/Math/Vector4.h @@ -109,7 +109,7 @@ template class Vector4: public Vector<4, T> { fire! FFS. */ template constexpr explicit Vector4(const Vector<4, U>& other) noexcept: Vector<4, T>(other) {} - /** @brief Construct vector from external representation */ + /** @brief Construct a vector from external representation */ template::from(std::declval()))> constexpr explicit Vector4(const U& other): Vector<4, T>(Implementation::VectorConverter<4, T, U>::from(other)) {} /** @brief Copy constructor */