Browse Source

Add Bezier typedefs to the root Magnum.h header.

pull/175/merge
Vladimír Vondruš 10 years ago
parent
commit
62214a288c
  1. 4
      doc/types.dox
  2. 24
      src/Magnum/Magnum.h
  3. 12
      src/Magnum/Math/Bezier.h

4
doc/types.dox

@ -157,6 +157,10 @@ Complex b = Complex::rotation(60.0_degf);
Other types, which don't have their GLSL equivalent, are:
- @ref QuadraticBezier2D or @ref QuadraticBezier2Dd, @ref QuadraticBezier3D
or @ref QuadraticBezier3Dd
- @ref CubicBezier2D or @ref CubicBezier2Dd, @ref CubicBezier3D
or @ref CubicBezier3Dd
- @ref Complex or @ref Complexd, @ref DualComplex or @ref DualComplexd
- @ref Quaternion or @ref Quaterniond, @ref DualQuaternion or
@ref DualQuaterniond

24
src/Magnum/Magnum.h

@ -302,6 +302,18 @@ typedef Math::Matrix3x4<Float> Matrix3x4;
/** @brief Float matrix with 4 columns and 3 rows */
typedef Math::Matrix4x3<Float> Matrix4x3;
/** @brief Float two-dimensional quadratic Bézier curve */
typedef Math::QuadraticBezier2D<Float> QuadraticBezier2D;
/** @brief Float three-dimensional quadratic Bézier curve */
typedef Math::QuadraticBezier3D<Float> QuadraticBezier3D;
/** @brief Float two-dimensional cubic Bézier curve */
typedef Math::CubicBezier2D<Float> CubicBezier2D;
/** @brief Float three-dimensional cubic Bézier curve */
typedef Math::CubicBezier3D<Float> CubicBezier3D;
/** @brief Float complex number */
typedef Math::Complex<Float> Complex;
@ -411,6 +423,18 @@ typedef Math::Matrix3x4<Double> Matrix3x4d;
/** @brief Double matrix with 4 columns and 3 rows */
typedef Math::Matrix4x3<Double> Matrix4x3d;
/** @brief Double two-dimensional quadratic Bézier curve */
typedef Math::QuadraticBezier2D<Float> QuadraticBezier2Dd;
/** @brief Double three-dimensional quadratic Bézier curve */
typedef Math::QuadraticBezier3D<Float> QuadraticBezier3Dd;
/** @brief Double two-dimensional cubic Bézier curve */
typedef Math::CubicBezier2D<Float> CubicBezier2Dd;
/** @brief Double three-dimensional cubic Bézier curve */
typedef Math::CubicBezier3D<Float> CubicBezier3Dd;
/** @brief Double complex number */
typedef Math::Complex<Double> Complexd;

12
src/Magnum/Math/Bezier.h

@ -144,7 +144,8 @@ template<UnsignedInt dimensions, class T> using QuadraticBezier = Bezier<2, dime
Convenience alternative to `QuadraticBezier<2, T>`. See @ref QuadraticBezier
and @ref Bezier for more information.
@see @ref QuadraticBezier3D
@see @ref QuadraticBezier3D, @ref Magnum::QuadraticBezier2D,
@ref Magnum::QuadraticBezier2Dd
*/
#ifndef CORRADE_MSVC2015_COMPATIBILITY /* Multiple definitions still broken */
template<class T> using QuadraticBezier2D = QuadraticBezier<2, T>;
@ -155,7 +156,8 @@ template<class T> using QuadraticBezier2D = QuadraticBezier<2, T>;
Convenience alternative to `QuadraticBezier<3, T>`. See @ref QuadraticBezier
and @ref Bezier for more information.
@see @ref QuadraticBezier2D
@see @ref QuadraticBezier2D, @ref Magnum::QuadraticBezier3D,
@ref Magnum::QuadraticBezier3Dd
*/
#ifndef CORRADE_MSVC2015_COMPATIBILITY /* Multiple definitions still broken */
template<class T> using QuadraticBezier3D = QuadraticBezier<3, T>;
@ -177,7 +179,8 @@ template<UnsignedInt dimensions, class T> using CubicBezier = Bezier<3, dimensio
Convenience alternative to `CubicBezier<2, T>`. See @ref CubicBezier
and @ref Bezier for more information.
@see @ref CubicBezier3D
@see @ref CubicBezier3D, @ref Magnum::CubicBezier2D,
@ref Magnum::CubicBezier2Dd
*/
#ifndef CORRADE_MSVC2015_COMPATIBILITY /* Multiple definitions still broken */
template<class T> using CubicBezier2D = CubicBezier<2, T>;
@ -188,7 +191,8 @@ template<class T> using CubicBezier2D = CubicBezier<2, T>;
Convenience alternative to `CubicBezier<3, T>`. See @ref CubicBezier
and @ref Bezier for more information.
@see @ref CubicBezier2D
@see @ref CubicBezier2D, @ref Magnum::CubicBezier3D,
@ref Magnum::CubicBezier3Dd
*/
#ifndef CORRADE_MSVC2015_COMPATIBILITY /* Multiple definitions still broken */
template<class T> using CubicBezier3D = CubicBezier<3, T>;

Loading…
Cancel
Save