From 3b940f2509229bb404c0e82b4534c6c57034e450 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Fri, 24 Jan 2020 13:15:27 +0100 Subject: [PATCH] doc: avoid referencing the deprecated Math::swizzle() function. --- doc/changelog-old.dox | 4 ++-- src/Magnum/GL/Texture.h | 2 +- src/Magnum/Math/Vector3.h | 2 +- src/Magnum/Math/Vector4.h | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/doc/changelog-old.dox b/doc/changelog-old.dox index dfef05977..89a611e64 100644 --- a/doc/changelog-old.dox +++ b/doc/changelog-old.dox @@ -422,7 +422,7 @@ for a high-level overview. - Removed deprecated @cpp Matrix2 @ce and @cpp Matrix2d @ce typedefs, use @ref Matrix2x2 and @ref Matrix2x2d instead - Removed deprecated `Magnum/Swizzle.h` header and @cpp Magnum::swizzle() @ce - function, use @ref Magnum/Math/Swizzle.h and @ref Math::swizzle() + function, use @ref Magnum/Math/Swizzle.h and @cpp Math::swizzle() @ce instead - Removed deprecated @cpp *::maxSupported*() @ce limit queries, use the less verbose @cpp *::max*() @ce versions instead @@ -708,7 +708,7 @@ for a high-level overview. - @cpp Matrix2 @ce and @cpp Matrix2d @ce is deprecated, use @ref Matrix2x2 and @ref Matrix2x2d instead - @cpp swizzle() @ce is deprecated, all of its functionality has been moved - into @ref Math::swizzle() + into @cpp Math::swizzle() @ce - @cpp Buffer::setData() @ce and @cpp Buffer::setSubData() @ce overloads taking pair of data pointer and size are deprecated, use @cpp Containers::ArrayReference @ce-based @cpp Buffer::setData() @ce and diff --git a/src/Magnum/GL/Texture.h b/src/Magnum/GL/Texture.h index 4b4ebd091..e7623c8c1 100644 --- a/src/Magnum/GL/Texture.h +++ b/src/Magnum/GL/Texture.h @@ -601,7 +601,7 @@ template class Texture: public AbstractTexture { * You can use letters @cpp 'r' @ce, @cpp 'g' @ce, @cpp 'b' @ce, * @cpp 'a' @ce for addressing components or letters @cpp '0' @ce and * @cpp '1' @ce for zero and one, similarly as in the - * @ref Math::swizzle() function. Example usage: + * @ref Math::gather() function. Example usage: * * @snippet MagnumGL.cpp Texture-setSwizzle * diff --git a/src/Magnum/Math/Vector3.h b/src/Magnum/Math/Vector3.h index e6e56b077..cb8a6120b 100644 --- a/src/Magnum/Math/Vector3.h +++ b/src/Magnum/Math/Vector3.h @@ -223,7 +223,7 @@ template class Vector3: public Vector<3, T> { * @brief XY part of the vector * @return First two components of the vector * - * @see @ref swizzle() + * @see @ref gather(), @ref scatter() */ Vector2& xy() { return Vector2::from(Vector<3, T>::data()); } constexpr const Vector2 xy() const { diff --git a/src/Magnum/Math/Vector4.h b/src/Magnum/Math/Vector4.h index e78d22baf..68facd8e5 100644 --- a/src/Magnum/Math/Vector4.h +++ b/src/Magnum/Math/Vector4.h @@ -182,7 +182,7 @@ template class Vector4: public Vector<4, T> { * @brief XYZ part of the vector * @return First three components of the vector * - * @see @ref swizzle(), @ref rgb() + * @see @ref rgb(), @ref gather(), @ref scatter() */ Vector3& xyz() { return Vector3::from(Vector<4, T>::data()); } constexpr const Vector3 xyz() const { @@ -194,7 +194,7 @@ template class Vector4: public Vector<4, T> { * @return First three components of the vector * * Equivalent to @ref xyz(). - * @see @ref swizzle() + * @see @ref gather(), @ref scatter() */ Vector3& rgb() { return Vector3::from(Vector<4, T>::data()); } constexpr const Vector3 rgb() const { @@ -205,7 +205,7 @@ template class Vector4: public Vector<4, T> { * @brief XY part of the vector * @return First two components of the vector * - * @see @ref swizzle() + * @see @ref gather(), @ref scatter() */ Vector2& xy() { return Vector2::from(Vector<4, T>::data()); } constexpr const Vector2 xy() const {