diff --git a/doc/matrix-vector.dox b/doc/matrix-vector.dox index bb2162a0c..44be0fff9 100644 --- a/doc/matrix-vector.dox +++ b/doc/matrix-vector.dox @@ -131,6 +131,13 @@ xyz.xy() *= 5; @endcode Color3 and Color4 name their components `rgba` instead of `xyzw`. +For more involved operations with components there is the swizzle() function: +@code +Vector4 original(-1, 2, 3, 4); +Vector4 bgra = swizzle<'b', 'g', 'r', 'a'>(original); // { 3, 2, -1, 4 } +Vector<6, int> w10xyz = swizzle<'w', '1', '0', 'x', 'y', 'z'>(original); // { 4, 1, 0, -1, 2, 3 } +@endcode + Matrix3 and Matrix4 have functions for accessing properties of given 2D/3D transformation: @code @@ -142,13 +149,6 @@ Matrix<2, float> rotationScaling = b.rotationScaling(); Vector2 up = b.up(); @endcode -For more involved operations with components there is the swizzle() function: -@code -Vector4 original(-1, 2, 3, 4); -Vector4 bgra = swizzle<'b', 'g', 'r', 'a'>(original); // { 3, 2, -1, 4 } -Vector<6, int> w10xyz = swizzle<'w', '1', '0', 'x', 'y', 'z'>(original); // { 4, 1, 0, -1, 2, 3 } -@endcode - @section matrix-vector-column-major Matrices are column-major and vectors are columns OpenGL matrices are column-major, thus it is reasonable to have matrices in diff --git a/src/Text/Font.h b/src/Text/Font.h index 06866d1a9..1bc84f567 100644 --- a/src/Text/Font.h +++ b/src/Text/Font.h @@ -50,9 +50,6 @@ class MAGNUM_TEXT_EXPORT Font { * @param renderer %Font renderer * @param fontFile %Font file * @param size %Font size - * - * Creates font with no prerendered characters. See prerender() for - * more information. */ explicit Font(FontRenderer& renderer, const std::string& fontFile, GLfloat size);