Browse Source

Doc++

pull/7/head
Vladimír Vondruš 13 years ago
parent
commit
c59404bece
  1. 14
      doc/matrix-vector.dox
  2. 3
      src/Text/Font.h

14
doc/matrix-vector.dox

@ -131,6 +131,13 @@ xyz.xy() *= 5;
@endcode @endcode
Color3 and Color4 name their components `rgba` instead of `xyzw`. Color3 and Color4 name their components `rgba` instead of `xyzw`.
For more involved operations with components there is the swizzle() function:
@code
Vector4<int> original(-1, 2, 3, 4);
Vector4<int> 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 Matrix3 and Matrix4 have functions for accessing properties of given 2D/3D
transformation: transformation:
@code @code
@ -142,13 +149,6 @@ Matrix<2, float> rotationScaling = b.rotationScaling();
Vector2<float> up = b.up(); Vector2<float> up = b.up();
@endcode @endcode
For more involved operations with components there is the swizzle() function:
@code
Vector4<int> original(-1, 2, 3, 4);
Vector4<int> 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 @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 OpenGL matrices are column-major, thus it is reasonable to have matrices in

3
src/Text/Font.h

@ -50,9 +50,6 @@ class MAGNUM_TEXT_EXPORT Font {
* @param renderer %Font renderer * @param renderer %Font renderer
* @param fontFile %Font file * @param fontFile %Font file
* @param size %Font size * @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); explicit Font(FontRenderer& renderer, const std::string& fontFile, GLfloat size);

Loading…
Cancel
Save