diff --git a/glm/core/type.hpp b/glm/core/type.hpp
index e969e8f3..b4810a89 100644
--- a/glm/core/type.hpp
+++ b/glm/core/type.hpp
@@ -52,6 +52,9 @@
namespace glm
{
+ /// @addtogroup core_types
+ /// @{
+
//////////////////////////
// Float definition
@@ -95,81 +98,81 @@ namespace glm
typedef lowp_mat4x3 mat4x3;
typedef lowp_mat4x4 mat4x4;
#else
- //! 2 components vector of floating-point numbers.
- //! From GLSL 1.30.8 specification, section 4.1.5 Vectors.
- //! \ingroup core_types
+ /// 2 components vector of floating-point numbers.
+ ///
+ /// @see GLSL 4.20.8 specification, section 4.1.5 Vectors
typedef mediump_vec2 vec2;
//! 3 components vector of floating-point numbers.
- //! From GLSL 1.30.8 specification, section 4.1.5 Vectors.
- //! \ingroup core_types
+ ///
+ /// @see GLSL 4.20.8 specification, section 4.1.5 Vectors
typedef mediump_vec3 vec3;
//! 4 components vector of floating-point numbers.
- //! From GLSL 1.30.8 specification, section 4.1.5 Vectors.
- //! \ingroup core_types
+ ///
+ /// @see GLSL 4.20.8 specification, section 4.1.5 Vectors
typedef mediump_vec4 vec4;
//! 2 columns of 2 components matrix of floating-point numbers.
- //! (From GLSL 1.30.8 specification, section 4.1.6 Matrices)
- //! \ingroup core_types
+ ///
+ /// @see GLSL 4.20.8 specification, section 4.1.6 Matrices
typedef mediump_mat2x2 mat2x2;
//! 2 columns of 3 components matrix of floating-point numbers.
- //! (From GLSL 1.30.8 specification, section 4.1.6 Matrices)
- //! \ingroup core_types
+ ///
+ /// @see GLSL 4.20.8 specification, section 4.1.6 Matrices
typedef mediump_mat2x3 mat2x3;
//! 2 columns of 4 components matrix of floating-point numbers.
- //! (From GLSL 1.30.8 specification, section 4.1.6 Matrices)
- //! \ingroup core_types
+ ///
+ /// @see GLSL 4.20.8 specification, section 4.1.6 Matrices
typedef mediump_mat2x4 mat2x4;
//! 3 columns of 2 components matrix of floating-point numbers.
- //! (From GLSL 1.30.8 specification, section 4.1.6 Matrices)
- //! \ingroup core_types
+ ///
+ /// @see GLSL 4.20.8 specification, section 4.1.6 Matrices
typedef mediump_mat3x2 mat3x2;
//! 3 columns of 3 components matrix of floating-point numbers.
- //! (From GLSL 1.30.8 specification, section 4.1.6 Matrices)
- //! \ingroup core_types
+ ///
+ /// @see GLSL 4.20.8 specification, section 4.1.6 Matrices
typedef mediump_mat3x3 mat3x3;
//! 3 columns of 4 components matrix of floating-point numbers.
- //! (From GLSL 1.30.8 specification, section 4.1.6 Matrices)
- //! \ingroup core_types
+ ///
+ /// @see GLSL 4.20.8 specification, section 4.1.6 Matrices
typedef mediump_mat3x4 mat3x4;
//! 4 columns of 2 components matrix of floating-point numbers.
- //! (From GLSL 1.30.8 specification, section 4.1.6 Matrices)
- //! \ingroup core_types
+ ///
+ /// @see GLSL 4.20.8 specification, section 4.1.6 Matrices
typedef mediump_mat4x2 mat4x2;
//! 4 columns of 3 components matrix of floating-point numbers.
- //! (From GLSL 1.30.8 specification, section 4.1.6 Matrices)
- //! \ingroup core_types
+ ///
+ /// @see GLSL 4.20.8 specification, section 4.1.6 Matrices
typedef mediump_mat4x3 mat4x3;
//! 4 columns of 4 components matrix of floating-point numbers.
- //! (From GLSL 1.30.8 specification, section 4.1.6 Matrices)
- //! \ingroup core_types
+ ///
+ /// @see GLSL 4.20.8 specification, section 4.1.6 Matrices
typedef mediump_mat4x4 mat4x4;
#endif//GLM_PRECISION
//! 2 columns of 2 components matrix of floating-point numbers.
- //! (From GLSL 1.30.8 specification, section 4.1.6 Matrices)
- //! \ingroup core_types
+ ///
+ /// @see GLSL 4.20.8 specification, section 4.1.6 Matrices
typedef mat2x2 mat2;
//! 3 columns of 3 components matrix of floating-point numbers.
- //! (From GLSL 1.30.8 specification, section 4.1.6 Matrices)
- //! \ingroup core_types
+ ///
+ /// @see GLSL 4.20.8 specification, section 4.1.6 Matrices
typedef mat3x3 mat3;
//! 4 columns of 4 components matrix of floating-point numbers.
- //! (From GLSL 1.30.8 specification, section 4.1.6 Matrices)
- //! \ingroup core_types
+ ///
+ /// @see GLSL 4.20.8 specification, section 4.1.6 Matrices
typedef mat4x4 mat4;
//////////////////////////
@@ -189,18 +192,18 @@ namespace glm
typedef lowp_ivec4 ivec4;
#else
//! 2 components vector of signed integer numbers.
- //! From GLSL 1.30.8 specification, section 4.1.5 Vectors.
- //! \ingroup core_types
+ ///
+ /// @see GLSL 4.20.8 specification, section 4.1.5 Vectors
typedef mediump_ivec2 ivec2;
//! 3 components vector of signed integer numbers.
- //! From GLSL 1.30.8 specification, section 4.1.5 Vectors.
- //! \ingroup core_types
+ ///
+ /// @see GLSL 4.20.8 specification, section 4.1.5 Vectors
typedef mediump_ivec3 ivec3;
//! 4 components vector of signed integer numbers.
- //! From GLSL 1.30.8 specification, section 4.1.5 Vectors.
- //! \ingroup core_types
+ ///
+ /// @see GLSL 4.20.8 specification, section 4.1.5 Vectors
typedef mediump_ivec4 ivec4;
#endif//GLM_PRECISION
@@ -221,18 +224,18 @@ namespace glm
typedef lowp_uvec4 uvec4;
#else
//! 2 components vector of unsigned integer numbers.
- //! From GLSL 1.30.8 specification, section 4.1.5 Vectors.
- //! \ingroup core_types
+ ///
+ /// @see GLSL 4.20.8 specification, section 4.1.5 Vectors
typedef mediump_uvec2 uvec2;
//! 3 components vector of unsigned integer numbers.
- //! From GLSL 1.30.8 specification, section 4.1.5 Vectors.
- //! \ingroup core_types
+ ///
+ /// @see GLSL 4.20.8 specification, section 4.1.5 Vectors
typedef mediump_uvec3 uvec3;
//! 4 components vector of unsigned integer numbers.
- //! From GLSL 1.30.8 specification, section 4.1.5 Vectors.
- //! \ingroup core_types
+ ///
+ /// @see GLSL 4.20.8 specification, section 4.1.5 Vectors
typedef mediump_uvec4 uvec4;
#endif//GLM_PRECISION
@@ -240,98 +243,99 @@ namespace glm
// Boolean definition
//! 2 components vector of boolean.
- //! From GLSL 1.30.8 specification, section 4.1.5 Vectors.
- //! \ingroup core_types
+ ///
+ /// @see GLSL 4.20.8 specification, section 4.1.5 Vectors
typedef detail::tvec2 bvec2;
//! 3 components vector of boolean.
- //! From GLSL 1.30.8 specification, section 4.1.5 Vectors.
- //! \ingroup core_types
+ ///
+ /// @see GLSL 4.20.8 specification, section 4.1.5 Vectors
typedef detail::tvec3 bvec3;
//! 4 components vector of boolean.
- //! From GLSL 1.30.8 specification, section 4.1.5 Vectors.
- //! \ingroup core_types
+ ///
+ /// @see GLSL 4.20.8 specification, section 4.1.5 Vectors
typedef detail::tvec4 bvec4;
//////////////////////////
// Double definition
//! Vector of 2 double-precision floating-point numbers.
- //! From GLSL 4.00.8 specification, section 4.1 Basic Types.
- //! \ingroup core_types
+ ///
+ /// @see GLSL 4.20.8 specification, section 4.1.5 Vectors
typedef detail::tvec2 dvec2;
//! Vector of 3 double-precision floating-point numbers.
- //! From GLSL 4.00.8 specification, section 4.1 Basic Types.
- //! \ingroup core_types
+ ///
+ /// @see GLSL 4.20.8 specification, section 4.1.5 Vectors
typedef detail::tvec3 dvec3;
//! Vector of 4 double-precision floating-point numbers.
- //! From GLSL 4.00.8 specification, section 4.1 Basic Types.
- //! \ingroup core_types
+ ///
+ /// @see GLSL 4.20.8 specification, section 4.1.5 Vectors
typedef detail::tvec4 dvec4;
//! 2 * 2 matrix of double-precision floating-point numbers.
- //! From GLSL 4.00.8 specification, section 4.1 Basic Types.
- //! \ingroup core_types
+ ///
+ /// @see GLSL 4.20.8 specification, section 4.1.6 Matrices
typedef detail::tmat2x2 dmat2;
//! 3 * 3 matrix of double-precision floating-point numbers.
- //! From GLSL 4.00.8 specification, section 4.1 Basic Types.
- //! \ingroup core_types
+ ///
+ /// @see GLSL 4.20.8 specification, section 4.1.6 Matrices
typedef detail::tmat3x3 dmat3;
//! 4 * 4 matrix of double-precision floating-point numbers.
- //! From GLSL 4.00.8 specification, section 4.1 Basic Types.
- //! \ingroup core_types
+ ///
+ /// @see GLSL 4.20.8 specification, section 4.1.6 Matrices
typedef detail::tmat4x4 dmat4;
//! 2 * 2 matrix of double-precision floating-point numbers.
- //! From GLSL 4.00.8 specification, section 4.1 Basic Types.
- //! \ingroup core_types
+ ///
+ /// @see GLSL 4.20.8 specification, section 4.1.6 Matrices
typedef detail::tmat2x2 dmat2x2;
//! 2 * 3 matrix of double-precision floating-point numbers.
- //! From GLSL 4.00.8 specification, section 4.1 Basic Types.
- //! \ingroup core_types
+ ///
+ /// @see GLSL 4.20.8 specification, section 4.1.6 Matrices
typedef detail::tmat2x3 dmat2x3;
//! 2 * 4 matrix of double-precision floating-point numbers.
- //! From GLSL 4.00.8 specification, section 4.1 Basic Types.
- //! \ingroup core_types
+ ///
+ /// @see GLSL 4.20.8 specification, section 4.1.6 Matrices
typedef detail::tmat2x4 dmat2x4;
//! 3 * 2 matrix of double-precision floating-point numbers.
- //! From GLSL 4.00.8 specification, section 4.1 Basic Types.
- //! \ingroup core_types
+ ///
+ /// @see GLSL 4.20.8 specification, section 4.1.6 Matrices
typedef detail::tmat3x2 dmat3x2;
//! 3 * 3 matrix of double-precision floating-point numbers.
- //! From GLSL 4.00.8 specification, section 4.1 Basic Types.
- //! \ingroup core_types
+ ///
+ /// @see GLSL 4.20.8 specification, section 4.1.6 Matrices
typedef detail::tmat3x3 dmat3x3;
//! 3 * 4 matrix of double-precision floating-point numbers.
- //! From GLSL 4.00.8 specification, section 4.1 Basic Types.
- //! \ingroup core_types
+ ///
+ /// @see GLSL 4.20.8 specification, section 4.1.6 Matrices
typedef detail::tmat3x4 dmat3x4;
//! 4 * 2 matrix of double-precision floating-point numbers.
- //! From GLSL 4.00.8 specification, section 4.1 Basic Types.
- //! \ingroup core_types
+ ///
+ /// @see GLSL 4.20.8 specification, section 4.1.6 Matrices
typedef detail::tmat4x2 dmat4x2;
//! 4 * 3 matrix of double-precision floating-point numbers.
- //! From GLSL 4.00.8 specification, section 4.1 Basic Types.
- //! \ingroup core_types
+ ///
+ /// @see GLSL 4.20.8 specification, section 4.1.6 Matrices
typedef detail::tmat4x3 dmat4x3;
//! 4 * 4 matrix of double-precision floating-point numbers.
- //! From GLSL 4.00.8 specification, section 4.1 Basic Types.
- //! \ingroup core_types
+ ///
+ /// @see GLSL 4.20.8 specification, section 4.1.6 Matrices
typedef detail::tmat4x4 dmat4x4;
+ /// @}
}//namespace glm
#endif//glm_core_type
diff --git a/glm/core/type_float.hpp b/glm/core/type_float.hpp
index 63c06707..e82ab6c9 100644
--- a/glm/core/type_float.hpp
+++ b/glm/core/type_float.hpp
@@ -66,8 +66,6 @@ namespace glm
/// @see GLSL 4.20.8 specification, section 4.7.2 Precision Qualifier
typedef highp_float_t highp_float;
- /// @}
-
#if(!defined(GLM_PRECISION_HIGHP_FLOAT) && !defined(GLM_PRECISION_MEDIUMP_FLOAT) && !defined(GLM_PRECISION_LOWP_FLOAT))
typedef mediump_float float_t;
#elif(defined(GLM_PRECISION_HIGHP_FLOAT) && !defined(GLM_PRECISION_MEDIUMP_FLOAT) && !defined(GLM_PRECISION_LOWP_FLOAT))
@@ -80,6 +78,7 @@ namespace glm
# error "GLM error: multiple default precision requested for floating-point types"
#endif
+ /// @}
}//namespace glm
#endif//glm_core_type_float
diff --git a/glm/gtc/quaternion.hpp b/glm/gtc/quaternion.hpp
index 2b22c5e0..d01ae7ca 100644
--- a/glm/gtc/quaternion.hpp
+++ b/glm/gtc/quaternion.hpp
@@ -51,7 +51,7 @@ namespace glm{
namespace detail
{
/// @brief Template for quaternion.
- /// From GLM_GTC_quaternion extension.
+ /// @see gtc_quaternion
/// @ingroup gtc_quaternion
template
struct tquat// : public genType