diff --git a/src/Magnum.h b/src/Magnum.h index 653f66994..afe726912 100644 --- a/src/Magnum.h +++ b/src/Magnum.h @@ -65,13 +65,13 @@ using Corrade::Utility::Warning; using Corrade::Utility::Error; #endif -/** @brief Two-component floating-point vector */ +/** @brief Two-component float vector */ typedef Math::Vector2 Vector2; -/** @brief Three-component floating-point vector */ +/** @brief Three-component float vector */ typedef Math::Vector3 Vector3; -/** @brief Four-component floating-point vector */ +/** @brief Four-component float vector */ typedef Math::Vector4 Vector4; /** @brief Two-component signed integer vector */ @@ -92,18 +92,37 @@ typedef Math::Vector3 Vector3ui; /** @brief Four-component unsigned integer vector */ typedef Math::Vector4 Vector4ui; +#ifndef MAGNUM_TARGET_GLES +/** @brief Two-component double vector */ +typedef Math::Vector2 Vector2d; + +/** @brief Three-component double vector */ +typedef Math::Vector3 Vector3d; + +/** @brief Four-component double vector */ +typedef Math::Vector4 Vector4d; +#endif + /** @brief Two-dimensional floating-point homogeneous coordinates */ typedef Math::Point2D Point2D; /** @brief Three-dimensional floating-point homogeneous coordinates */ typedef Math::Point3D Point3D; -/** @brief 3x3 floating-point matrix */ +/** @brief 3x3 float matrix */ typedef Math::Matrix3 Matrix3; -/** @brief 4x4 floating-point matrix */ +/** @brief 4x4 float matrix */ typedef Math::Matrix4 Matrix4; +#ifndef MAGNUM_TARGET_GLES +/** @brief 3x3 double matrix */ +typedef Math::Matrix3 Matrix3d; + +/** @brief 4x4 double matrix */ +typedef Math::Matrix4 Matrix4d; +#endif + /** @brief Quaternion */ typedef Math::Quaternion Quaternion; diff --git a/src/Math/Matrix3.h b/src/Math/Matrix3.h index a67efd47f..59398a3ad 100644 --- a/src/Math/Matrix3.h +++ b/src/Math/Matrix3.h @@ -29,7 +29,7 @@ namespace Magnum { namespace Math { @tparam T Underlying data type Represents 2D transformation. See @ref matrix-vector for brief introduction. -@see Magnum::Matrix3, SceneGraph::MatrixTransformation2D +@see Magnum::Matrix3, Magnum::Matrix3d, SceneGraph::MatrixTransformation2D @configurationvalueref{Magnum::Math::Matrix3} */ template class Matrix3: public Matrix<3, T> { diff --git a/src/Math/Matrix4.h b/src/Math/Matrix4.h index 937fba39e..9e278dfc3 100644 --- a/src/Math/Matrix4.h +++ b/src/Math/Matrix4.h @@ -34,7 +34,8 @@ namespace Magnum { namespace Math { @tparam T Underlying data type Represents 3D transformation. See @ref matrix-vector for brief introduction. -@see Magnum::Matrix4, DualQuaternion, SceneGraph::MatrixTransformation3D +@see Magnum::Matrix4, Magnum::Matrix4d, DualQuaternion, + SceneGraph::MatrixTransformation3D @configurationvalueref{Magnum::Math::Matrix4} */ template class Matrix4: public Matrix<4, T> { diff --git a/src/Math/Vector2.h b/src/Math/Vector2.h index 371788021..64f9cc368 100644 --- a/src/Math/Vector2.h +++ b/src/Math/Vector2.h @@ -28,7 +28,7 @@ namespace Magnum { namespace Math { @tparam T Data type See @ref matrix-vector for brief introduction. -@see Magnum::Vector2, Magnum::Vector2i, Magnum::Vector2ui +@see Magnum::Vector2, Magnum::Vector2i, Magnum::Vector2ui, Magnum::Vector2d @configurationvalueref{Magnum::Math::Vector2} */ template class Vector2: public Vector<2, T> { diff --git a/src/Math/Vector3.h b/src/Math/Vector3.h index d54f96f37..cb2c2486b 100644 --- a/src/Math/Vector3.h +++ b/src/Math/Vector3.h @@ -30,7 +30,7 @@ namespace Magnum { namespace Math { See @ref matrix-vector for brief introduction. See also Point2D for homogeneous two-dimensional coordinates. -@see Magnum::Vector3, Magnum::Vector3i, Magnum::Vector3ui +@see Magnum::Vector3, Magnum::Vector3i, Magnum::Vector3ui, Magnum::Vector3d @configurationvalueref{Magnum::Math::Vector3} */ template class Vector3: public Vector<3, T> { diff --git a/src/Math/Vector4.h b/src/Math/Vector4.h index 29b4dc829..9c45d24b0 100644 --- a/src/Math/Vector4.h +++ b/src/Math/Vector4.h @@ -29,7 +29,7 @@ namespace Magnum { namespace Math { See @ref matrix-vector for brief introduction. See also Point3D for homogeneous three-dimensional coordinates. -@see Magnum::Vector4, Magnum::Vector4i, Magnum::Vector4ui +@see Magnum::Vector4, Magnum::Vector4i, Magnum::Vector4ui, Magnum::Vector4d @configurationvalueref{Magnum::Math::Vector4} */ template class Vector4: public Vector<4, T> {