From 51716bb46084f0768a11175412d33bfe3ed8c877 Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Tue, 13 Sep 2011 11:34:45 +0100 Subject: [PATCH] Extensions included have a define which value is GLM_VERSION --- glm/gtc/half_float.hpp | 2 +- glm/gtc/matrix_access.hpp | 2 +- glm/gtc/matrix_integer.hpp | 2 +- glm/gtc/matrix_inverse.hpp | 2 +- glm/gtc/matrix_transform.hpp | 2 +- glm/gtc/quaternion.hpp | 56 +++++++++++++++++++---------- glm/gtc/swizzle.hpp | 2 +- glm/gtc/type_precision.hpp | 2 +- glm/gtc/type_ptr.hpp | 2 +- glm/gtx/associated_min_max.hpp | 2 +- glm/gtx/bit.hpp | 2 +- glm/gtx/closest_point.hpp | 2 +- glm/gtx/color_cast.hpp | 2 +- glm/gtx/color_space.hpp | 2 +- glm/gtx/color_space_YCoCg.hpp | 2 +- glm/gtx/compatibility.hpp | 2 +- glm/gtx/component_wise.hpp | 2 +- glm/gtx/epsilon.hpp | 2 +- glm/gtx/euler_angles.hpp | 2 +- glm/gtx/extend.hpp | 2 +- glm/gtx/extented_min_max.hpp | 2 +- glm/gtx/fast_exponential.hpp | 2 +- glm/gtx/fast_square_root.hpp | 2 +- glm/gtx/fast_trigonometry.hpp | 2 +- glm/gtx/gradient_paint.hpp | 2 +- glm/gtx/handed_coordinate_space.hpp | 2 +- glm/gtx/inertia.hpp | 2 +- glm/gtx/int_10_10_10_2.hpp | 2 +- glm/gtx/integer.hpp | 2 +- glm/gtx/intersect.hpp | 2 +- glm/gtx/log_base.hpp | 2 +- glm/gtx/matrix_cross_product.hpp | 2 +- glm/gtx/matrix_interpolation.hpp | 2 +- glm/gtx/matrix_major_storage.hpp | 2 +- glm/gtx/matrix_operation.hpp | 2 +- glm/gtx/matrix_query.hpp | 2 +- glm/gtx/mixed_product.hpp | 2 +- glm/gtx/multiple.hpp | 2 +- glm/gtx/noise.hpp | 2 +- glm/gtx/norm.hpp | 2 +- glm/gtx/normal.hpp | 2 +- glm/gtx/normalize_dot.hpp | 2 +- glm/gtx/number_precision.hpp | 2 +- glm/gtx/ocl_type.hpp | 2 +- glm/gtx/optimum_pow.hpp | 2 +- glm/gtx/orthonormalize.hpp | 2 +- glm/gtx/perpendicular.hpp | 2 +- glm/gtx/polar_coordinates.hpp | 2 +- glm/gtx/projection.hpp | 2 +- glm/gtx/quaternion.hpp | 2 +- glm/gtx/random.hpp | 2 +- glm/gtx/raw_data.hpp | 2 +- glm/gtx/reciprocal.hpp | 2 +- glm/gtx/rotate_vector.hpp | 2 +- glm/gtx/simd_mat4.hpp | 2 +- glm/gtx/simd_vec4.hpp | 2 +- glm/gtx/spline.hpp | 2 +- glm/gtx/std_based_type.hpp | 2 +- glm/gtx/string_cast.hpp | 2 +- glm/gtx/transform.hpp | 2 +- glm/gtx/transform2.hpp | 2 +- glm/gtx/ulp.hpp | 2 +- glm/gtx/unsigned_int.hpp | 2 +- glm/gtx/vec1.hpp | 2 +- glm/gtx/vector_access.hpp | 2 +- glm/gtx/vector_angle.hpp | 2 +- glm/gtx/vector_query.hpp | 2 +- glm/gtx/verbose_operator.hpp | 2 +- glm/gtx/wrap.hpp | 2 +- glm/virtrev/xstream.hpp | 6 ++-- 70 files changed, 108 insertions(+), 90 deletions(-) diff --git a/glm/gtc/half_float.hpp b/glm/gtc/half_float.hpp index 9fe50f64..6e84a224 100644 --- a/glm/gtc/half_float.hpp +++ b/glm/gtc/half_float.hpp @@ -35,7 +35,7 @@ /////////////////////////////////////////////////////////////////////////////////// #ifndef GLM_GTC_half_float -#define GLM_GTC_half_float 90 +#define GLM_GTC_half_float GLM_VERSION // Dependency: #include "../glm.hpp" diff --git a/glm/gtc/matrix_access.hpp b/glm/gtc/matrix_access.hpp index 938ed93c..d190d16d 100644 --- a/glm/gtc/matrix_access.hpp +++ b/glm/gtc/matrix_access.hpp @@ -35,7 +35,7 @@ /////////////////////////////////////////////////////////////////////////////////// #ifndef GLM_GTC_matrix_access -#define GLM_GTC_matrix_access 90 +#define GLM_GTC_matrix_access GLM_VERSION // Dependency: #include "../glm.hpp" diff --git a/glm/gtc/matrix_integer.hpp b/glm/gtc/matrix_integer.hpp index 04b56174..96864550 100644 --- a/glm/gtc/matrix_integer.hpp +++ b/glm/gtc/matrix_integer.hpp @@ -35,7 +35,7 @@ /////////////////////////////////////////////////////////////////////////////////// #ifndef GLM_GTC_matrix_integer -#define GLM_GTC_matrix_integer 90 +#define GLM_GTC_matrix_integer GLM_VERSION // Dependency: #include "../glm.hpp" diff --git a/glm/gtc/matrix_inverse.hpp b/glm/gtc/matrix_inverse.hpp index 6baa018f..8a4d355c 100644 --- a/glm/gtc/matrix_inverse.hpp +++ b/glm/gtc/matrix_inverse.hpp @@ -35,7 +35,7 @@ /////////////////////////////////////////////////////////////////////////////////// #ifndef GLM_GTC_matrix_inverse -#define GLM_GTC_matrix_inverse 90 +#define GLM_GTC_matrix_inverse GLM_VERSION // Dependency: #include "../glm.hpp" diff --git a/glm/gtc/matrix_transform.hpp b/glm/gtc/matrix_transform.hpp index b704dd9c..66a2b561 100644 --- a/glm/gtc/matrix_transform.hpp +++ b/glm/gtc/matrix_transform.hpp @@ -44,7 +44,7 @@ /////////////////////////////////////////////////////////////////////////////////// #ifndef GLM_GTC_matrix_transform -#define GLM_GTC_matrix_transform 90 +#define GLM_GTC_matrix_transform GLM_VERSION // Dependency: #include "../glm.hpp" diff --git a/glm/gtc/quaternion.hpp b/glm/gtc/quaternion.hpp index 1e997bfe..b6e750e2 100644 --- a/glm/gtc/quaternion.hpp +++ b/glm/gtc/quaternion.hpp @@ -37,7 +37,7 @@ /////////////////////////////////////////////////////////////////////////////////// #ifndef GLM_GTC_quaternion -#define GLM_GTC_quaternion 90 +#define GLM_GTC_quaternion GLM_VERSION // Dependency: #include "../glm.hpp" @@ -151,26 +151,30 @@ namespace detail /// @{ //! Returns the length of the quaternion. - //! From GLM_GTC_quaternion extension. + /// + /// @see - gtc_quaternion template T length( detail::tquat const & q); //! Returns the normalized quaternion. - //! From GLM_GTC_quaternion extension. + /// + /// @see - gtc_quaternion template detail::tquat normalize( detail::tquat const & q); //! Returns dot product of q1 and q2, i.e., q1[0] * q2[0] + q1[1] * q2[1] + ... - //! From GLM_GTC_quaternion extension. + /// + /// @see - gtc_quaternion template T dot( detail::tquat const & q1, detail::tquat const & q2); //! Returns a SLERP interpolated quaternion of x and y according a. - //! From GLM_GTC_quaternion extension. + /// + /// @see - gtc_quaternion template detail::tquat mix( detail::tquat const & x, @@ -178,19 +182,22 @@ namespace detail T const & a); //! Returns the q conjugate. - //! From GLM_GTC_quaternion extension. + /// + /// @see - gtc_quaternion template detail::tquat conjugate( detail::tquat const & q); //! Returns the q inverse. - //! From GLM_GTC_quaternion extension. + /// + /// @see - gtc_quaternion template detail::tquat inverse( detail::tquat const & q); //! Rotates a quaternion from an vector of 3 components axis and an angle expressed in degrees. - //! From GLM_GTC_quaternion extension. + /// + /// @see - gtc_quaternion template detail::tquat rotate( detail::tquat const & q, @@ -198,55 +205,66 @@ namespace detail detail::tvec3 const & v); //! Converts a quaternion to a 3 * 3 matrix. - //! From GLM_GTC_quaternion extension. + /// + /// @see - gtc_quaternion template detail::tmat3x3 mat3_cast( detail::tquat const & x); //! Converts a quaternion to a 4 * 4 matrix. - //! From GLM_GTC_quaternion extension. + /// + /// @see - gtc_quaternion template detail::tmat4x4 mat4_cast( detail::tquat const & x); //! Converts a 3 * 3 matrix to a quaternion. - //! From GLM_GTC_quaternion extension. + /// + /// @see - gtc_quaternion template detail::tquat quat_cast( detail::tmat3x3 const & x); //! Converts a 4 * 4 matrix to a quaternion. - //! From GLM_GTC_quaternion extension. + /// + /// @see - gtc_quaternion template detail::tquat quat_cast( detail::tmat4x4 const & x); //! Quaternion of floating-point numbers. - //! From GLM_GTC_quaternion extension. + /// + /// @see - gtc_quaternion typedef detail::tquat quat; //! Quaternion of half-precision floating-point numbers. - //! From GLM_GTC_quaternion extension. + /// + /// @see - gtc_quaternion typedef detail::tquat hquat; //! Quaternion of single-precision floating-point numbers. - //! From GLM_GTC_quaternion extension. + /// + /// @see - gtc_quaternion typedef detail::tquat fquat; //! Quaternion of double-precision floating-point numbers. - //! From GLM_GTC_quaternion extension. + /// + /// @see - gtc_quaternion typedef detail::tquat dquat; //! Quaternion of low precision floating-point numbers. - //! From GLM_GTC_quaternion extension. + /// + /// @see - gtc_quaternion typedef detail::tquat lowp_quat; //! Quaternion of medium precision floating-point numbers. - //! From GLM_GTC_quaternion extension. + /// + /// @see - gtc_quaternion typedef detail::tquat mediump_quat; //! Quaternion of high precision floating-point numbers. - //! From GLM_GTC_quaternion extension. + /// + /// @see - gtc_quaternion typedef detail::tquat highp_quat; /// @} diff --git a/glm/gtc/swizzle.hpp b/glm/gtc/swizzle.hpp index 18aa6925..e09d03e0 100644 --- a/glm/gtc/swizzle.hpp +++ b/glm/gtc/swizzle.hpp @@ -36,7 +36,7 @@ /////////////////////////////////////////////////////////////////////////////////// #ifndef GLM_GTC_swizzle -#define GLM_GTC_swizzle 90 +#define GLM_GTC_swizzle GLM_VERSION // Dependency: #include "../glm.hpp" diff --git a/glm/gtc/type_precision.hpp b/glm/gtc/type_precision.hpp index fd915c6b..bd45cc2b 100644 --- a/glm/gtc/type_precision.hpp +++ b/glm/gtc/type_precision.hpp @@ -41,7 +41,7 @@ /////////////////////////////////////////////////////////////////////////////////// #ifndef GLM_GTC_type_precision -#define GLM_GTC_type_precision 100 +#define GLM_GTC_type_precision GLM_VERSION // Dependency: #include "../glm.hpp" diff --git a/glm/gtc/type_ptr.hpp b/glm/gtc/type_ptr.hpp index 8e608aaf..d95771d9 100644 --- a/glm/gtc/type_ptr.hpp +++ b/glm/gtc/type_ptr.hpp @@ -57,7 +57,7 @@ /////////////////////////////////////////////////////////////////////////////////// #ifndef GLM_GTC_type_ptr -#define GLM_GTC_type_ptr 90 +#define GLM_GTC_type_ptr GLM_VERSION // Dependency: #include "../glm.hpp" diff --git a/glm/gtx/associated_min_max.hpp b/glm/gtx/associated_min_max.hpp index 4b68ff46..d889abd0 100644 --- a/glm/gtx/associated_min_max.hpp +++ b/glm/gtx/associated_min_max.hpp @@ -36,7 +36,7 @@ /////////////////////////////////////////////////////////////////////////////////// #ifndef GLM_GTX_associated_min_max -#define GLM_GTX_associated_min_max 50 +#define GLM_GTX_associated_min_max GLM_VERSION // Dependency: #include "../glm.hpp" diff --git a/glm/gtx/bit.hpp b/glm/gtx/bit.hpp index d78f3ef7..d99bf1bd 100644 --- a/glm/gtx/bit.hpp +++ b/glm/gtx/bit.hpp @@ -37,7 +37,7 @@ /////////////////////////////////////////////////////////////////////////////////// #ifndef GLM_GTX_bit -#define GLM_GTX_bit 50 +#define GLM_GTX_bit GLM_VERSION // Dependency: #include "../glm.hpp" diff --git a/glm/gtx/closest_point.hpp b/glm/gtx/closest_point.hpp index fc92d8c5..920168e7 100644 --- a/glm/gtx/closest_point.hpp +++ b/glm/gtx/closest_point.hpp @@ -36,7 +36,7 @@ /////////////////////////////////////////////////////////////////////////////////// #ifndef GLM_GTX_closest_point -#define GLM_GTX_closest_point 50 +#define GLM_GTX_closest_point GLM_VERSION // Dependency: #include "../glm.hpp" diff --git a/glm/gtx/color_cast.hpp b/glm/gtx/color_cast.hpp index 782000d5..5920c343 100644 --- a/glm/gtx/color_cast.hpp +++ b/glm/gtx/color_cast.hpp @@ -37,7 +37,7 @@ /////////////////////////////////////////////////////////////////////////////////// #ifndef GLM_GTX_color_cast -#define GLM_GTX_color_cast 50 +#define GLM_GTX_color_cast GLM_VERSION // Dependency: #include "../glm.hpp" diff --git a/glm/gtx/color_space.hpp b/glm/gtx/color_space.hpp index ad904e02..e4234404 100644 --- a/glm/gtx/color_space.hpp +++ b/glm/gtx/color_space.hpp @@ -36,7 +36,7 @@ /////////////////////////////////////////////////////////////////////////////////// #ifndef GLM_GTX_color_space -#define GLM_GTX_color_space 50 +#define GLM_GTX_color_space GLM_VERSION // Dependency: #include "../glm.hpp" diff --git a/glm/gtx/color_space_YCoCg.hpp b/glm/gtx/color_space_YCoCg.hpp index dc94fced..e87b1695 100644 --- a/glm/gtx/color_space_YCoCg.hpp +++ b/glm/gtx/color_space_YCoCg.hpp @@ -36,7 +36,7 @@ /////////////////////////////////////////////////////////////////////////////////// #ifndef glm_gtx_color_space_YCoCg -#define glm_gtx_color_space_YCoCg 50 +#define glm_gtx_color_space_YCoCg GLM_VERSION // Dependency: #include "../glm.hpp" diff --git a/glm/gtx/compatibility.hpp b/glm/gtx/compatibility.hpp index 9a22145a..5628d304 100644 --- a/glm/gtx/compatibility.hpp +++ b/glm/gtx/compatibility.hpp @@ -37,7 +37,7 @@ /////////////////////////////////////////////////////////////////////////////////// #ifndef GLM_GTX_compatibility -#define GLM_GTX_compatibility 50 +#define GLM_GTX_compatibility GLM_VERSION // Dependency: #include "../glm.hpp" diff --git a/glm/gtx/component_wise.hpp b/glm/gtx/component_wise.hpp index 661c6ca4..576e6004 100644 --- a/glm/gtx/component_wise.hpp +++ b/glm/gtx/component_wise.hpp @@ -36,7 +36,7 @@ /////////////////////////////////////////////////////////////////////////////////// #ifndef GLM_GTX_component_wise -#define GLM_GTX_component_wise 50 +#define GLM_GTX_component_wise GLM_VERSION // Dependency: #include "../glm.hpp" diff --git a/glm/gtx/epsilon.hpp b/glm/gtx/epsilon.hpp index d96c17c7..55c35354 100644 --- a/glm/gtx/epsilon.hpp +++ b/glm/gtx/epsilon.hpp @@ -38,7 +38,7 @@ /////////////////////////////////////////////////////////////////////////////////// #ifndef GLM_GTX_epsilon -#define GLM_GTX_epsilon 50 +#define GLM_GTX_epsilon GLM_VERSION // Dependency: #include "../glm.hpp" diff --git a/glm/gtx/euler_angles.hpp b/glm/gtx/euler_angles.hpp index 5f491c42..99a0921b 100644 --- a/glm/gtx/euler_angles.hpp +++ b/glm/gtx/euler_angles.hpp @@ -37,7 +37,7 @@ /////////////////////////////////////////////////////////////////////////////////// #ifndef GLM_GTX_euler_angles -#define GLM_GTX_euler_angles 50 +#define GLM_GTX_euler_angles GLM_VERSION // Dependency: #include "../glm.hpp" diff --git a/glm/gtx/extend.hpp b/glm/gtx/extend.hpp index 7a205107..2f25c5bb 100644 --- a/glm/gtx/extend.hpp +++ b/glm/gtx/extend.hpp @@ -36,7 +36,7 @@ /////////////////////////////////////////////////////////////////////////////////// #ifndef GLM_GTX_extend -#define GLM_GTX_extend 50 +#define GLM_GTX_extend GLM_VERSION // Dependency: #include "../glm.hpp" diff --git a/glm/gtx/extented_min_max.hpp b/glm/gtx/extented_min_max.hpp index 8c125c84..f576f293 100644 --- a/glm/gtx/extented_min_max.hpp +++ b/glm/gtx/extented_min_max.hpp @@ -37,7 +37,7 @@ /////////////////////////////////////////////////////////////////////////////////// #ifndef GLM_GTX_extented_min_max -#define GLM_GTX_extented_min_max 50 +#define GLM_GTX_extented_min_max GLM_VERSION // Dependency: #include "../glm.hpp" diff --git a/glm/gtx/fast_exponential.hpp b/glm/gtx/fast_exponential.hpp index af5c0abf..993ef48f 100644 --- a/glm/gtx/fast_exponential.hpp +++ b/glm/gtx/fast_exponential.hpp @@ -37,7 +37,7 @@ /////////////////////////////////////////////////////////////////////////////////// #ifndef GLM_GTX_fast_exponential -#define GLM_GTX_fast_exponential 50 +#define GLM_GTX_fast_exponential GLM_VERSION // Dependency: #include "../glm.hpp" diff --git a/glm/gtx/fast_square_root.hpp b/glm/gtx/fast_square_root.hpp index a5785e43..3dba8591 100644 --- a/glm/gtx/fast_square_root.hpp +++ b/glm/gtx/fast_square_root.hpp @@ -38,7 +38,7 @@ /////////////////////////////////////////////////////////////////////////////////// #ifndef GLM_GTX_fast_square_root -#define GLM_GTX_fast_square_root 50 +#define GLM_GTX_fast_square_root GLM_VERSION // Dependency: #include "../glm.hpp" diff --git a/glm/gtx/fast_trigonometry.hpp b/glm/gtx/fast_trigonometry.hpp index e6a202a0..5913f51b 100644 --- a/glm/gtx/fast_trigonometry.hpp +++ b/glm/gtx/fast_trigonometry.hpp @@ -36,7 +36,7 @@ /////////////////////////////////////////////////////////////////////////////////// #ifndef GLM_GTX_fast_trigonometry -#define GLM_GTX_fast_trigonometry 50 +#define GLM_GTX_fast_trigonometry GLM_VERSION // Dependency: #include "../glm.hpp" diff --git a/glm/gtx/gradient_paint.hpp b/glm/gtx/gradient_paint.hpp index 1ddf1cbd..d46bd581 100644 --- a/glm/gtx/gradient_paint.hpp +++ b/glm/gtx/gradient_paint.hpp @@ -36,7 +36,7 @@ /////////////////////////////////////////////////////////////////////////////////// #ifndef GLM_GTX_gradient_paint -#define GLM_GTX_gradient_paint 50 +#define GLM_GTX_gradient_paint GLM_VERSION // Dependency: #include "../glm.hpp" diff --git a/glm/gtx/handed_coordinate_space.hpp b/glm/gtx/handed_coordinate_space.hpp index e46705aa..e69c5e63 100644 --- a/glm/gtx/handed_coordinate_space.hpp +++ b/glm/gtx/handed_coordinate_space.hpp @@ -36,7 +36,7 @@ /////////////////////////////////////////////////////////////////////////////////// #ifndef GLM_GTX_handed_coordinate_space -#define GLM_GTX_handed_coordinate_space 50 +#define GLM_GTX_handed_coordinate_space GLM_VERSION // Dependency: #include "../glm.hpp" diff --git a/glm/gtx/inertia.hpp b/glm/gtx/inertia.hpp index 2c193f6d..276e5191 100644 --- a/glm/gtx/inertia.hpp +++ b/glm/gtx/inertia.hpp @@ -37,7 +37,7 @@ /////////////////////////////////////////////////////////////////////////////////// #ifndef GLM_GTX_inertia -#define GLM_GTX_inertia 50 +#define GLM_GTX_inertia GLM_VERSION // Dependency: #include "../glm.hpp" diff --git a/glm/gtx/int_10_10_10_2.hpp b/glm/gtx/int_10_10_10_2.hpp index c20ba56c..5b49fe07 100644 --- a/glm/gtx/int_10_10_10_2.hpp +++ b/glm/gtx/int_10_10_10_2.hpp @@ -37,7 +37,7 @@ /////////////////////////////////////////////////////////////////////////////////// #ifndef GLM_GTX_int_10_10_10_2 -#define GLM_GTX_int_10_10_10_2 50 +#define GLM_GTX_int_10_10_10_2 GLM_VERSION // Dependency: #include "../glm.hpp" diff --git a/glm/gtx/integer.hpp b/glm/gtx/integer.hpp index 59d22944..0fe8cb0b 100644 --- a/glm/gtx/integer.hpp +++ b/glm/gtx/integer.hpp @@ -36,7 +36,7 @@ /////////////////////////////////////////////////////////////////////////////////// #ifndef GLM_GTX_integer -#define GLM_GTX_integer 50 +#define GLM_GTX_integer GLM_VERSION // Dependency: #include "../glm.hpp" diff --git a/glm/gtx/intersect.hpp b/glm/gtx/intersect.hpp index a21d6626..3a87e0bd 100644 --- a/glm/gtx/intersect.hpp +++ b/glm/gtx/intersect.hpp @@ -37,7 +37,7 @@ /////////////////////////////////////////////////////////////////////////////////// #ifndef GLM_GTX_intersect -#define GLM_GTX_intersect 50 +#define GLM_GTX_intersect GLM_VERSION // Dependency: #include "../glm.hpp" diff --git a/glm/gtx/log_base.hpp b/glm/gtx/log_base.hpp index 4ec48bfd..e1caeea2 100644 --- a/glm/gtx/log_base.hpp +++ b/glm/gtx/log_base.hpp @@ -36,7 +36,7 @@ /////////////////////////////////////////////////////////////////////////////////// #ifndef GLM_GTX_log_base -#define GLM_GTX_log_base 50 +#define GLM_GTX_log_base GLM_VERSION // Dependency: #include "../glm.hpp" diff --git a/glm/gtx/matrix_cross_product.hpp b/glm/gtx/matrix_cross_product.hpp index d357b35e..978172d8 100644 --- a/glm/gtx/matrix_cross_product.hpp +++ b/glm/gtx/matrix_cross_product.hpp @@ -37,7 +37,7 @@ /////////////////////////////////////////////////////////////////////////////////// #ifndef GLM_GTX_matrix_cross_product -#define GLM_GTX_matrix_cross_product 50 +#define GLM_GTX_matrix_cross_product GLM_VERSION // Dependency: #include "../glm.hpp" diff --git a/glm/gtx/matrix_interpolation.hpp b/glm/gtx/matrix_interpolation.hpp index 5d497dec..df9be92f 100644 --- a/glm/gtx/matrix_interpolation.hpp +++ b/glm/gtx/matrix_interpolation.hpp @@ -36,7 +36,7 @@ /////////////////////////////////////////////////////////////////////////////////// #ifndef GLM_GTX_matrix_interpolation -#define GLM_GTX_matrix_interpolation 50 +#define GLM_GTX_matrix_interpolation GLM_VERSION // Dependency: //#include "../glm.hpp" diff --git a/glm/gtx/matrix_major_storage.hpp b/glm/gtx/matrix_major_storage.hpp index 06454aec..b5d89fa9 100644 --- a/glm/gtx/matrix_major_storage.hpp +++ b/glm/gtx/matrix_major_storage.hpp @@ -37,7 +37,7 @@ /////////////////////////////////////////////////////////////////////////////////// #ifndef GLM_GTX_matrix_major_storage -#define GLM_GTX_matrix_major_storage 50 +#define GLM_GTX_matrix_major_storage GLM_VERSION // Dependency: #include "../glm.hpp" diff --git a/glm/gtx/matrix_operation.hpp b/glm/gtx/matrix_operation.hpp index 893598a7..ad224459 100644 --- a/glm/gtx/matrix_operation.hpp +++ b/glm/gtx/matrix_operation.hpp @@ -36,7 +36,7 @@ /////////////////////////////////////////////////////////////////////////////////// #ifndef GLM_GTX_matrix_operation -#define GLM_GTX_matrix_operation 50 +#define GLM_GTX_matrix_operation GLM_VERSION // Dependency: #include "../glm.hpp" diff --git a/glm/gtx/matrix_query.hpp b/glm/gtx/matrix_query.hpp index 1d76e868..22dbaca7 100644 --- a/glm/gtx/matrix_query.hpp +++ b/glm/gtx/matrix_query.hpp @@ -37,7 +37,7 @@ /////////////////////////////////////////////////////////////////////////////////// #ifndef GLM_GTX_matrix_query -#define GLM_GTX_matrix_query 50 +#define GLM_GTX_matrix_query GLM_VERSION // Dependency: #include "../glm.hpp" diff --git a/glm/gtx/mixed_product.hpp b/glm/gtx/mixed_product.hpp index 62928255..e8ecc028 100644 --- a/glm/gtx/mixed_product.hpp +++ b/glm/gtx/mixed_product.hpp @@ -36,7 +36,7 @@ /////////////////////////////////////////////////////////////////////////////////// #ifndef GLM_GTX_mixed_product -#define GLM_GTX_mixed_product 50 +#define GLM_GTX_mixed_product GLM_VERSION // Dependency: #include "../glm.hpp" diff --git a/glm/gtx/multiple.hpp b/glm/gtx/multiple.hpp index f8298d2e..f6ec2535 100644 --- a/glm/gtx/multiple.hpp +++ b/glm/gtx/multiple.hpp @@ -37,7 +37,7 @@ /////////////////////////////////////////////////////////////////////////////////// #ifndef GLM_GTX_multiple -#define GLM_GTX_multiple 50 +#define GLM_GTX_multiple GLM_VERSION // Dependency: #include "../glm.hpp" diff --git a/glm/gtx/noise.hpp b/glm/gtx/noise.hpp index 0152ea46..48ecac01 100644 --- a/glm/gtx/noise.hpp +++ b/glm/gtx/noise.hpp @@ -40,7 +40,7 @@ /////////////////////////////////////////////////////////////////////////////////// #ifndef GLM_GTX_noise -#define GLM_GTX_noise 50 +#define GLM_GTX_noise GLM_VERSION // Dependency: #include "../glm.hpp" diff --git a/glm/gtx/norm.hpp b/glm/gtx/norm.hpp index 1d853858..c1a98e6d 100644 --- a/glm/gtx/norm.hpp +++ b/glm/gtx/norm.hpp @@ -37,7 +37,7 @@ /////////////////////////////////////////////////////////////////////////////////// #ifndef GLM_GTX_norm -#define GLM_GTX_norm 50 +#define GLM_GTX_norm GLM_VERSION // Dependency: #include "../glm.hpp" diff --git a/glm/gtx/normal.hpp b/glm/gtx/normal.hpp index 5ef20355..6893cefd 100644 --- a/glm/gtx/normal.hpp +++ b/glm/gtx/normal.hpp @@ -37,7 +37,7 @@ /////////////////////////////////////////////////////////////////////////////////// #ifndef GLM_GTX_normal -#define GLM_GTX_normal 50 +#define GLM_GTX_normal GLM_VERSION // Dependency: #include "../glm.hpp" diff --git a/glm/gtx/normalize_dot.hpp b/glm/gtx/normalize_dot.hpp index 21d0de36..617491af 100644 --- a/glm/gtx/normalize_dot.hpp +++ b/glm/gtx/normalize_dot.hpp @@ -37,7 +37,7 @@ /////////////////////////////////////////////////////////////////////////////////// #ifndef GLM_GTX_normalize_dot -#define GLM_GTX_normalize_dot 50 +#define GLM_GTX_normalize_dot GLM_VERSION // Dependency: #include "../glm.hpp" diff --git a/glm/gtx/number_precision.hpp b/glm/gtx/number_precision.hpp index 85a1eb9c..8f1e8c0c 100644 --- a/glm/gtx/number_precision.hpp +++ b/glm/gtx/number_precision.hpp @@ -38,7 +38,7 @@ /////////////////////////////////////////////////////////////////////////////////// #ifndef GLM_GTX_number_precision -#define GLM_GTX_number_precision 50 +#define GLM_GTX_number_precision GLM_VERSION // Dependency: #include "../glm.hpp" diff --git a/glm/gtx/ocl_type.hpp b/glm/gtx/ocl_type.hpp index cfb4c901..4df82535 100644 --- a/glm/gtx/ocl_type.hpp +++ b/glm/gtx/ocl_type.hpp @@ -37,7 +37,7 @@ /////////////////////////////////////////////////////////////////////////////////// #ifndef GLM_GTX_ocl_type -#define GLM_GTX_ocl_type 50 +#define GLM_GTX_ocl_type GLM_VERSION // Dependency: #include "../glm.hpp" diff --git a/glm/gtx/optimum_pow.hpp b/glm/gtx/optimum_pow.hpp index 833173e3..90b0cab7 100644 --- a/glm/gtx/optimum_pow.hpp +++ b/glm/gtx/optimum_pow.hpp @@ -36,7 +36,7 @@ /////////////////////////////////////////////////////////////////////////////////// #ifndef GLM_GTX_optimum_pow -#define GLM_GTX_optimum_pow 50 +#define GLM_GTX_optimum_pow GLM_VERSION // Dependency: #include "../glm.hpp" diff --git a/glm/gtx/orthonormalize.hpp b/glm/gtx/orthonormalize.hpp index 54263232..02c92958 100644 --- a/glm/gtx/orthonormalize.hpp +++ b/glm/gtx/orthonormalize.hpp @@ -37,7 +37,7 @@ /////////////////////////////////////////////////////////////////////////////////// #ifndef GLM_GTX_orthonormalize -#define GLM_GTX_orthonormalize 50 +#define GLM_GTX_orthonormalize GLM_VERSION // Dependency: #include "../glm.hpp" diff --git a/glm/gtx/perpendicular.hpp b/glm/gtx/perpendicular.hpp index bee0dd89..82a98a9d 100644 --- a/glm/gtx/perpendicular.hpp +++ b/glm/gtx/perpendicular.hpp @@ -37,7 +37,7 @@ /////////////////////////////////////////////////////////////////////////////////// #ifndef GLM_GTX_perpendicular -#define GLM_GTX_perpendicular 50 +#define GLM_GTX_perpendicular GLM_VERSION // Dependency: #include "../glm.hpp" diff --git a/glm/gtx/polar_coordinates.hpp b/glm/gtx/polar_coordinates.hpp index e8399ab9..4e0c931b 100644 --- a/glm/gtx/polar_coordinates.hpp +++ b/glm/gtx/polar_coordinates.hpp @@ -36,7 +36,7 @@ /////////////////////////////////////////////////////////////////////////////////// #ifndef GLM_GTX_polar_coordinates -#define GLM_GTX_polar_coordinates 50 +#define GLM_GTX_polar_coordinates GLM_VERSION // Dependency: #include "../glm.hpp" diff --git a/glm/gtx/projection.hpp b/glm/gtx/projection.hpp index a46757b7..017ab7a6 100644 --- a/glm/gtx/projection.hpp +++ b/glm/gtx/projection.hpp @@ -36,7 +36,7 @@ /////////////////////////////////////////////////////////////////////////////////// #ifndef GLM_GTX_projection -#define GLM_GTX_projection 50 +#define GLM_GTX_projection GLM_VERSION // Dependency: #include "../glm.hpp" diff --git a/glm/gtx/quaternion.hpp b/glm/gtx/quaternion.hpp index 2c575b7d..4c471d60 100644 --- a/glm/gtx/quaternion.hpp +++ b/glm/gtx/quaternion.hpp @@ -37,7 +37,7 @@ /////////////////////////////////////////////////////////////////////////////////// #ifndef GLM_GTX_quaternion -#define GLM_GTX_quaternion 50 +#define GLM_GTX_quaternion GLM_VERSION // Dependency: #include "../glm.hpp" diff --git a/glm/gtx/random.hpp b/glm/gtx/random.hpp index 6232ea52..a2f156f7 100644 --- a/glm/gtx/random.hpp +++ b/glm/gtx/random.hpp @@ -37,7 +37,7 @@ /////////////////////////////////////////////////////////////////////////////////// #ifndef GLM_GTX_random -#define GLM_GTX_random 50 +#define GLM_GTX_random GLM_VERSION // Dependency: #include "../glm.hpp" diff --git a/glm/gtx/raw_data.hpp b/glm/gtx/raw_data.hpp index f752ee39..c3691a13 100644 --- a/glm/gtx/raw_data.hpp +++ b/glm/gtx/raw_data.hpp @@ -36,7 +36,7 @@ /////////////////////////////////////////////////////////////////////////////////// #ifndef GLM_GTX_raw_data -#define GLM_GTX_raw_data 50 +#define GLM_GTX_raw_data GLM_VERSION // Dependency: #include "../glm.hpp" diff --git a/glm/gtx/reciprocal.hpp b/glm/gtx/reciprocal.hpp index 74f89c37..31ace5a9 100644 --- a/glm/gtx/reciprocal.hpp +++ b/glm/gtx/reciprocal.hpp @@ -36,7 +36,7 @@ /////////////////////////////////////////////////////////////////////////////////// #ifndef GLM_GTX_reciprocal -#define GLM_GTX_reciprocal 50 +#define GLM_GTX_reciprocal GLM_VERSION // Dependency: #include "../glm.hpp" diff --git a/glm/gtx/rotate_vector.hpp b/glm/gtx/rotate_vector.hpp index d914369b..14628b20 100644 --- a/glm/gtx/rotate_vector.hpp +++ b/glm/gtx/rotate_vector.hpp @@ -37,7 +37,7 @@ /////////////////////////////////////////////////////////////////////////////////// #ifndef GLM_GTX_rotate_vector -#define GLM_GTX_rotate_vector 50 +#define GLM_GTX_rotate_vector GLM_VERSION // Dependency: #include "../glm.hpp" diff --git a/glm/gtx/simd_mat4.hpp b/glm/gtx/simd_mat4.hpp index 90496318..2688b7d2 100644 --- a/glm/gtx/simd_mat4.hpp +++ b/glm/gtx/simd_mat4.hpp @@ -36,7 +36,7 @@ /////////////////////////////////////////////////////////////////////////////////// #ifndef GLM_GTX_simd_mat4 -#define GLM_GTX_simd_mat4 50 +#define GLM_GTX_simd_mat4 GLM_VERSION // Dependency: #include "../glm.hpp" diff --git a/glm/gtx/simd_vec4.hpp b/glm/gtx/simd_vec4.hpp index 4eaf5cdf..132e88ca 100644 --- a/glm/gtx/simd_vec4.hpp +++ b/glm/gtx/simd_vec4.hpp @@ -36,7 +36,7 @@ /////////////////////////////////////////////////////////////////////////////////// #ifndef GLM_GTX_simd_vec4 -#define GLM_GTX_simd_vec4 50 +#define GLM_GTX_simd_vec4 GLM_VERSION // Dependency: #include "../glm.hpp" diff --git a/glm/gtx/spline.hpp b/glm/gtx/spline.hpp index 54fb09fa..4580f389 100644 --- a/glm/gtx/spline.hpp +++ b/glm/gtx/spline.hpp @@ -36,7 +36,7 @@ /////////////////////////////////////////////////////////////////////////////////// #ifndef GLM_GTX_spline -#define GLM_GTX_spline 50 +#define GLM_GTX_spline GLM_VERSION // Dependency: #include "../glm.hpp" diff --git a/glm/gtx/std_based_type.hpp b/glm/gtx/std_based_type.hpp index 7bd0e3e4..5a94fdab 100644 --- a/glm/gtx/std_based_type.hpp +++ b/glm/gtx/std_based_type.hpp @@ -36,7 +36,7 @@ /////////////////////////////////////////////////////////////////////////////////// #ifndef GLM_GTX_std_based_type -#define GLM_GTX_std_based_type 50 +#define GLM_GTX_std_based_type GLM_VERSION // Dependency: #include "../glm.hpp" diff --git a/glm/gtx/string_cast.hpp b/glm/gtx/string_cast.hpp index 243f8f0a..93a31c61 100644 --- a/glm/gtx/string_cast.hpp +++ b/glm/gtx/string_cast.hpp @@ -40,7 +40,7 @@ /////////////////////////////////////////////////////////////////////////////////// #ifndef GLM_GTX_string_cast -#define GLM_GTX_string_cast 50 +#define GLM_GTX_string_cast GLM_VERSION // Dependency: #include "../glm.hpp" diff --git a/glm/gtx/transform.hpp b/glm/gtx/transform.hpp index 072ca9b4..71495aef 100644 --- a/glm/gtx/transform.hpp +++ b/glm/gtx/transform.hpp @@ -39,7 +39,7 @@ /////////////////////////////////////////////////////////////////////////////////// #ifndef GLM_GTX_transform -#define GLM_GTX_transform 50 +#define GLM_GTX_transform GLM_VERSION // Dependency: #include "../glm.hpp" diff --git a/glm/gtx/transform2.hpp b/glm/gtx/transform2.hpp index f709ae54..87de811a 100644 --- a/glm/gtx/transform2.hpp +++ b/glm/gtx/transform2.hpp @@ -37,7 +37,7 @@ /////////////////////////////////////////////////////////////////////////////////// #ifndef GLM_GTX_transform2 -#define GLM_GTX_transform2 50 +#define GLM_GTX_transform2 GLM_VERSION // Dependency: #include "../glm.hpp" diff --git a/glm/gtx/ulp.hpp b/glm/gtx/ulp.hpp index a5d63f7b..fea8e952 100644 --- a/glm/gtx/ulp.hpp +++ b/glm/gtx/ulp.hpp @@ -37,7 +37,7 @@ /////////////////////////////////////////////////////////////////////////////////// #ifndef GLM_GTX_ulp -#define GLM_GTX_ulp 50 +#define GLM_GTX_ulp GLM_VERSION // Dependency: #include "../glm.hpp" diff --git a/glm/gtx/unsigned_int.hpp b/glm/gtx/unsigned_int.hpp index bcfcd810..239e6b6b 100644 --- a/glm/gtx/unsigned_int.hpp +++ b/glm/gtx/unsigned_int.hpp @@ -37,7 +37,7 @@ /////////////////////////////////////////////////////////////////////////////////// #ifndef GLM_GTX_unsigned_int -#define GLM_GTX_unsigned_int 50 +#define GLM_GTX_unsigned_int GLM_VERSION // Dependency: #include "../glm.hpp" diff --git a/glm/gtx/vec1.hpp b/glm/gtx/vec1.hpp index b309aebe..c001b393 100644 --- a/glm/gtx/vec1.hpp +++ b/glm/gtx/vec1.hpp @@ -35,7 +35,7 @@ /////////////////////////////////////////////////////////////////////////////////// #ifndef GLM_GTX_vec1 -#define GLM_GTX_vec1 50 +#define GLM_GTX_vec1 GLM_VERSION // Dependency: #include "../glm.hpp" diff --git a/glm/gtx/vector_access.hpp b/glm/gtx/vector_access.hpp index 4bf4f931..e3e4575d 100644 --- a/glm/gtx/vector_access.hpp +++ b/glm/gtx/vector_access.hpp @@ -36,7 +36,7 @@ /////////////////////////////////////////////////////////////////////////////////// #ifndef GLM_GTX_vector_access -#define GLM_GTX_vector_access 50 +#define GLM_GTX_vector_access GLM_VERSION // Dependency: #include "../glm.hpp" diff --git a/glm/gtx/vector_angle.hpp b/glm/gtx/vector_angle.hpp index dd7fd0af..ec0804dd 100644 --- a/glm/gtx/vector_angle.hpp +++ b/glm/gtx/vector_angle.hpp @@ -38,7 +38,7 @@ /////////////////////////////////////////////////////////////////////////////////// #ifndef GLM_GTX_vector_angle -#define GLM_GTX_vector_angle 50 +#define GLM_GTX_vector_angle GLM_VERSION // Dependency: #include "../glm.hpp" diff --git a/glm/gtx/vector_query.hpp b/glm/gtx/vector_query.hpp index 4e14dc48..4dd7be97 100644 --- a/glm/gtx/vector_query.hpp +++ b/glm/gtx/vector_query.hpp @@ -36,7 +36,7 @@ /////////////////////////////////////////////////////////////////////////////////// #ifndef GLM_GTX_vector_query -#define GLM_GTX_vector_query 50 +#define GLM_GTX_vector_query GLM_VERSION // Dependency: #include "../glm.hpp" diff --git a/glm/gtx/verbose_operator.hpp b/glm/gtx/verbose_operator.hpp index f1dfa3f3..2475df87 100644 --- a/glm/gtx/verbose_operator.hpp +++ b/glm/gtx/verbose_operator.hpp @@ -36,7 +36,7 @@ /////////////////////////////////////////////////////////////////////////////////// #ifndef GLM_GTX_verbose_operator -#define GLM_GTX_verbose_operator 50 +#define GLM_GTX_verbose_operator GLM_VERSION // Dependency: #include "../glm.hpp" diff --git a/glm/gtx/wrap.hpp b/glm/gtx/wrap.hpp index d47cbaf2..79937932 100644 --- a/glm/gtx/wrap.hpp +++ b/glm/gtx/wrap.hpp @@ -36,7 +36,7 @@ /////////////////////////////////////////////////////////////////////////////////// #ifndef GLM_GTX_wrap -#define GLM_GTX_wrap 50 +#define GLM_GTX_wrap GLM_VERSION // Dependency: #include "../glm.hpp" diff --git a/glm/virtrev/xstream.hpp b/glm/virtrev/xstream.hpp index bbd834b5..8d79cac1 100644 --- a/glm/virtrev/xstream.hpp +++ b/glm/virtrev/xstream.hpp @@ -36,8 +36,8 @@ /// Include for this functionality. /////////////////////////////////////////////////////////////////////////////////// -#ifndef GLM_VIRTREV_XSTREAM_INCLUDED -#define GLM_VIRTREV_XSTREAM_INCLUDED +#ifndef GLM_VIRTREV_xstream +#define GLM_VIRTREV_xstream GLM_VERSION #include "../glm.hpp" #include "../gtc/matrix_access.hpp" @@ -161,4 +161,4 @@ namespace glm }//namespace glm -#endif//GLM_VIRTREV_XSTREAM_INCLUDED +#endif//GLM_VIRTREV_xstream