diff --git a/glm/detail/_features.hpp b/glm/detail/_features.hpp index a745fd5e..fb29ffa8 100644 --- a/glm/detail/_features.hpp +++ b/glm/detail/_features.hpp @@ -21,7 +21,7 @@ /// THE SOFTWARE. /// /// @ref core -/// @file glm/core/_features.hpp +/// @file glm/detail/_features.hpp /// @date 2013-02-20 / 2013-02-20 /// @author Christophe Riccio /////////////////////////////////////////////////////////////////////////////////// diff --git a/glm/detail/_fixes.hpp b/glm/detail/_fixes.hpp index ce13bb1b..a7efceb5 100644 --- a/glm/detail/_fixes.hpp +++ b/glm/detail/_fixes.hpp @@ -21,7 +21,7 @@ /// THE SOFTWARE. /// /// @ref core -/// @file glm/core/_fixes.hpp +/// @file glm/detail/_fixes.hpp /// @date 2011-02-21 / 2011-11-22 /// @author Christophe Riccio /////////////////////////////////////////////////////////////////////////////////// diff --git a/glm/detail/_literals.hpp b/glm/detail/_literals.hpp index 82220874..fa4bd8c5 100644 --- a/glm/detail/_literals.hpp +++ b/glm/detail/_literals.hpp @@ -21,7 +21,7 @@ /// THE SOFTWARE. /// /// @ref core -/// @file glm/core/_literals.hpp +/// @file glm/detail/_literals.hpp /// @date 2013-05-06 / 2013-05-06 /// @author Christophe Riccio /////////////////////////////////////////////////////////////////////////////////// diff --git a/glm/detail/_swizzle.hpp b/glm/detail/_swizzle.hpp index d52b1807..57e916f3 100644 --- a/glm/detail/_swizzle.hpp +++ b/glm/detail/_swizzle.hpp @@ -21,7 +21,7 @@ /// THE SOFTWARE. /// /// @ref core -/// @file glm/core/_swizzle.hpp +/// @file glm/detail/_swizzle.hpp /// @date 2006-04-20 / 2011-02-16 /// @author Christophe Riccio /////////////////////////////////////////////////////////////////////////////////// diff --git a/glm/detail/_swizzle_func.hpp b/glm/detail/_swizzle_func.hpp index a3f6993c..ccb0c1b4 100644 --- a/glm/detail/_swizzle_func.hpp +++ b/glm/detail/_swizzle_func.hpp @@ -21,7 +21,7 @@ /// THE SOFTWARE. /// /// @ref core -/// @file glm/core/_swizzle_func.hpp +/// @file glm/detail/_swizzle_func.hpp /// @date 2011-10-16 / 2011-10-16 /// @author Christophe Riccio /////////////////////////////////////////////////////////////////////////////////// diff --git a/glm/detail/_vectorize.hpp b/glm/detail/_vectorize.hpp index 9604e695..5edfc537 100644 --- a/glm/detail/_vectorize.hpp +++ b/glm/detail/_vectorize.hpp @@ -21,7 +21,7 @@ /// THE SOFTWARE. /// /// @ref core -/// @file glm/core/_vectorize.hpp +/// @file glm/detail/_vectorize.hpp /// @date 2011-10-14 / 2011-10-14 /// @author Christophe Riccio /////////////////////////////////////////////////////////////////////////////////// diff --git a/glm/detail/func_common.hpp b/glm/detail/func_common.hpp index 97e64ebe..660daf03 100644 --- a/glm/detail/func_common.hpp +++ b/glm/detail/func_common.hpp @@ -21,7 +21,7 @@ /// THE SOFTWARE. /// /// @ref core -/// @file glm/core/func_common.hpp +/// @file glm/detail/func_common.hpp /// @date 2008-03-08 / 2010-01-26 /// @author Christophe Riccio /// diff --git a/glm/detail/func_common.inl b/glm/detail/func_common.inl index d36b2b15..fafa3c9d 100644 --- a/glm/detail/func_common.inl +++ b/glm/detail/func_common.inl @@ -21,7 +21,7 @@ /// THE SOFTWARE. /// /// @ref core -/// @file glm/core/func_common.inl +/// @file glm/detail/func_common.inl /// @date 2008-08-03 / 2011-06-15 /// @author Christophe Riccio /////////////////////////////////////////////////////////////////////////////////// diff --git a/glm/detail/func_exponential.hpp b/glm/detail/func_exponential.hpp index 2adcb8ec..550ac414 100644 --- a/glm/detail/func_exponential.hpp +++ b/glm/detail/func_exponential.hpp @@ -21,7 +21,7 @@ /// THE SOFTWARE. /// /// @ref core -/// @file glm/core/func_exponential.hpp +/// @file glm/detail/func_exponential.hpp /// @date 2008-08-08 / 2011-06-14 /// @author Christophe Riccio /// @@ -48,7 +48,7 @@ namespace glm /// Returns 'base' raised to the power 'exponent'. /// - /// @param base Floating point value. pow function is defined for input values of x defined in the range (inf-, inf+) in the limit of the type precision. + /// @param base Floating point value. pow function is defined for input values of 'base' defined in the range (inf-, inf+) in the limit of the type precision. /// @param exponent Floating point value representing the 'exponent'. /// @tparam genType Floating-point scalar or vector types. /// @@ -59,7 +59,7 @@ namespace glm /// Returns the natural exponentiation of x, i.e., e^x. /// - /// @param x exp function is defined for input values of x defined in the range (inf-, inf+) in the limit of the type precision. + /// @param v exp function is defined for input values of v defined in the range (inf-, inf+) in the limit of the type precision. /// @tparam genType Floating-point scalar or vector types. /// /// @see GLSL exp man page @@ -67,11 +67,11 @@ namespace glm template class vecType> GLM_FUNC_DECL vecType exp(vecType const & v); - /// Returns the natural logarithm of x, i.e., + /// Returns the natural logarithm of v, i.e., /// returns the value y which satisfies the equation x = e^y. - /// Results are undefined if x <= 0. + /// Results are undefined if v <= 0. /// - /// @param x log function is defined for input values of x defined in the range (0, inf+) in the limit of the type precision. + /// @param v log function is defined for input values of v defined in the range (0, inf+) in the limit of the type precision. /// @tparam genType Floating-point scalar or vector types. /// /// @see GLSL log man page @@ -79,9 +79,9 @@ namespace glm template class vecType> GLM_FUNC_DECL vecType log(vecType const & v); - /// Returns 2 raised to the x power. + /// Returns 2 raised to the v power. /// - /// @param x exp2 function is defined for input values of x defined in the range (inf-, inf+) in the limit of the type precision. + /// @param v exp2 function is defined for input values of v defined in the range (inf-, inf+) in the limit of the type precision. /// @tparam genType Floating-point scalar or vector types. /// /// @see GLSL exp2 man page @@ -92,7 +92,7 @@ namespace glm /// Returns the base 2 log of x, i.e., returns the value y, /// which satisfies the equation x = 2 ^ y. /// - /// @param x log2 function is defined for input values of x defined in the range (0, inf+) in the limit of the type precision. + /// @param v log2 function is defined for input values of v defined in the range (0, inf+) in the limit of the type precision. /// @tparam genType Floating-point scalar or vector types. /// /// @see GLSL log2 man page @@ -100,9 +100,9 @@ namespace glm template class vecType> GLM_FUNC_DECL vecType log2(vecType const & v); - /// Returns the positive square root of x. + /// Returns the positive square root of v. /// - /// @param x sqrt function is defined for input values of x defined in the range [0, inf+) in the limit of the type precision. + /// @param v sqrt function is defined for input values of v defined in the range [0, inf+) in the limit of the type precision. /// @tparam genType Floating-point scalar or vector types. /// /// @see GLSL sqrt man page @@ -112,9 +112,9 @@ namespace glm template class vecType> GLM_FUNC_DECL vecType sqrt(vecType const & v); - /// Returns the reciprocal of the positive square root of x. + /// Returns the reciprocal of the positive square root of v. /// - /// @param x inversesqrt function is defined for input values of x defined in the range [0, inf+) in the limit of the type precision. + /// @param v inversesqrt function is defined for input values of v defined in the range [0, inf+) in the limit of the type precision. /// @tparam genType Floating-point scalar or vector types. /// /// @see GLSL inversesqrt man page diff --git a/glm/detail/func_exponential.inl b/glm/detail/func_exponential.inl index 80230960..f7255cde 100644 --- a/glm/detail/func_exponential.inl +++ b/glm/detail/func_exponential.inl @@ -21,7 +21,7 @@ /// THE SOFTWARE. /// /// @ref core -/// @file glm/core/func_exponential.inl +/// @file glm/detail/func_exponential.inl /// @date 2008-08-03 / 2011-06-15 /// @author Christophe Riccio /////////////////////////////////////////////////////////////////////////////////// diff --git a/glm/detail/func_geometric.hpp b/glm/detail/func_geometric.hpp index 784ada77..dd0b4c97 100644 --- a/glm/detail/func_geometric.hpp +++ b/glm/detail/func_geometric.hpp @@ -21,7 +21,7 @@ /// THE SOFTWARE. /// /// @ref core -/// @file glm/core/func_geometric.hpp +/// @file glm/detail/func_geometric.hpp /// @date 2008-08-03 / 2011-06-14 /// @author Christophe Riccio /// diff --git a/glm/detail/func_geometric.inl b/glm/detail/func_geometric.inl index 1d51df91..7dd60e0a 100644 --- a/glm/detail/func_geometric.inl +++ b/glm/detail/func_geometric.inl @@ -21,7 +21,7 @@ /// THE SOFTWARE. /// /// @ref core -/// @file glm/core/func_geometric.inl +/// @file glm/detail/func_geometric.inl /// @date 2008-08-03 / 2011-06-15 /// @author Christophe Riccio /////////////////////////////////////////////////////////////////////////////////// diff --git a/glm/detail/func_integer.hpp b/glm/detail/func_integer.hpp index 7785d559..9aa55096 100644 --- a/glm/detail/func_integer.hpp +++ b/glm/detail/func_integer.hpp @@ -21,7 +21,7 @@ /// THE SOFTWARE. /// /// @ref core -/// @file glm/core/func_integer.hpp +/// @file glm/detail/func_integer.hpp /// @date 2010-03-17 / 2011-06-18 /// @author Christophe Riccio /// diff --git a/glm/detail/func_integer.inl b/glm/detail/func_integer.inl index c2c07563..652e5d41 100644 --- a/glm/detail/func_integer.inl +++ b/glm/detail/func_integer.inl @@ -21,7 +21,7 @@ /// THE SOFTWARE. /// /// @ref core -/// @file glm/core/func_integer.inl +/// @file glm/detail/func_integer.inl /// @date 2010-03-17 / 2011-06-15 /// @author Christophe Riccio /////////////////////////////////////////////////////////////////////////////////// diff --git a/glm/detail/func_matrix.hpp b/glm/detail/func_matrix.hpp index 358bec42..076714c3 100644 --- a/glm/detail/func_matrix.hpp +++ b/glm/detail/func_matrix.hpp @@ -21,7 +21,7 @@ /// THE SOFTWARE. /// /// @ref core -/// @file glm/core/func_matrix.hpp +/// @file glm/detail/func_matrix.hpp /// @date 2008-08-03 / 2011-06-15 /// @author Christophe Riccio /// diff --git a/glm/detail/func_matrix.inl b/glm/detail/func_matrix.inl index 4d96db95..076bbb66 100644 --- a/glm/detail/func_matrix.inl +++ b/glm/detail/func_matrix.inl @@ -21,7 +21,7 @@ /// THE SOFTWARE. /// /// @ref core -/// @file glm/core/func_matrix.inl +/// @file glm/detail/func_matrix.inl /// @date 2008-03-08 / 2011-06-15 /// @author Christophe Riccio /////////////////////////////////////////////////////////////////////////////////// diff --git a/glm/detail/func_noise.hpp b/glm/detail/func_noise.hpp index d0869ec7..e005d49d 100644 --- a/glm/detail/func_noise.hpp +++ b/glm/detail/func_noise.hpp @@ -21,7 +21,7 @@ /// THE SOFTWARE. /// /// @ref core -/// @file glm/core/func_noise.hpp +/// @file glm/detail/func_noise.hpp /// @date 2008-08-01 / 2011-06-18 /// @author Christophe Riccio /// diff --git a/glm/detail/func_noise.inl b/glm/detail/func_noise.inl index cab1414d..99a3562f 100644 --- a/glm/detail/func_noise.inl +++ b/glm/detail/func_noise.inl @@ -21,7 +21,7 @@ /// THE SOFTWARE. /// /// @ref core -/// @file glm/core/func_noise.inl +/// @file glm/detail/func_noise.inl /// @date 2008-08-01 / 2011-09-27 /// @author Christophe Riccio /////////////////////////////////////////////////////////////////////////////////// diff --git a/glm/detail/func_packing.hpp b/glm/detail/func_packing.hpp index aa08f5ac..409c19b9 100644 --- a/glm/detail/func_packing.hpp +++ b/glm/detail/func_packing.hpp @@ -21,7 +21,7 @@ /// THE SOFTWARE. /// /// @ref core -/// @file glm/core/func_packing.hpp +/// @file glm/detail/func_packing.hpp /// @date 2010-03-17 / 2011-06-15 /// @author Christophe Riccio /// diff --git a/glm/detail/func_packing.inl b/glm/detail/func_packing.inl index 60dfc63b..97b4a524 100644 --- a/glm/detail/func_packing.inl +++ b/glm/detail/func_packing.inl @@ -21,7 +21,7 @@ /// THE SOFTWARE. /// /// @ref core -/// @file glm/core/func_packing.inl +/// @file glm/detail/func_packing.inl /// @date 2010-03-17 / 2011-06-15 /// @author Christophe Riccio /////////////////////////////////////////////////////////////////////////////////// diff --git a/glm/detail/func_trigonometric.hpp b/glm/detail/func_trigonometric.hpp index 97ef9d70..86c76942 100644 --- a/glm/detail/func_trigonometric.hpp +++ b/glm/detail/func_trigonometric.hpp @@ -21,7 +21,7 @@ /// THE SOFTWARE. /// /// @ref core -/// @file glm/core/func_trigonometric.hpp +/// @file glm/detail/func_trigonometric.hpp /// @date 2008-08-01 / 2011-06-15 /// @author Christophe Riccio /// diff --git a/glm/detail/func_trigonometric.inl b/glm/detail/func_trigonometric.inl index 1d50181c..a533b2a2 100644 --- a/glm/detail/func_trigonometric.inl +++ b/glm/detail/func_trigonometric.inl @@ -21,7 +21,7 @@ /// THE SOFTWARE. /// /// @ref core -/// @file glm/core/func_trigonometric.inl +/// @file glm/detail/func_trigonometric.inl /// @date 2008-08-03 / 2011-06-15 /// @author Christophe Riccio /////////////////////////////////////////////////////////////////////////////////// diff --git a/glm/detail/func_vector_relational.hpp b/glm/detail/func_vector_relational.hpp index a1a409cf..8a297520 100644 --- a/glm/detail/func_vector_relational.hpp +++ b/glm/detail/func_vector_relational.hpp @@ -21,7 +21,7 @@ /// THE SOFTWARE. /// /// @ref core -/// @file glm/core/func_vector_relational.hpp +/// @file glm/detail/func_vector_relational.hpp /// @date 2008-08-03 / 2011-06-15 /// @author Christophe Riccio /// diff --git a/glm/detail/func_vector_relational.inl b/glm/detail/func_vector_relational.inl index 9c83de5e..de3dc8b6 100644 --- a/glm/detail/func_vector_relational.inl +++ b/glm/detail/func_vector_relational.inl @@ -21,7 +21,7 @@ /// THE SOFTWARE. /// /// @ref core -/// @file glm/core/func_vector_relational.inl +/// @file glm/detail/func_vector_relational.inl /// @date 2008-08-03 / 2011-09-09 /// @author Christophe Riccio /////////////////////////////////////////////////////////////////////////////////// diff --git a/glm/detail/hint.hpp b/glm/detail/hint.hpp index 2b96c0f6..8706320d 100644 --- a/glm/detail/hint.hpp +++ b/glm/detail/hint.hpp @@ -21,7 +21,7 @@ /// THE SOFTWARE. /// /// @ref core -/// @file glm/core/hint.hpp +/// @file glm/detail/hint.hpp /// @date 2008-08-14 / 2011-06-15 /// @author Christophe Riccio /////////////////////////////////////////////////////////////////////////////////// diff --git a/glm/glm.hpp b/glm/glm.hpp index 5526a1fd..7a761d8c 100644 --- a/glm/glm.hpp +++ b/glm/glm.hpp @@ -25,9 +25,9 @@ /// @date 2005-01-14 / 2011-10-24 /// @author Christophe Riccio /// -/// @defgroup core GLM Core -/// -/// @brief The core of GLM, which implements exactly and only the GLSL specification to the degree possible. +/// @defgroup core GLM Core +/// +/// @brief The core of GLM, which implements exactly and only the GLSL specification to the degree possible. /// /// The GLM core consists of @ref core_types "C++ types that mirror GLSL types" and /// C++ functions that mirror the GLSL functions. It also includes @@ -37,7 +37,6 @@ /// The best documentation for GLM Core is the current GLSL specification, /// version 4.2 /// (pdf file). -/// There are a few @ref pg_differences "differences" between GLM core and GLSL. /// /// GLM core functionnalities require to be included to be used. /// diff --git a/glm/gtc/matrix_transform.hpp b/glm/gtc/matrix_transform.hpp index 83f22b0d..a780668c 100644 --- a/glm/gtc/matrix_transform.hpp +++ b/glm/gtc/matrix_transform.hpp @@ -77,8 +77,6 @@ namespace glm /// // m[3][0] == 1.0f, m[3][1] == 1.0f, m[3][2] == 1.0f, m[3][3] == 1.0f /// @endcode /// @see gtc_matrix_transform - /// @see gtx_transform - /// @see - translate(T x, T y, T z) /// @see - translate(tmat4x4 const & m, T x, T y, T z) /// @see - translate(tvec3 const & v) template @@ -93,8 +91,6 @@ namespace glm /// @param axis Rotation axis, recommanded to be normalized. /// @tparam T Value type used to build the matrix. Supported: half, float or double. /// @see gtc_matrix_transform - /// @see gtx_transform - /// @see - rotate(T angle, T x, T y, T z) /// @see - rotate(tmat4x4 const & m, T angle, T x, T y, T z) /// @see - rotate(T angle, tvec3 const & v) template @@ -109,8 +105,6 @@ namespace glm /// @param v Ratio of scaling for each axis. /// @tparam T Value type used to build the matrix. Currently supported: half (not recommanded), float or double. /// @see gtc_matrix_transform - /// @see gtx_transform - /// @see - scale(T x, T y, T z) scale(T const & x, T const & y, T const & z) /// @see - scale(tmat4x4 const & m, T x, T y, T z) /// @see - scale(tvec3 const & v) template @@ -175,10 +169,10 @@ namespace glm /// Creates a matrix for a symetric perspective-view frustum. /// - /// @param fovy Expressed in radians. - /// @param aspect - /// @param near - /// @param far + /// @param fovy Specifies the field of view angle, in degrees, in the y direction. Expressed in radians. + /// @param aspect Specifies the aspect ratio that determines the field of view in the x direction. The aspect ratio is the ratio of x (width) to y (height). + /// @param near Specifies the distance from the viewer to the near clipping plane (always positive). + /// @param far Specifies the distance from the viewer to the far clipping plane (always positive). /// @tparam T Value type used to build the matrix. Currently supported: half (not recommanded), float or double. /// @see gtc_matrix_transform template @@ -193,8 +187,8 @@ namespace glm /// @param fov Expressed in radians. /// @param width /// @param height - /// @param near - /// @param far + /// @param near Specifies the distance from the viewer to the near clipping plane (always positive). + /// @param far Specifies the distance from the viewer to the far clipping plane (always positive). /// @tparam T Value type used to build the matrix. Currently supported: half (not recommanded), float or double. /// @see gtc_matrix_transform template @@ -207,9 +201,9 @@ namespace glm /// Creates a matrix for a symmetric perspective-view frustum with far plane at infinite. /// - /// @param fovy Expressed in radians. - /// @param aspect - /// @param near + /// @param fovy Specifies the field of view angle, in degrees, in the y direction. Expressed in radians. + /// @param aspect Specifies the aspect ratio that determines the field of view in the x direction. The aspect ratio is the ratio of x (width) to y (height). + /// @param near Specifies the distance from the viewer to the near clipping plane (always positive). /// @tparam T Value type used to build the matrix. Currently supported: half (not recommanded), float or double. /// @see gtc_matrix_transform template @@ -218,9 +212,9 @@ namespace glm /// Creates a matrix for a symmetric perspective-view frustum with far plane at infinite for graphics hardware that doesn't support depth clamping. /// - /// @param fovy Expressed in radians. - /// @param aspect - /// @param near + /// @param fovy Specifies the field of view angle, in degrees, in the y direction. Expressed in radians. + /// @param aspect Specifies the aspect ratio that determines the field of view in the x direction. The aspect ratio is the ratio of x (width) to y (height). + /// @param near Specifies the distance from the viewer to the near clipping plane (always positive). /// @tparam T Value type used to build the matrix. Currently supported: half (not recommanded), float or double. /// @see gtc_matrix_transform template @@ -229,9 +223,10 @@ namespace glm /// Creates a matrix for a symmetric perspective-view frustum with far plane at infinite for graphics hardware that doesn't support depth clamping. /// - /// @param fovy Expressed in radians. - /// @param aspect - /// @param near + /// @param fovy Specifies the field of view angle, in degrees, in the y direction. Expressed in radians. + /// @param aspect Specifies the aspect ratio that determines the field of view in the x direction. The aspect ratio is the ratio of x (width) to y (height). + /// @param near Specifies the distance from the viewer to the near clipping plane (always positive). + /// @param ep /// @tparam T Value type used to build the matrix. Currently supported: half (not recommanded), float or double. /// @see gtc_matrix_transform template @@ -240,10 +235,11 @@ namespace glm /// Map the specified object coordinates (obj.x, obj.y, obj.z) into window coordinates. /// - /// @param obj - /// @param model - /// @param proj - /// @param viewport + /// @param obj Specify the object coordinates. + /// @param model Specifies the current modelview matrix + /// @param proj Specifies the current projection matrix + /// @param viewport Specifies the current viewport + /// @return Return the computed window coordinates. /// @tparam T Native type used for the computation. Currently supported: half (not recommanded), float or double. /// @tparam U Currently supported: Floating-point types and integer types. /// @see gtc_matrix_transform @@ -256,10 +252,11 @@ namespace glm /// Map the specified window coordinates (win.x, win.y, win.z) into object coordinates. /// - /// @param win - /// @param model - /// @param proj - /// @param viewport + /// @param win Specify the window coordinates to be mapped. + /// @param model Specifies the modelview matrix + /// @param proj Specifies the projection matrix + /// @param viewport Specifies the viewport + /// @return Returns the computed object coordinates. /// @tparam T Native type used for the computation. Currently supported: half (not recommanded), float or double. /// @tparam U Currently supported: Floating-point types and integer types. /// @see gtc_matrix_transform diff --git a/glm/gtc/round.hpp b/glm/gtc/round.hpp index 9e8eee77..ee26ffe2 100644 --- a/glm/gtc/round.hpp +++ b/glm/gtc/round.hpp @@ -107,19 +107,19 @@ namespace glm template class vecType> GLM_FUNC_DECL vecType roundPowerOfTwo(vecType const & value); - /// Return true if the is a multiple of . + /// Return true if the 'Value' is a multiple of 'Multiple'. /// /// @see gtc_round template GLM_FUNC_DECL bool isMultiple(genIUType Value, genIUType Multiple); - /// Return true if the is a multiple of . + /// Return true if the 'Value' is a multiple of 'Multiple'. /// /// @see gtc_round template class vecType> GLM_FUNC_DECL vecType isMultiple(vecType const & Value, T Multiple); - /// Return true if the is a multiple of . + /// Return true if the 'Value' is a multiple of 'Multiple'. /// /// @see gtc_round template class vecType> diff --git a/glm/gtx/range.hpp b/glm/gtx/range.hpp index 097e8501..f2fc01ba 100644 --- a/glm/gtx/range.hpp +++ b/glm/gtx/range.hpp @@ -25,13 +25,18 @@ /// @date 2014-09-19 / 2014-09-19 /// @author Joshua Moerman /// +/// @defgroup gtx_range GLM_GTX_range +/// @ingroup gtx +/// /// @brief Defines begin and end for vectors and matrices. Useful for range-based for loop. /// The range is defined over the elements, not over columns or rows (e.g. mat4 has 16 elements). /// +/// need to be included to use these functionalities. /////////////////////////////////////////////////////////////////////////////////// #pragma once +// Dependencies #include "../detail/setup.hpp" #if !GLM_HAS_RANGE_FOR @@ -66,6 +71,9 @@ namespace detail } }//namespace + /// @addtogroup gtx_range + /// @{ + template const typename genType::value_type * begin(genType const & v){ return value_ptr(v); @@ -85,4 +93,6 @@ namespace detail typename genType::value_type * end(genType& v){ return begin(v) + detail::number_of_elements_(v); } + + /// @} }//namespace glm diff --git a/glm/gtx/simd_quat.hpp b/glm/gtx/simd_quat.hpp index f3aa2938..ffdf0a9e 100644 --- a/glm/gtx/simd_quat.hpp +++ b/glm/gtx/simd_quat.hpp @@ -27,7 +27,7 @@ /// /// @see core (dependence) /// -/// @defgroup gtx_simd_vec4 GLM_GTX_simd_quat +/// @defgroup gtx_simd_quat GLM_GTX_simd_quat /// @ingroup gtx /// /// @brief SIMD implementation of quat type. @@ -54,19 +54,15 @@ # pragma message("GLM: GLM_GTX_simd_quat extension included") #endif - // Warning silencer for nameless struct/union. #if (GLM_COMPILER & GLM_COMPILER_VC) # pragma warning(push) # pragma warning(disable:4201) // warning C4201: nonstandard extension used : nameless struct/union #endif - namespace glm{ namespace detail { - /// Quaternion implemented using SIMD SEE intrinsics. - /// \ingroup gtx_simd_vec4 GLM_ALIGNED_STRUCT(16) fquatSIMD { typedef __m128 value_type; @@ -77,13 +73,13 @@ namespace detail typedef tquat bool_type; #ifdef GLM_SIMD_ENABLE_XYZW_UNION - union - { - __m128 Data; - struct {float x, y, z, w;}; - }; + union + { + __m128 Data; + struct {float x, y, z, w;}; + }; #else - __m128 Data; + __m128 Data; #endif ////////////////////////////////////// @@ -105,7 +101,7 @@ namespace detail float const & z); explicit fquatSIMD( quat const & v); - explicit fquatSIMD( + explicit fquatSIMD( vec3 const & eulerAngles); @@ -154,59 +150,59 @@ namespace detail }//namespace detail - typedef glm::detail::fquatSIMD simdQuat; - /// @addtogroup gtx_simd_quat /// @{ + typedef glm::detail::fquatSIMD simdQuat; + //! Convert a simdQuat to a quat. - //! (From GLM_GTX_simd_quat extension) + /// @see gtx_simd_quat quat quat_cast( detail::fquatSIMD const & x); //! Convert a simdMat4 to a simdQuat. - //! (From GLM_GTX_simd_quat extension) + /// @see gtx_simd_quat detail::fquatSIMD quatSIMD_cast( detail::fmat4x4SIMD const & m); //! Converts a mat4 to a simdQuat. - //! (From GLM_GTX_simd_quat extension) + /// @see gtx_simd_quat template detail::fquatSIMD quatSIMD_cast( tmat4x4 const & m); //! Converts a mat3 to a simdQuat. - //! (From GLM_GTX_simd_quat extension) + /// @see gtx_simd_quat template detail::fquatSIMD quatSIMD_cast( tmat3x3 const & m); //! Convert a simdQuat to a simdMat4 - //! (From GLM_GTX_simd_quat extension) + /// @see gtx_simd_quat detail::fmat4x4SIMD mat4SIMD_cast( detail::fquatSIMD const & q); //! Converts a simdQuat to a standard mat4. - //! (From GLM_GTX_simd_quat extension) + /// @see gtx_simd_quat mat4 mat4_cast( detail::fquatSIMD const & q); /// Returns the length of the quaternion. /// - /// @see gtc_quaternion + /// @see gtx_simd_quat float length( detail::fquatSIMD const & x); /// Returns the normalized quaternion. /// - /// @see gtc_quaternion + /// @see gtx_simd_quat detail::fquatSIMD normalize( detail::fquatSIMD const & x); /// Returns dot product of q1 and q2, i.e., q1[0] * q2[0] + q1[1] * q2[1] + ... /// - /// @see gtc_quaternion + /// @see gtx_simd_quat float dot( detail::fquatSIMD const & q1, detail::fquatSIMD const & q2); @@ -219,7 +215,7 @@ namespace detail /// @param y A quaternion /// @param a Interpolation factor. The interpolation is defined beyond the range [0, 1]. /// @tparam T Value type used to build the quaternion. Supported: half, float or double. - /// @see gtc_quaternion + /// @see gtx_simd_quat /// @see - slerp(detail::fquatSIMD const & x, detail::fquatSIMD const & y, T const & a) detail::fquatSIMD mix( detail::fquatSIMD const & x, @@ -233,7 +229,7 @@ namespace detail /// @param y A quaternion /// @param a Interpolation factor. The interpolation is defined in the range [0, 1]. /// @tparam T Value type used to build the quaternion. Supported: half, float or double. - /// @see gtc_quaternion + /// @see gtx_simd_quat detail::fquatSIMD lerp( detail::fquatSIMD const & x, detail::fquatSIMD const & y, @@ -246,7 +242,7 @@ namespace detail /// @param y A quaternion /// @param a Interpolation factor. The interpolation is defined beyond the range [0, 1]. /// @tparam T Value type used to build the quaternion. Supported: half, float or double. - /// @see gtc_quaternion + /// @see gtx_simd_quat detail::fquatSIMD slerp( detail::fquatSIMD const & x, detail::fquatSIMD const & y, @@ -261,7 +257,7 @@ namespace detail /// /// This will use the equivalent to fastAcos() and fastSin(). /// - /// @see gtc_quaternion + /// @see gtx_simd_quat /// @see - mix(detail::fquatSIMD const & x, detail::fquatSIMD const & y, T const & a) detail::fquatSIMD fastMix( detail::fquatSIMD const & x, @@ -283,13 +279,13 @@ namespace detail /// Returns the q conjugate. /// - /// @see gtc_quaternion + /// @see gtx_simd_quat detail::fquatSIMD conjugate( detail::fquatSIMD const & q); /// Returns the q inverse. /// - /// @see gtc_quaternion + /// @see gtx_simd_quat detail::fquatSIMD inverse( detail::fquatSIMD const & q); @@ -298,7 +294,7 @@ namespace detail /// @param angle Angle expressed in radians. /// @param axis Axis of the quaternion, must be normalized. /// - /// @see gtc_quaternion + /// @see gtx_simd_quat detail::fquatSIMD angleAxisSIMD( float const & angle, vec3 const & axis); @@ -310,19 +306,17 @@ namespace detail /// @param y y component of the y-axis, x, y, z must be a normalized axis /// @param z z component of the z-axis, x, y, z must be a normalized axis /// - /// @see gtc_quaternion + /// @see gtx_simd_quat detail::fquatSIMD angleAxisSIMD( float const & angle, float const & x, float const & y, float const & z); - // TODO: Move this to somewhere more appropriate. Used with fastMix() and fastSlerp(). /// Performs the equivalent of glm::fastSin() on each component of the given __m128. __m128 fastSin(__m128 x); - /// @} }//namespace glm diff --git a/glm/gtx/transform.hpp b/glm/gtx/transform.hpp index 602c8ce1..d0ff300d 100644 --- a/glm/gtx/transform.hpp +++ b/glm/gtx/transform.hpp @@ -53,24 +53,24 @@ namespace glm /// @addtogroup gtx_transform /// @{ - /// Transforms a matrix with a translation 4 * 4 matrix created from 3 scalars. - /// - From \link gtx_transform GLM_GTX_transform \endlink extension - /// - See also: \link glm::translate GLM_GTC_matrix_transform \endlink + /// Transforms a matrix with a translation 4 * 4 matrix created from 3 scalars. + /// @see gtc_matrix_transform + /// @see gtx_transform template GLM_FUNC_DECL tmat4x4 translate( tvec3 const & v); /// Builds a rotation 4 * 4 matrix created from an axis of 3 scalars and an angle expressed in degrees. - /// - From \link gtx_transform GLM_GTX_transform \endlink extension - /// - See also: \link glm::rotate GLM_GTC_matrix_transform \endlink + /// @see gtc_matrix_transform + /// @see gtx_transform template GLM_FUNC_DECL tmat4x4 rotate( T angle, tvec3 const & v); /// Transforms a matrix with a scale 4 * 4 matrix created from a vector of 3 components. - /// - From \link gtx_transform GLM_GTX_transform \endlink extension - /// - See also: \link glm::scale GLM_GTC_matrix_transform \endlink + /// @see gtc_matrix_transform + /// @see gtx_transform template GLM_FUNC_DECL tmat4x4 scale( tvec3 const & v); diff --git a/glm/gtx/type_aligned.hpp b/glm/gtx/type_aligned.hpp index 4fa39381..bfe4b3d4 100644 --- a/glm/gtx/type_aligned.hpp +++ b/glm/gtx/type_aligned.hpp @@ -20,22 +20,22 @@ /// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN /// THE SOFTWARE. /// -/// @ref gtc_type_aligned -/// @file glm/gtc/type_aligned.hpp +/// @ref gtx_type_aligned +/// @file glm/gtx/type_aligned.hpp /// @date 2014-11-23 / 2014-12-23 /// @author Christophe Riccio /// /// @see core (dependence) /// @see gtc_quaternion (dependence) /// -/// @defgroup gtc_type_aligned GLM_GTC_type_aligned -/// @ingroup gtc +/// @defgroup gtx_type_aligned GLM_GTX_type_aligned +/// @ingroup gtx /// /// @brief Defines aligned types. /// /// @ref core_precision defines aligned types. /// -/// need to be included to use these functionalities. +/// need to be included to use these functionalities. /////////////////////////////////////////////////////////////////////////////////// #pragma once @@ -44,7 +44,7 @@ #include "../gtc/type_precision.hpp" #if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) -# pragma message("GLM: GLM_GTC_type_aligned extension included") +# pragma message("GLM: GLM_GTX_type_aligned extension included") #endif namespace glm @@ -52,295 +52,295 @@ namespace glm /////////////////////////// // Signed int vector types - /// @addtogroup gtc_type_aligned + /// @addtogroup gtx_type_aligned /// @{ /// Low precision 8 bit signed integer aligned scalar type. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(lowp_int8, aligned_lowp_int8, 1); /// Low precision 16 bit signed integer aligned scalar type. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(lowp_int16, aligned_lowp_int16, 2); /// Low precision 32 bit signed integer aligned scalar type. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(lowp_int32, aligned_lowp_int32, 4); /// Low precision 64 bit signed integer aligned scalar type. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(lowp_int64, aligned_lowp_int64, 8); /// Low precision 8 bit signed integer aligned scalar type. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(lowp_int8_t, aligned_lowp_int8_t, 1); /// Low precision 16 bit signed integer aligned scalar type. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(lowp_int16_t, aligned_lowp_int16_t, 2); /// Low precision 32 bit signed integer aligned scalar type. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(lowp_int32_t, aligned_lowp_int32_t, 4); /// Low precision 64 bit signed integer aligned scalar type. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(lowp_int64_t, aligned_lowp_int64_t, 8); /// Low precision 8 bit signed integer aligned scalar type. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(lowp_i8, aligned_lowp_i8, 1); /// Low precision 16 bit signed integer aligned scalar type. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(lowp_i16, aligned_lowp_i16, 2); /// Low precision 32 bit signed integer aligned scalar type. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(lowp_i32, aligned_lowp_i32, 4); /// Low precision 64 bit signed integer aligned scalar type. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(lowp_i64, aligned_lowp_i64, 8); /// Medium precision 8 bit signed integer aligned scalar type. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(mediump_int8, aligned_mediump_int8, 1); /// Medium precision 16 bit signed integer aligned scalar type. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(mediump_int16, aligned_mediump_int16, 2); /// Medium precision 32 bit signed integer aligned scalar type. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(mediump_int32, aligned_mediump_int32, 4); /// Medium precision 64 bit signed integer aligned scalar type. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(mediump_int64, aligned_mediump_int64, 8); /// Medium precision 8 bit signed integer aligned scalar type. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(mediump_int8_t, aligned_mediump_int8_t, 1); /// Medium precision 16 bit signed integer aligned scalar type. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(mediump_int16_t, aligned_mediump_int16_t, 2); /// Medium precision 32 bit signed integer aligned scalar type. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(mediump_int32_t, aligned_mediump_int32_t, 4); /// Medium precision 64 bit signed integer aligned scalar type. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(mediump_int64_t, aligned_mediump_int64_t, 8); /// Medium precision 8 bit signed integer aligned scalar type. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(mediump_i8, aligned_mediump_i8, 1); /// Medium precision 16 bit signed integer aligned scalar type. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(mediump_i16, aligned_mediump_i16, 2); /// Medium precision 32 bit signed integer aligned scalar type. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(mediump_i32, aligned_mediump_i32, 4); /// Medium precision 64 bit signed integer aligned scalar type. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(mediump_i64, aligned_mediump_i64, 8); /// High precision 8 bit signed integer aligned scalar type. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(highp_int8, aligned_highp_int8, 1); /// High precision 16 bit signed integer aligned scalar type. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(highp_int16, aligned_highp_int16, 2); /// High precision 32 bit signed integer aligned scalar type. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(highp_int32, aligned_highp_int32, 4); /// High precision 64 bit signed integer aligned scalar type. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(highp_int64, aligned_highp_int64, 8); /// High precision 8 bit signed integer aligned scalar type. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(highp_int8_t, aligned_highp_int8_t, 1); /// High precision 16 bit signed integer aligned scalar type. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(highp_int16_t, aligned_highp_int16_t, 2); /// High precision 32 bit signed integer aligned scalar type. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(highp_int32_t, aligned_highp_int32_t, 4); /// High precision 64 bit signed integer aligned scalar type. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(highp_int64_t, aligned_highp_int64_t, 8); /// High precision 8 bit signed integer aligned scalar type. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(highp_i8, aligned_highp_i8, 1); /// High precision 16 bit signed integer aligned scalar type. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(highp_i16, aligned_highp_i16, 2); /// High precision 32 bit signed integer aligned scalar type. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(highp_i32, aligned_highp_i32, 4); /// High precision 64 bit signed integer aligned scalar type. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(highp_i64, aligned_highp_i64, 8); /// Default precision 8 bit signed integer aligned scalar type. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(int8, aligned_int8, 1); /// Default precision 16 bit signed integer aligned scalar type. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(int16, aligned_int16, 2); /// Default precision 32 bit signed integer aligned scalar type. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(int32, aligned_int32, 4); /// Default precision 64 bit signed integer aligned scalar type. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(int64, aligned_int64, 8); /// Default precision 8 bit signed integer aligned scalar type. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(int8_t, aligned_int8_t, 1); /// Default precision 16 bit signed integer aligned scalar type. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(int16_t, aligned_int16_t, 2); /// Default precision 32 bit signed integer aligned scalar type. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(int32_t, aligned_int32_t, 4); /// Default precision 64 bit signed integer aligned scalar type. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(int64_t, aligned_int64_t, 8); /// Default precision 8 bit signed integer aligned scalar type. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(i8, aligned_i8, 1); /// Default precision 16 bit signed integer aligned scalar type. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(i16, aligned_i16, 2); /// Default precision 32 bit signed integer aligned scalar type. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(i32, aligned_i32, 4); /// Default precision 64 bit signed integer aligned scalar type. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(i64, aligned_i64, 8); /// Default precision 32 bit signed integer aligned scalar type. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(ivec1, aligned_ivec1, 4); /// Default precision 32 bit signed integer aligned vector of 2 components type. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(ivec2, aligned_ivec2, 8); /// Default precision 32 bit signed integer aligned vector of 3 components type. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(ivec3, aligned_ivec3, 16); /// Default precision 32 bit signed integer aligned vector of 4 components type. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(ivec4, aligned_ivec4, 16); /// Default precision 8 bit signed integer aligned scalar type. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(i8vec1, aligned_i8vec1, 1); /// Default precision 8 bit signed integer aligned vector of 2 components type. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(i8vec2, aligned_i8vec2, 2); /// Default precision 8 bit signed integer aligned vector of 3 components type. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(i8vec3, aligned_i8vec3, 4); /// Default precision 8 bit signed integer aligned vector of 4 components type. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(i8vec4, aligned_i8vec4, 4); /// Default precision 16 bit signed integer aligned scalar type. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(i16vec1, aligned_i16vec1, 2); /// Default precision 16 bit signed integer aligned vector of 2 components type. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(i16vec2, aligned_i16vec2, 4); /// Default precision 16 bit signed integer aligned vector of 3 components type. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(i16vec3, aligned_i16vec3, 8); /// Default precision 16 bit signed integer aligned vector of 4 components type. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(i16vec4, aligned_i16vec4, 8); /// Default precision 32 bit signed integer aligned scalar type. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(i32vec1, aligned_i32vec1, 4); /// Default precision 32 bit signed integer aligned vector of 2 components type. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(i32vec2, aligned_i32vec2, 8); /// Default precision 32 bit signed integer aligned vector of 3 components type. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(i32vec3, aligned_i32vec3, 16); /// Default precision 32 bit signed integer aligned vector of 4 components type. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(i32vec4, aligned_i32vec4, 16); /// Default precision 64 bit signed integer aligned scalar type. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(i64vec1, aligned_i64vec1, 8); /// Default precision 64 bit signed integer aligned vector of 2 components type. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(i64vec2, aligned_i64vec2, 16); /// Default precision 64 bit signed integer aligned vector of 3 components type. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(i64vec3, aligned_i64vec3, 32); /// Default precision 64 bit signed integer aligned vector of 4 components type. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(i64vec4, aligned_i64vec4, 32); @@ -348,291 +348,291 @@ namespace glm // Unsigned int vector types /// Low precision 8 bit unsigned integer aligned scalar type. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(lowp_uint8, aligned_lowp_uint8, 1); /// Low precision 16 bit unsigned integer aligned scalar type. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(lowp_uint16, aligned_lowp_uint16, 2); /// Low precision 32 bit unsigned integer aligned scalar type. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(lowp_uint32, aligned_lowp_uint32, 4); /// Low precision 64 bit unsigned integer aligned scalar type. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(lowp_uint64, aligned_lowp_uint64, 8); /// Low precision 8 bit unsigned integer aligned scalar type. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(lowp_uint8_t, aligned_lowp_uint8_t, 1); /// Low precision 16 bit unsigned integer aligned scalar type. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(lowp_uint16_t, aligned_lowp_uint16_t, 2); /// Low precision 32 bit unsigned integer aligned scalar type. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(lowp_uint32_t, aligned_lowp_uint32_t, 4); /// Low precision 64 bit unsigned integer aligned scalar type. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(lowp_uint64_t, aligned_lowp_uint64_t, 8); /// Low precision 8 bit unsigned integer aligned scalar type. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(lowp_u8, aligned_lowp_u8, 1); /// Low precision 16 bit unsigned integer aligned scalar type. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(lowp_u16, aligned_lowp_u16, 2); /// Low precision 32 bit unsigned integer aligned scalar type. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(lowp_u32, aligned_lowp_u32, 4); /// Low precision 64 bit unsigned integer aligned scalar type. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(lowp_u64, aligned_lowp_u64, 8); /// Medium precision 8 bit unsigned integer aligned scalar type. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(mediump_uint8, aligned_mediump_uint8, 1); /// Medium precision 16 bit unsigned integer aligned scalar type. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(mediump_uint16, aligned_mediump_uint16, 2); /// Medium precision 32 bit unsigned integer aligned scalar type. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(mediump_uint32, aligned_mediump_uint32, 4); /// Medium precision 64 bit unsigned integer aligned scalar type. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(mediump_uint64, aligned_mediump_uint64, 8); /// Medium precision 8 bit unsigned integer aligned scalar type. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(mediump_uint8_t, aligned_mediump_uint8_t, 1); /// Medium precision 16 bit unsigned integer aligned scalar type. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(mediump_uint16_t, aligned_mediump_uint16_t, 2); /// Medium precision 32 bit unsigned integer aligned scalar type. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(mediump_uint32_t, aligned_mediump_uint32_t, 4); /// Medium precision 64 bit unsigned integer aligned scalar type. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(mediump_uint64_t, aligned_mediump_uint64_t, 8); /// Medium precision 8 bit unsigned integer aligned scalar type. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(mediump_u8, aligned_mediump_u8, 1); /// Medium precision 16 bit unsigned integer aligned scalar type. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(mediump_u16, aligned_mediump_u16, 2); /// Medium precision 32 bit unsigned integer aligned scalar type. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(mediump_u32, aligned_mediump_u32, 4); /// Medium precision 64 bit unsigned integer aligned scalar type. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(mediump_u64, aligned_mediump_u64, 8); /// High precision 8 bit unsigned integer aligned scalar type. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(highp_uint8, aligned_highp_uint8, 1); /// High precision 16 bit unsigned integer aligned scalar type. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(highp_uint16, aligned_highp_uint16, 2); /// High precision 32 bit unsigned integer aligned scalar type. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(highp_uint32, aligned_highp_uint32, 4); /// High precision 64 bit unsigned integer aligned scalar type. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(highp_uint64, aligned_highp_uint64, 8); /// High precision 8 bit unsigned integer aligned scalar type. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(highp_uint8_t, aligned_highp_uint8_t, 1); /// High precision 16 bit unsigned integer aligned scalar type. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(highp_uint16_t, aligned_highp_uint16_t, 2); /// High precision 32 bit unsigned integer aligned scalar type. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(highp_uint32_t, aligned_highp_uint32_t, 4); /// High precision 64 bit unsigned integer aligned scalar type. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(highp_uint64_t, aligned_highp_uint64_t, 8); /// High precision 8 bit unsigned integer aligned scalar type. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(highp_u8, aligned_highp_u8, 1); /// High precision 16 bit unsigned integer aligned scalar type. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(highp_u16, aligned_highp_u16, 2); /// High precision 32 bit unsigned integer aligned scalar type. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(highp_u32, aligned_highp_u32, 4); /// High precision 64 bit unsigned integer aligned scalar type. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(highp_u64, aligned_highp_u64, 8); /// Default precision 8 bit unsigned integer aligned scalar type. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(uint8, aligned_uint8, 1); /// Default precision 16 bit unsigned integer aligned scalar type. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(uint16, aligned_uint16, 2); /// Default precision 32 bit unsigned integer aligned scalar type. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(uint32, aligned_uint32, 4); /// Default precision 64 bit unsigned integer aligned scalar type. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(uint64, aligned_uint64, 8); /// Default precision 8 bit unsigned integer aligned scalar type. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(uint8_t, aligned_uint8_t, 1); /// Default precision 16 bit unsigned integer aligned scalar type. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(uint16_t, aligned_uint16_t, 2); /// Default precision 32 bit unsigned integer aligned scalar type. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(uint32_t, aligned_uint32_t, 4); /// Default precision 64 bit unsigned integer aligned scalar type. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(uint64_t, aligned_uint64_t, 8); /// Default precision 8 bit unsigned integer aligned scalar type. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(u8, aligned_u8, 1); /// Default precision 16 bit unsigned integer aligned scalar type. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(u16, aligned_u16, 2); /// Default precision 32 bit unsigned integer aligned scalar type. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(u32, aligned_u32, 4); /// Default precision 64 bit unsigned integer aligned scalar type. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(u64, aligned_u64, 8); /// Default precision 32 bit unsigned integer aligned scalar type. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(uvec1, aligned_uvec1, 4); /// Default precision 32 bit unsigned integer aligned vector of 2 components type. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(uvec2, aligned_uvec2, 8); /// Default precision 32 bit unsigned integer aligned vector of 3 components type. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(uvec3, aligned_uvec3, 16); /// Default precision 32 bit unsigned integer aligned vector of 4 components type. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(uvec4, aligned_uvec4, 16); /// Default precision 8 bit unsigned integer aligned scalar type. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(u8vec1, aligned_u8vec1, 1); /// Default precision 8 bit unsigned integer aligned vector of 2 components type. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(u8vec2, aligned_u8vec2, 2); /// Default precision 8 bit unsigned integer aligned vector of 3 components type. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(u8vec3, aligned_u8vec3, 4); /// Default precision 8 bit unsigned integer aligned vector of 4 components type. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(u8vec4, aligned_u8vec4, 4); /// Default precision 16 bit unsigned integer aligned scalar type. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(u16vec1, aligned_u16vec1, 2); /// Default precision 16 bit unsigned integer aligned vector of 2 components type. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(u16vec2, aligned_u16vec2, 4); /// Default precision 16 bit unsigned integer aligned vector of 3 components type. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(u16vec3, aligned_u16vec3, 8); /// Default precision 16 bit unsigned integer aligned vector of 4 components type. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(u16vec4, aligned_u16vec4, 8); /// Default precision 32 bit unsigned integer aligned scalar type. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(u32vec1, aligned_u32vec1, 4); /// Default precision 32 bit unsigned integer aligned vector of 2 components type. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(u32vec2, aligned_u32vec2, 8); /// Default precision 32 bit unsigned integer aligned vector of 3 components type. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(u32vec3, aligned_u32vec3, 16); /// Default precision 32 bit unsigned integer aligned vector of 4 components type. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(u32vec4, aligned_u32vec4, 16); /// Default precision 64 bit unsigned integer aligned scalar type. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(u64vec1, aligned_u64vec1, 8); /// Default precision 64 bit unsigned integer aligned vector of 2 components type. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(u64vec2, aligned_u64vec2, 16); /// Default precision 64 bit unsigned integer aligned vector of 3 components type. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(u64vec3, aligned_u64vec3, 32); /// Default precision 64 bit unsigned integer aligned vector of 4 components type. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(u64vec4, aligned_u64vec4, 32); @@ -640,114 +640,114 @@ namespace glm // Float vector types /// 32 bit single-precision floating-point aligned scalar. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(float32, aligned_float32, 4); /// 64 bit double-precision floating-point aligned scalar. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(float64, aligned_float64, 8); /// 32 bit single-precision floating-point aligned scalar. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(float32_t, aligned_float32_t, 4); /// 64 bit double-precision floating-point aligned scalar. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(float64_t, aligned_float64_t, 8); /// 32 bit single-precision floating-point aligned scalar. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(float32, aligned_f32, 4); /// 64 bit double-precision floating-point aligned scalar. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(float64, aligned_f64, 8); /// Single-precision floating-point aligned vector of 1 component. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(vec1, aligned_vec1, 4); /// Single-precision floating-point aligned vector of 2 components. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(vec2, aligned_vec2, 8); /// Single-precision floating-point aligned vector of 3 components. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(vec3, aligned_vec3, 16); /// Single-precision floating-point aligned vector of 4 components. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(vec4, aligned_vec4, 16); /// Single-precision floating-point aligned vector of 1 component. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(fvec1, aligned_fvec1, 4); /// Single-precision floating-point aligned vector of 2 components. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(fvec2, aligned_fvec2, 8); /// Single-precision floating-point aligned vector of 3 components. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(fvec3, aligned_fvec3, 16); /// Single-precision floating-point aligned vector of 4 components. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(fvec4, aligned_fvec4, 16); /// Single-precision floating-point aligned vector of 1 component. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(f32vec1, aligned_f32vec1, 4); /// Single-precision floating-point aligned vector of 2 components. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(f32vec2, aligned_f32vec2, 8); /// Single-precision floating-point aligned vector of 3 components. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(f32vec3, aligned_f32vec3, 16); /// Single-precision floating-point aligned vector of 4 components. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(f32vec4, aligned_f32vec4, 16); /// Double-precision floating-point aligned vector of 1 component. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(dvec1, aligned_dvec1, 8); /// Double-precision floating-point aligned vector of 2 components. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(dvec2, aligned_dvec2, 16); /// Double-precision floating-point aligned vector of 3 components. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(dvec3, aligned_dvec3, 32); /// Double-precision floating-point aligned vector of 4 components. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(dvec4, aligned_dvec4, 32); /// Double-precision floating-point aligned vector of 1 component. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(f64vec1, aligned_f64vec1, 8); /// Double-precision floating-point aligned vector of 2 components. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(f64vec2, aligned_f64vec2, 16); /// Double-precision floating-point aligned vector of 3 components. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(f64vec3, aligned_f64vec3, 32); /// Double-precision floating-point aligned vector of 4 components. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(f64vec4, aligned_f64vec4, 32); @@ -755,210 +755,210 @@ namespace glm // Float matrix types /// Single-precision floating-point aligned 1x1 matrix. - /// @see gtc_type_aligned + /// @see gtx_type_aligned //typedef detail::tmat1 mat1; /// Single-precision floating-point aligned 2x2 matrix. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(mat2, aligned_mat2, 16); /// Single-precision floating-point aligned 3x3 matrix. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(mat3, aligned_mat3, 16); /// Single-precision floating-point aligned 4x4 matrix. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(mat4, aligned_mat4, 16); /// Single-precision floating-point aligned 1x1 matrix. - /// @see gtc_type_aligned + /// @see gtx_type_aligned //typedef detail::tmat1x1 mat1; /// Single-precision floating-point aligned 2x2 matrix. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(mat2x2, aligned_mat2x2, 16); /// Single-precision floating-point aligned 3x3 matrix. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(mat3x3, aligned_mat3x3, 16); /// Single-precision floating-point aligned 4x4 matrix. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(mat4x4, aligned_mat4x4, 16); /// Single-precision floating-point aligned 1x1 matrix. - /// @see gtc_type_aligned + /// @see gtx_type_aligned //typedef detail::tmat1x1 fmat1; /// Single-precision floating-point aligned 2x2 matrix. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(fmat2x2, aligned_fmat2, 16); /// Single-precision floating-point aligned 3x3 matrix. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(fmat3x3, aligned_fmat3, 16); /// Single-precision floating-point aligned 4x4 matrix. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(fmat4x4, aligned_fmat4, 16); /// Single-precision floating-point aligned 1x1 matrix. - /// @see gtc_type_aligned + /// @see gtx_type_aligned //typedef f32 fmat1x1; /// Single-precision floating-point aligned 2x2 matrix. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(fmat2x2, aligned_fmat2x2, 16); /// Single-precision floating-point aligned 2x3 matrix. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(fmat2x3, aligned_fmat2x3, 16); /// Single-precision floating-point aligned 2x4 matrix. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(fmat2x4, aligned_fmat2x4, 16); /// Single-precision floating-point aligned 3x2 matrix. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(fmat3x2, aligned_fmat3x2, 16); /// Single-precision floating-point aligned 3x3 matrix. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(fmat3x3, aligned_fmat3x3, 16); /// Single-precision floating-point aligned 3x4 matrix. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(fmat3x4, aligned_fmat3x4, 16); /// Single-precision floating-point aligned 4x2 matrix. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(fmat4x2, aligned_fmat4x2, 16); /// Single-precision floating-point aligned 4x3 matrix. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(fmat4x3, aligned_fmat4x3, 16); /// Single-precision floating-point aligned 4x4 matrix. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(fmat4x4, aligned_fmat4x4, 16); /// Single-precision floating-point aligned 1x1 matrix. - /// @see gtc_type_aligned + /// @see gtx_type_aligned //typedef detail::tmat1x1 f32mat1; /// Single-precision floating-point aligned 2x2 matrix. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(f32mat2x2, aligned_f32mat2, 16); /// Single-precision floating-point aligned 3x3 matrix. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(f32mat3x3, aligned_f32mat3, 16); /// Single-precision floating-point aligned 4x4 matrix. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(f32mat4x4, aligned_f32mat4, 16); /// Single-precision floating-point aligned 1x1 matrix. - /// @see gtc_type_aligned + /// @see gtx_type_aligned //typedef f32 f32mat1x1; /// Single-precision floating-point aligned 2x2 matrix. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(f32mat2x2, aligned_f32mat2x2, 16); /// Single-precision floating-point aligned 2x3 matrix. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(f32mat2x3, aligned_f32mat2x3, 16); /// Single-precision floating-point aligned 2x4 matrix. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(f32mat2x4, aligned_f32mat2x4, 16); /// Single-precision floating-point aligned 3x2 matrix. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(f32mat3x2, aligned_f32mat3x2, 16); /// Single-precision floating-point aligned 3x3 matrix. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(f32mat3x3, aligned_f32mat3x3, 16); /// Single-precision floating-point aligned 3x4 matrix. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(f32mat3x4, aligned_f32mat3x4, 16); /// Single-precision floating-point aligned 4x2 matrix. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(f32mat4x2, aligned_f32mat4x2, 16); /// Single-precision floating-point aligned 4x3 matrix. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(f32mat4x3, aligned_f32mat4x3, 16); /// Single-precision floating-point aligned 4x4 matrix. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(f32mat4x4, aligned_f32mat4x4, 16); /// Double-precision floating-point aligned 1x1 matrix. - /// @see gtc_type_aligned + /// @see gtx_type_aligned //typedef detail::tmat1x1 f64mat1; /// Double-precision floating-point aligned 2x2 matrix. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(f64mat2x2, aligned_f64mat2, 32); /// Double-precision floating-point aligned 3x3 matrix. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(f64mat3x3, aligned_f64mat3, 32); /// Double-precision floating-point aligned 4x4 matrix. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(f64mat4x4, aligned_f64mat4, 32); /// Double-precision floating-point aligned 1x1 matrix. - /// @see gtc_type_aligned + /// @see gtx_type_aligned //typedef f64 f64mat1x1; /// Double-precision floating-point aligned 2x2 matrix. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(f64mat2x2, aligned_f64mat2x2, 32); /// Double-precision floating-point aligned 2x3 matrix. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(f64mat2x3, aligned_f64mat2x3, 32); /// Double-precision floating-point aligned 2x4 matrix. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(f64mat2x4, aligned_f64mat2x4, 32); /// Double-precision floating-point aligned 3x2 matrix. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(f64mat3x2, aligned_f64mat3x2, 32); /// Double-precision floating-point aligned 3x3 matrix. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(f64mat3x3, aligned_f64mat3x3, 32); /// Double-precision floating-point aligned 3x4 matrix. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(f64mat3x4, aligned_f64mat3x4, 32); /// Double-precision floating-point aligned 4x2 matrix. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(f64mat4x2, aligned_f64mat4x2, 32); /// Double-precision floating-point aligned 4x3 matrix. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(f64mat4x3, aligned_f64mat4x3, 32); /// Double-precision floating-point aligned 4x4 matrix. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(f64mat4x4, aligned_f64mat4x4, 32); @@ -966,23 +966,23 @@ namespace glm // Quaternion types /// Single-precision floating-point aligned quaternion. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(quat, aligned_quat, 16); /// Single-precision floating-point aligned quaternion. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(fquat, aligned_fquat, 16); /// Double-precision floating-point aligned quaternion. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(dquat, aligned_dquat, 32); /// Single-precision floating-point aligned quaternion. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(f32quat, aligned_f32quat, 16); /// Double-precision floating-point aligned quaternion. - /// @see gtc_type_aligned + /// @see gtx_type_aligned GLM_ALIGNED_TYPEDEF(f64quat, aligned_f64quat, 32); /// @}