Browse Source

Brought Complex and DualQuaternion to Magnum namespace.

pull/7/head
Vladimír Vondruš 13 years ago
parent
commit
b847eee750
  1. 8
      src/Magnum.h
  2. 1
      src/Math/Complex.h
  3. 2
      src/Math/DualQuaternion.h

8
src/Magnum.h

@ -117,9 +117,15 @@ typedef Math::Matrix3<GLdouble> Matrix3d;
typedef Math::Matrix4<GLdouble> Matrix4d; typedef Math::Matrix4<GLdouble> Matrix4d;
#endif #endif
/** @brief Quaternion */ /** @brief %Complex number */
typedef Math::Complex<GLfloat> Complex;
/** @brief %Quaternion */
typedef Math::Quaternion<GLfloat> Quaternion; typedef Math::Quaternion<GLfloat> Quaternion;
/** @brief %Dual quaternion */
typedef Math::DualQuaternion<GLfloat> DualQuaternion;
/** @brief Floating-point constants */ /** @brief Floating-point constants */
/* Using float instead of GLfloat to not break KDevelop autocompletion */ /* Using float instead of GLfloat to not break KDevelop autocompletion */
typedef Math::Constants<float> Constants; typedef Math::Constants<float> Constants;

1
src/Math/Complex.h

@ -33,6 +33,7 @@ namespace Magnum { namespace Math {
@tparam T Data type @tparam T Data type
Represents 2D rotation. Represents 2D rotation.
@see Magnum::Complex, Matrix3
*/ */
template<class T> class Complex { template<class T> class Complex {
public: public:

2
src/Math/DualQuaternion.h

@ -30,7 +30,7 @@ namespace Magnum { namespace Math {
@tparam T Underlying data type @tparam T Underlying data type
Represents 3D rotation and translation. Represents 3D rotation and translation.
@see Dual, Quaternion, Matrix4 @see Magnum::DualQuaternion, Dual, Quaternion, Matrix4
*/ */
template<class T> class DualQuaternion: public Dual<Quaternion<T>> { template<class T> class DualQuaternion: public Dual<Quaternion<T>> {
public: public:

Loading…
Cancel
Save