From 477e803f388de7ba1ddbf2b46abf0f332eb454b3 Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Fri, 1 Mar 2019 18:25:15 +0100 Subject: [PATCH] - No more requirement for GLM_ENABLE_EXPERIMENTAL to use GTX extension, only a warning with GLM_MESSAGES defined #732 --- glm/gtx/associated_min_max.hpp | 10 +++++----- glm/gtx/bit.hpp | 10 +++++----- glm/gtx/closest_point.hpp | 10 +++++----- glm/gtx/color_space.hpp | 10 +++++----- glm/gtx/color_space_YCoCg.hpp | 10 +++++----- glm/gtx/common.hpp | 10 +++++----- glm/gtx/compatibility.hpp | 10 +++++----- glm/gtx/component_wise.hpp | 10 +++++----- glm/gtx/dual_quaternion.hpp | 10 +++++----- glm/gtx/easing.hpp | 10 +++++----- glm/gtx/euler_angles.hpp | 10 +++++----- glm/gtx/extend.hpp | 10 +++++----- glm/gtx/extended_min_max.hpp | 10 +++++----- glm/gtx/fast_exponential.hpp | 10 +++++----- glm/gtx/fast_square_root.hpp | 10 +++++----- glm/gtx/fast_trigonometry.hpp | 10 +++++----- glm/gtx/gradient_paint.hpp | 10 +++++----- glm/gtx/handed_coordinate_space.hpp | 10 +++++----- glm/gtx/hash.hpp | 8 ++++++-- glm/gtx/integer.hpp | 10 +++++----- glm/gtx/intersect.hpp | 10 +++++----- glm/gtx/io.hpp | 10 +++++----- glm/gtx/log_base.hpp | 10 +++++----- glm/gtx/matrix_cross_product.hpp | 10 +++++----- glm/gtx/matrix_decompose.hpp | 10 +++++----- glm/gtx/matrix_factorisation.hpp | 10 +++++----- glm/gtx/matrix_interpolation.hpp | 10 +++++----- glm/gtx/matrix_major_storage.hpp | 10 +++++----- glm/gtx/matrix_operation.hpp | 10 +++++----- glm/gtx/matrix_query.hpp | 10 +++++----- glm/gtx/matrix_transform_2d.hpp | 10 +++++----- glm/gtx/mixed_product.hpp | 10 +++++----- glm/gtx/norm.hpp | 10 +++++----- glm/gtx/normal.hpp | 10 +++++----- glm/gtx/normalize_dot.hpp | 10 +++++----- glm/gtx/number_precision.hpp | 10 +++++----- glm/gtx/optimum_pow.hpp | 10 +++++----- glm/gtx/orthonormalize.hpp | 10 +++++----- glm/gtx/perpendicular.hpp | 10 +++++----- glm/gtx/polar_coordinates.hpp | 10 +++++----- glm/gtx/projection.hpp | 10 +++++----- glm/gtx/quaternion.hpp | 10 +++++----- glm/gtx/range.hpp | 12 ++++++------ glm/gtx/raw_data.hpp | 10 +++++----- glm/gtx/rotate_normalized_axis.hpp | 10 +++++----- glm/gtx/rotate_vector.hpp | 10 +++++----- glm/gtx/scalar_multiplication.hpp | 12 ++++++------ glm/gtx/scalar_relational.hpp | 10 +++++----- glm/gtx/spline.hpp | 10 +++++----- glm/gtx/std_based_type.hpp | 10 +++++----- glm/gtx/string_cast.hpp | 12 ++++++------ glm/gtx/texture.hpp | 10 +++++----- glm/gtx/transform.hpp | 10 +++++----- glm/gtx/transform2.hpp | 10 +++++----- glm/gtx/type_aligned.hpp | 10 +++++----- glm/gtx/type_trait.hpp | 12 ++++++------ glm/gtx/vec_swizzle.hpp | 8 ++++++-- glm/gtx/vector_angle.hpp | 10 +++++----- glm/gtx/vector_query.hpp | 10 +++++----- glm/gtx/wrap.hpp | 10 +++++----- 60 files changed, 306 insertions(+), 298 deletions(-) diff --git a/glm/gtx/associated_min_max.hpp b/glm/gtx/associated_min_max.hpp index 1042c13e..c4a695e4 100644 --- a/glm/gtx/associated_min_max.hpp +++ b/glm/gtx/associated_min_max.hpp @@ -16,12 +16,12 @@ // Dependency: #include "../glm.hpp" -#ifndef GLM_ENABLE_EXPERIMENTAL -# error "GLM: GTX_associated_min_max is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." -#endif - #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED) -# pragma message("GLM: GLM_GTX_associated_min_max extension included") +# ifndef GLM_ENABLE_EXPERIMENTAL +# pragma message("GLM: GLM_GTX_associated_min_max is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.") +# elif +# pragma message("GLM: GLM_GTX_associated_min_max extension included") +# endif #endif namespace glm diff --git a/glm/gtx/bit.hpp b/glm/gtx/bit.hpp index 31a7c069..f6b608c3 100644 --- a/glm/gtx/bit.hpp +++ b/glm/gtx/bit.hpp @@ -15,12 +15,12 @@ // Dependencies #include "../gtc/bitfield.hpp" -#ifndef GLM_ENABLE_EXPERIMENTAL -# error "GLM: GLM_GTX_bit is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." -#endif - #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED) -# pragma message("GLM: GLM_GTX_bit extension is deprecated, include GLM_GTC_bitfield and GLM_GTC_integer instead") +# ifndef GLM_ENABLE_EXPERIMENTAL +# pragma message("GLM: GLM_GTX_bit is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.") +# elif +# pragma message("GLM: GLM_GTX_bit extension included") +# endif #endif namespace glm diff --git a/glm/gtx/closest_point.hpp b/glm/gtx/closest_point.hpp index d257bdc1..ae145f5f 100644 --- a/glm/gtx/closest_point.hpp +++ b/glm/gtx/closest_point.hpp @@ -15,12 +15,12 @@ // Dependency: #include "../glm.hpp" -#ifndef GLM_ENABLE_EXPERIMENTAL -# error "GLM: GLM_GTX_closest_point is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." -#endif - #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED) -# pragma message("GLM: GLM_GTX_closest_point extension included") +# ifndef GLM_ENABLE_EXPERIMENTAL +# pragma message("GLM: GLM_GTX_closest_point is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.") +# elif +# pragma message("GLM: GLM_GTX_closest_point extension included") +# endif #endif namespace glm diff --git a/glm/gtx/color_space.hpp b/glm/gtx/color_space.hpp index edc959ad..09afdc09 100644 --- a/glm/gtx/color_space.hpp +++ b/glm/gtx/color_space.hpp @@ -15,12 +15,12 @@ // Dependency: #include "../glm.hpp" -#ifndef GLM_ENABLE_EXPERIMENTAL -# error "GLM: GLM_GTX_color_space is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." -#endif - #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED) -# pragma message("GLM: GLM_GTX_color_space extension included") +# ifndef GLM_ENABLE_EXPERIMENTAL +# pragma message("GLM: GLM_GTX_color_space is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.") +# elif +# pragma message("GLM: GLM_GTX_color_space extension included") +# endif #endif namespace glm diff --git a/glm/gtx/color_space_YCoCg.hpp b/glm/gtx/color_space_YCoCg.hpp index fd9069e0..ec405d64 100644 --- a/glm/gtx/color_space_YCoCg.hpp +++ b/glm/gtx/color_space_YCoCg.hpp @@ -15,12 +15,12 @@ // Dependency: #include "../glm.hpp" -#ifndef GLM_ENABLE_EXPERIMENTAL -# error "GLM: GLM_GTX_color_space_YCoCg is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." -#endif - #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED) -# pragma message("GLM: GLM_GTX_color_space_YCoCg extension included") +# ifndef GLM_ENABLE_EXPERIMENTAL +# pragma message("GLM: GLM_GTX_color_space_YCoCg is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.") +# elif +# pragma message("GLM: GLM_GTX_color_space_YCoCg extension included") +# endif #endif namespace glm diff --git a/glm/gtx/common.hpp b/glm/gtx/common.hpp index c36f850e..de999efb 100644 --- a/glm/gtx/common.hpp +++ b/glm/gtx/common.hpp @@ -18,12 +18,12 @@ #include "../vec4.hpp" #include "../gtc/vec1.hpp" -#ifndef GLM_ENABLE_EXPERIMENTAL -# error "GLM: GLM_GTX_common is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." -#endif - #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED) -# pragma message("GLM: GLM_GTX_common extension included") +# ifndef GLM_ENABLE_EXPERIMENTAL +# pragma message("GLM: GLM_GTX_common is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.") +# elif +# pragma message("GLM: GLM_GTX_common extension included") +# endif #endif namespace glm diff --git a/glm/gtx/compatibility.hpp b/glm/gtx/compatibility.hpp index 31147103..98a47a79 100644 --- a/glm/gtx/compatibility.hpp +++ b/glm/gtx/compatibility.hpp @@ -16,12 +16,12 @@ #include "../glm.hpp" #include "../gtc/quaternion.hpp" -#ifndef GLM_ENABLE_EXPERIMENTAL -# error "GLM: GLM_GTX_compatibility is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." -#endif - #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED) -# pragma message("GLM: GLM_GTX_compatibility extension included") +# ifndef GLM_ENABLE_EXPERIMENTAL +# pragma message("GLM: GLM_GTX_compatibility is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.") +# elif +# pragma message("GLM: GLM_GTX_compatibility extension included") +# endif #endif #if GLM_COMPILER & GLM_COMPILER_VC diff --git a/glm/gtx/component_wise.hpp b/glm/gtx/component_wise.hpp index 717ae82c..7ebfc840 100644 --- a/glm/gtx/component_wise.hpp +++ b/glm/gtx/component_wise.hpp @@ -18,12 +18,12 @@ #include "../detail/setup.hpp" #include "../detail/qualifier.hpp" -#ifndef GLM_ENABLE_EXPERIMENTAL -# error "GLM: GLM_GTX_component_wise is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." -#endif - #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED) -# pragma message("GLM: GLM_GTX_component_wise extension included") +# ifndef GLM_ENABLE_EXPERIMENTAL +# pragma message("GLM: GLM_GTX_component_wise is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.") +# elif +# pragma message("GLM: GLM_GTX_component_wise extension included") +# endif #endif namespace glm diff --git a/glm/gtx/dual_quaternion.hpp b/glm/gtx/dual_quaternion.hpp index 1732b7dc..d3d99556 100644 --- a/glm/gtx/dual_quaternion.hpp +++ b/glm/gtx/dual_quaternion.hpp @@ -20,12 +20,12 @@ #include "../gtc/constants.hpp" #include "../gtc/quaternion.hpp" -#ifndef GLM_ENABLE_EXPERIMENTAL -# error "GLM: GLM_GTX_dual_quaternion is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." -#endif - #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED) -# pragma message("GLM: GLM_GTX_dual_quaternion extension included") +# ifndef GLM_ENABLE_EXPERIMENTAL +# pragma message("GLM: GLM_GTX_dual_quaternion is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.") +# elif +# pragma message("GLM: GLM_GTX_dual_quaternion extension included") +# endif #endif namespace glm diff --git a/glm/gtx/easing.hpp b/glm/gtx/easing.hpp index eec96c4b..fa954186 100644 --- a/glm/gtx/easing.hpp +++ b/glm/gtx/easing.hpp @@ -21,12 +21,12 @@ #include "../gtc/constants.hpp" #include "../detail/qualifier.hpp" -#ifndef GLM_ENABLE_EXPERIMENTAL -# error "GLM: GLM_GTX_easing is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." -#endif - #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED) -# pragma message("GLM: GLM_GTX_easing extension included") +# ifndef GLM_ENABLE_EXPERIMENTAL +# pragma message("GLM: GLM_GTX_easing is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.") +# elif +# pragma message("GLM: GLM_GTX_easing extension included") +# endif #endif namespace glm{ diff --git a/glm/gtx/euler_angles.hpp b/glm/gtx/euler_angles.hpp index 17eb8414..35a15316 100644 --- a/glm/gtx/euler_angles.hpp +++ b/glm/gtx/euler_angles.hpp @@ -18,12 +18,12 @@ // Dependency: #include "../glm.hpp" -#ifndef GLM_ENABLE_EXPERIMENTAL -# error "GLM: GLM_GTX_euler_angles is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." -#endif - #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED) -# pragma message("GLM: GLM_GTX_euler_angles extension included") +# ifndef GLM_ENABLE_EXPERIMENTAL +# pragma message("GLM: GLM_GTX_euler_angles is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.") +# elif +# pragma message("GLM: GLM_GTX_euler_angles extension included") +# endif #endif namespace glm diff --git a/glm/gtx/extend.hpp b/glm/gtx/extend.hpp index 914d4072..a69faf4a 100644 --- a/glm/gtx/extend.hpp +++ b/glm/gtx/extend.hpp @@ -15,12 +15,12 @@ // Dependency: #include "../glm.hpp" -#ifndef GLM_ENABLE_EXPERIMENTAL -# error "GLM: GLM_GTX_extend is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." -#endif - #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED) -# pragma message("GLM: GLM_GTX_extend extension included") +# ifndef GLM_ENABLE_EXPERIMENTAL +# pragma message("GLM: GLM_GTX_extend is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.") +# elif +# pragma message("GLM: GLM_GTX_extend extension included") +# endif #endif namespace glm diff --git a/glm/gtx/extended_min_max.hpp b/glm/gtx/extended_min_max.hpp index 26802c32..5b328dd8 100644 --- a/glm/gtx/extended_min_max.hpp +++ b/glm/gtx/extended_min_max.hpp @@ -15,12 +15,12 @@ // Dependency: #include "../glm.hpp" -#ifndef GLM_ENABLE_EXPERIMENTAL -# error "GLM: GLM_GTX_extented_min_max is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." -#endif - #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED) -# pragma message("GLM: GLM_GTX_extented_min_max extension included") +# ifndef GLM_ENABLE_EXPERIMENTAL +# pragma message("GLM: GLM_GTX_extented_min_max is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.") +# elif +# pragma message("GLM: GLM_GTX_extented_min_max extension included") +# endif #endif namespace glm diff --git a/glm/gtx/fast_exponential.hpp b/glm/gtx/fast_exponential.hpp index 64e68ac2..450b1a64 100644 --- a/glm/gtx/fast_exponential.hpp +++ b/glm/gtx/fast_exponential.hpp @@ -16,12 +16,12 @@ // Dependency: #include "../glm.hpp" -#ifndef GLM_ENABLE_EXPERIMENTAL -# error "GLM: GLM_GTX_fast_exponential is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." -#endif - #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED) -# pragma message("GLM: GLM_GTX_fast_exponential extension included") +# ifndef GLM_ENABLE_EXPERIMENTAL +# pragma message("GLM: GLM_GTX_fast_exponential is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.") +# elif +# pragma message("GLM: GLM_GTX_fast_exponential extension included") +# endif #endif namespace glm diff --git a/glm/gtx/fast_square_root.hpp b/glm/gtx/fast_square_root.hpp index 275ac11a..2b24d85c 100644 --- a/glm/gtx/fast_square_root.hpp +++ b/glm/gtx/fast_square_root.hpp @@ -19,12 +19,12 @@ #include "../exponential.hpp" #include "../geometric.hpp" -#ifndef GLM_ENABLE_EXPERIMENTAL -# error "GLM: GLM_GTX_fast_square_root is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." -#endif - #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED) -# pragma message("GLM: GLM_GTX_fast_square_root extension included") +# ifndef GLM_ENABLE_EXPERIMENTAL +# pragma message("GLM: GLM_GTX_fast_square_root is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.") +# elif +# pragma message("GLM: GLM_GTX_fast_square_root extension included") +# endif #endif namespace glm diff --git a/glm/gtx/fast_trigonometry.hpp b/glm/gtx/fast_trigonometry.hpp index c49dd7d8..cead03d4 100644 --- a/glm/gtx/fast_trigonometry.hpp +++ b/glm/gtx/fast_trigonometry.hpp @@ -15,12 +15,12 @@ // Dependency: #include "../gtc/constants.hpp" -#ifndef GLM_ENABLE_EXPERIMENTAL -# error "GLM: GLM_GTX_fast_trigonometry is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." -#endif - #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED) -# pragma message("GLM: GLM_GTX_fast_trigonometry extension included") +# ifndef GLM_ENABLE_EXPERIMENTAL +# pragma message("GLM: GLM_GTX_fast_trigonometry is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.") +# elif +# pragma message("GLM: GLM_GTX_fast_trigonometry extension included") +# endif #endif namespace glm diff --git a/glm/gtx/gradient_paint.hpp b/glm/gtx/gradient_paint.hpp index 2749c080..41345204 100644 --- a/glm/gtx/gradient_paint.hpp +++ b/glm/gtx/gradient_paint.hpp @@ -17,12 +17,12 @@ #include "../glm.hpp" #include "../gtx/optimum_pow.hpp" -#ifndef GLM_ENABLE_EXPERIMENTAL -# error "GLM: GLM_GTX_gradient_paint is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." -#endif - #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED) -# pragma message("GLM: GLM_GTX_gradient_paint extension included") +# ifndef GLM_ENABLE_EXPERIMENTAL +# pragma message("GLM: GLM_GTX_gradient_paint is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.") +# elif +# pragma message("GLM: GLM_GTX_gradient_paint extension included") +# endif #endif namespace glm diff --git a/glm/gtx/handed_coordinate_space.hpp b/glm/gtx/handed_coordinate_space.hpp index d47230fc..9e396a8c 100644 --- a/glm/gtx/handed_coordinate_space.hpp +++ b/glm/gtx/handed_coordinate_space.hpp @@ -15,12 +15,12 @@ // Dependency: #include "../glm.hpp" -#ifndef GLM_ENABLE_EXPERIMENTAL -# error "GLM: GLM_GTX_handed_coordinate_space is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." -#endif - #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED) -# pragma message("GLM: GLM_GTX_handed_coordinate_space extension included") +# ifndef GLM_ENABLE_EXPERIMENTAL +# pragma message("GLM: GLM_GTX_handed_coordinate_space is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.") +# elif +# pragma message("GLM: GLM_GTX_handed_coordinate_space extension included") +# endif #endif namespace glm diff --git a/glm/gtx/hash.hpp b/glm/gtx/hash.hpp index 3196be7e..2ab07495 100644 --- a/glm/gtx/hash.hpp +++ b/glm/gtx/hash.hpp @@ -12,8 +12,12 @@ #pragma once -#ifndef GLM_ENABLE_EXPERIMENTAL -# error "GLM: GLM_GTX_hash is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." +#if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED) +# ifndef GLM_ENABLE_EXPERIMENTAL +# pragma message("GLM: GLM_GTX_hash is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.") +# elif +# pragma message("GLM: GLM_GTX_hash extension included") +# endif #endif #include diff --git a/glm/gtx/integer.hpp b/glm/gtx/integer.hpp index 338a0355..8b79f51e 100644 --- a/glm/gtx/integer.hpp +++ b/glm/gtx/integer.hpp @@ -16,12 +16,12 @@ #include "../glm.hpp" #include "../gtc/integer.hpp" -#ifndef GLM_ENABLE_EXPERIMENTAL -# error "GLM: GLM_GTX_integer is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." -#endif - #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED) -# pragma message("GLM: GLM_GTX_integer extension included") +# ifndef GLM_ENABLE_EXPERIMENTAL +# pragma message("GLM: GLM_GTX_integer is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.") +# elif +# pragma message("GLM: GLM_GTX_integer extension included") +# endif #endif namespace glm diff --git a/glm/gtx/intersect.hpp b/glm/gtx/intersect.hpp index 8caa17e4..04e16f68 100644 --- a/glm/gtx/intersect.hpp +++ b/glm/gtx/intersect.hpp @@ -21,12 +21,12 @@ #include "../gtx/closest_point.hpp" #include "../gtx/vector_query.hpp" -#ifndef GLM_ENABLE_EXPERIMENTAL -# error "GLM: GLM_GTX_closest_point is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." -#endif - #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED) -# pragma message("GLM: GLM_GTX_closest_point extension included") +# ifndef GLM_ENABLE_EXPERIMENTAL +# pragma message("GLM: GLM_GTX_closest_point is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.") +# elif +# pragma message("GLM: GLM_GTX_closest_point extension included") +# endif #endif namespace glm diff --git a/glm/gtx/io.hpp b/glm/gtx/io.hpp index c2476449..e5c48337 100644 --- a/glm/gtx/io.hpp +++ b/glm/gtx/io.hpp @@ -23,12 +23,12 @@ #include "../glm.hpp" #include "../gtx/quaternion.hpp" -#ifndef GLM_ENABLE_EXPERIMENTAL -# error "GLM: GLM_GTX_io is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." -#endif - #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED) -# pragma message("GLM: GLM_GTX_io extension included") +# ifndef GLM_ENABLE_EXPERIMENTAL +# pragma message("GLM: GLM_GTX_io is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.") +# elif +# pragma message("GLM: GLM_GTX_io extension included") +# endif #endif #include // std::basic_ostream<> (fwd) diff --git a/glm/gtx/log_base.hpp b/glm/gtx/log_base.hpp index 6e8e1f8e..84936661 100644 --- a/glm/gtx/log_base.hpp +++ b/glm/gtx/log_base.hpp @@ -15,12 +15,12 @@ // Dependency: #include "../glm.hpp" -#ifndef GLM_ENABLE_EXPERIMENTAL -# error "GLM: GLM_GTX_log_base is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." -#endif - #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED) -# pragma message("GLM: GLM_GTX_log_base extension included") +# ifndef GLM_ENABLE_EXPERIMENTAL +# pragma message("GLM: GLM_GTX_log_base is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.") +# elif +# pragma message("GLM: GLM_GTX_log_base extension included") +# endif #endif namespace glm diff --git a/glm/gtx/matrix_cross_product.hpp b/glm/gtx/matrix_cross_product.hpp index 6feb4f12..65f7bf1b 100644 --- a/glm/gtx/matrix_cross_product.hpp +++ b/glm/gtx/matrix_cross_product.hpp @@ -16,12 +16,12 @@ // Dependency: #include "../glm.hpp" -#ifndef GLM_ENABLE_EXPERIMENTAL -# error "GLM: GLM_GTX_matrix_cross_product is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." -#endif - #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED) -# pragma message("GLM: GLM_GTX_matrix_cross_product extension included") +# ifndef GLM_ENABLE_EXPERIMENTAL +# pragma message("GLM: GLM_GTX_matrix_cross_product is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.") +# elif +# pragma message("GLM: GLM_GTX_matrix_cross_product extension included") +# endif #endif namespace glm diff --git a/glm/gtx/matrix_decompose.hpp b/glm/gtx/matrix_decompose.hpp index bf75b93a..be255f65 100644 --- a/glm/gtx/matrix_decompose.hpp +++ b/glm/gtx/matrix_decompose.hpp @@ -20,12 +20,12 @@ #include "../gtc/quaternion.hpp" #include "../gtc/matrix_transform.hpp" -#ifndef GLM_ENABLE_EXPERIMENTAL -# error "GLM: GLM_GTX_matrix_decompose is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." -#endif - #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED) -# pragma message("GLM: GLM_GTX_matrix_decompose extension included") +# ifndef GLM_ENABLE_EXPERIMENTAL +# pragma message("GLM: GLM_GTX_matrix_decompose is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.") +# elif +# pragma message("GLM: GLM_GTX_matrix_decompose extension included") +# endif #endif namespace glm diff --git a/glm/gtx/matrix_factorisation.hpp b/glm/gtx/matrix_factorisation.hpp index 109eb643..a5548002 100644 --- a/glm/gtx/matrix_factorisation.hpp +++ b/glm/gtx/matrix_factorisation.hpp @@ -15,12 +15,12 @@ // Dependency: #include "../glm.hpp" -#ifndef GLM_ENABLE_EXPERIMENTAL -# error "GLM: GLM_GTX_matrix_factorisation is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." -#endif - #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED) -# pragma message("GLM: GLM_GTX_matrix_factorisation extension included") +# ifndef GLM_ENABLE_EXPERIMENTAL +# pragma message("GLM: GLM_GTX_matrix_factorisation is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.") +# elif +# pragma message("GLM: GLM_GTX_matrix_factorisation extension included") +# endif #endif /* diff --git a/glm/gtx/matrix_interpolation.hpp b/glm/gtx/matrix_interpolation.hpp index da76df02..7c8a414f 100644 --- a/glm/gtx/matrix_interpolation.hpp +++ b/glm/gtx/matrix_interpolation.hpp @@ -16,12 +16,12 @@ // Dependency: #include "../glm.hpp" -#ifndef GLM_ENABLE_EXPERIMENTAL -# error "GLM: GLM_GTX_matrix_interpolation is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." -#endif - #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED) -# pragma message("GLM: GLM_GTX_matrix_interpolation extension included") +# ifndef GLM_ENABLE_EXPERIMENTAL +# pragma message("GLM: GLM_GTX_matrix_interpolation is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.") +# elif +# pragma message("GLM: GLM_GTX_matrix_interpolation extension included") +# endif #endif namespace glm diff --git a/glm/gtx/matrix_major_storage.hpp b/glm/gtx/matrix_major_storage.hpp index d3020f7d..220b795c 100644 --- a/glm/gtx/matrix_major_storage.hpp +++ b/glm/gtx/matrix_major_storage.hpp @@ -16,12 +16,12 @@ // Dependency: #include "../glm.hpp" -#ifndef GLM_ENABLE_EXPERIMENTAL -# error "GLM: GLM_GTX_matrix_major_storage is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." -#endif - #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED) -# pragma message("GLM: GLM_GTX_matrix_major_storage extension included") +# ifndef GLM_ENABLE_EXPERIMENTAL +# pragma message("GLM: GLM_GTX_matrix_major_storage is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.") +# elif +# pragma message("GLM: GLM_GTX_matrix_major_storage extension included") +# endif #endif namespace glm diff --git a/glm/gtx/matrix_operation.hpp b/glm/gtx/matrix_operation.hpp index 97617783..a96408e3 100644 --- a/glm/gtx/matrix_operation.hpp +++ b/glm/gtx/matrix_operation.hpp @@ -15,12 +15,12 @@ // Dependency: #include "../glm.hpp" -#ifndef GLM_ENABLE_EXPERIMENTAL -# error "GLM: GLM_GTX_matrix_operation is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." -#endif - #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED) -# pragma message("GLM: GLM_GTX_matrix_operation extension included") +# ifndef GLM_ENABLE_EXPERIMENTAL +# pragma message("GLM: GLM_GTX_matrix_operation is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.") +# elif +# pragma message("GLM: GLM_GTX_matrix_operation extension included") +# endif #endif namespace glm diff --git a/glm/gtx/matrix_query.hpp b/glm/gtx/matrix_query.hpp index 4a3f72f2..0f613260 100644 --- a/glm/gtx/matrix_query.hpp +++ b/glm/gtx/matrix_query.hpp @@ -18,12 +18,12 @@ #include "../gtx/vector_query.hpp" #include -#ifndef GLM_ENABLE_EXPERIMENTAL -# error "GLM: GLM_GTX_matrix_query is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." -#endif - #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED) -# pragma message("GLM: GLM_GTX_matrix_query extension included") +# ifndef GLM_ENABLE_EXPERIMENTAL +# pragma message("GLM: GLM_GTX_matrix_query is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.") +# elif +# pragma message("GLM: GLM_GTX_matrix_query extension included") +# endif #endif namespace glm diff --git a/glm/gtx/matrix_transform_2d.hpp b/glm/gtx/matrix_transform_2d.hpp index af4cde8a..02d9539c 100644 --- a/glm/gtx/matrix_transform_2d.hpp +++ b/glm/gtx/matrix_transform_2d.hpp @@ -17,12 +17,12 @@ #include "../mat3x3.hpp" #include "../vec2.hpp" -#ifndef GLM_ENABLE_EXPERIMENTAL -# error "GLM: GLM_GTX_matrix_transform_2d is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." -#endif - #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED) -# pragma message("GLM: GLM_GTX_matrix_transform_2d extension included") +# ifndef GLM_ENABLE_EXPERIMENTAL +# pragma message("GLM: GLM_GTX_matrix_transform_2d is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.") +# elif +# pragma message("GLM: GLM_GTX_matrix_transform_2d extension included") +# endif #endif namespace glm diff --git a/glm/gtx/mixed_product.hpp b/glm/gtx/mixed_product.hpp index 50e5d25c..0514e363 100644 --- a/glm/gtx/mixed_product.hpp +++ b/glm/gtx/mixed_product.hpp @@ -15,12 +15,12 @@ // Dependency: #include "../glm.hpp" -#ifndef GLM_ENABLE_EXPERIMENTAL -# error "GLM: GLM_GTX_mixed_product is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." -#endif - #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED) -# pragma message("GLM: GLM_GTX_mixed_product extension included") +# ifndef GLM_ENABLE_EXPERIMENTAL +# pragma message("GLM: GLM_GTX_mixed_product is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.") +# elif +# pragma message("GLM: GLM_GTX_mixed_product extension included") +# endif #endif namespace glm diff --git a/glm/gtx/norm.hpp b/glm/gtx/norm.hpp index 8ea0cca3..7c52c93a 100644 --- a/glm/gtx/norm.hpp +++ b/glm/gtx/norm.hpp @@ -17,12 +17,12 @@ #include "../geometric.hpp" #include "../gtx/quaternion.hpp" -#ifndef GLM_ENABLE_EXPERIMENTAL -# error "GLM: GLM_GTX_norm is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." -#endif - #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED) -# pragma message("GLM: GLM_GTX_norm extension included") +# ifndef GLM_ENABLE_EXPERIMENTAL +# pragma message("GLM: GLM_GTX_norm is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.") +# elif +# pragma message("GLM: GLM_GTX_norm extension included") +# endif #endif namespace glm diff --git a/glm/gtx/normal.hpp b/glm/gtx/normal.hpp index 1089d875..c6e216df 100644 --- a/glm/gtx/normal.hpp +++ b/glm/gtx/normal.hpp @@ -16,12 +16,12 @@ // Dependency: #include "../glm.hpp" -#ifndef GLM_ENABLE_EXPERIMENTAL -# error "GLM: GLM_GTX_normal is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." -#endif - #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED) -# pragma message("GLM: GLM_GTX_normal extension included") +# ifndef GLM_ENABLE_EXPERIMENTAL +# pragma message("GLM: GLM_GTX_normal is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.") +# elif +# pragma message("GLM: GLM_GTX_normal extension included") +# endif #endif namespace glm diff --git a/glm/gtx/normalize_dot.hpp b/glm/gtx/normalize_dot.hpp index 1cb02020..ebc58a8c 100644 --- a/glm/gtx/normalize_dot.hpp +++ b/glm/gtx/normalize_dot.hpp @@ -16,12 +16,12 @@ // Dependency: #include "../gtx/fast_square_root.hpp" -#ifndef GLM_ENABLE_EXPERIMENTAL -# error "GLM: GLM_GTX_normalize_dot is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." -#endif - #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED) -# pragma message("GLM: GLM_GTX_normalize_dot extension included") +# ifndef GLM_ENABLE_EXPERIMENTAL +# pragma message("GLM: GLM_GTX_normalize_dot is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.") +# elif +# pragma message("GLM: GLM_GTX_normalize_dot extension included") +# endif #endif namespace glm diff --git a/glm/gtx/number_precision.hpp b/glm/gtx/number_precision.hpp index 88064e62..8dec706b 100644 --- a/glm/gtx/number_precision.hpp +++ b/glm/gtx/number_precision.hpp @@ -18,12 +18,12 @@ #include "../glm.hpp" #include "../gtc/type_precision.hpp" -#ifndef GLM_ENABLE_EXPERIMENTAL -# error "GLM: GLM_GTX_number_precision is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." -#endif - #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED) -# pragma message("GLM: GLM_GTX_number_precision extension included") +# ifndef GLM_ENABLE_EXPERIMENTAL +# pragma message("GLM: GLM_GTX_number_precision is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.") +# elif +# pragma message("GLM: GLM_GTX_number_precision extension included") +# endif #endif namespace glm{ diff --git a/glm/gtx/optimum_pow.hpp b/glm/gtx/optimum_pow.hpp index cb068ccf..17953452 100644 --- a/glm/gtx/optimum_pow.hpp +++ b/glm/gtx/optimum_pow.hpp @@ -15,12 +15,12 @@ // Dependency: #include "../glm.hpp" -#ifndef GLM_ENABLE_EXPERIMENTAL -# error "GLM: GLM_GTX_optimum_pow is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." -#endif - #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED) -# pragma message("GLM: GLM_GTX_optimum_pow extension included") +# ifndef GLM_ENABLE_EXPERIMENTAL +# pragma message("GLM: GLM_GTX_optimum_pow is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.") +# elif +# pragma message("GLM: GLM_GTX_optimum_pow extension included") +# endif #endif namespace glm{ diff --git a/glm/gtx/orthonormalize.hpp b/glm/gtx/orthonormalize.hpp index 47b10c66..785f58ed 100644 --- a/glm/gtx/orthonormalize.hpp +++ b/glm/gtx/orthonormalize.hpp @@ -18,12 +18,12 @@ #include "../mat3x3.hpp" #include "../geometric.hpp" -#ifndef GLM_ENABLE_EXPERIMENTAL -# error "GLM: GLM_GTX_orthonormalize is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." -#endif - #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED) -# pragma message("GLM: GLM_GTX_orthonormalize extension included") +# ifndef GLM_ENABLE_EXPERIMENTAL +# pragma message("GLM: GLM_GTX_orthonormalize is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.") +# elif +# pragma message("GLM: GLM_GTX_orthonormalize extension included") +# endif #endif namespace glm diff --git a/glm/gtx/perpendicular.hpp b/glm/gtx/perpendicular.hpp index d294fd31..20079e84 100644 --- a/glm/gtx/perpendicular.hpp +++ b/glm/gtx/perpendicular.hpp @@ -17,12 +17,12 @@ #include "../glm.hpp" #include "../gtx/projection.hpp" -#ifndef GLM_ENABLE_EXPERIMENTAL -# error "GLM: GLM_GTX_perpendicular is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." -#endif - #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED) -# pragma message("GLM: GLM_GTX_perpendicular extension included") +# ifndef GLM_ENABLE_EXPERIMENTAL +# pragma message("GLM: GLM_GTX_perpendicular is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.") +# elif +# pragma message("GLM: GLM_GTX_perpendicular extension included") +# endif #endif namespace glm diff --git a/glm/gtx/polar_coordinates.hpp b/glm/gtx/polar_coordinates.hpp index 48ddf7f4..de61b7d6 100644 --- a/glm/gtx/polar_coordinates.hpp +++ b/glm/gtx/polar_coordinates.hpp @@ -15,12 +15,12 @@ // Dependency: #include "../glm.hpp" -#ifndef GLM_ENABLE_EXPERIMENTAL -# error "GLM: GLM_GTX_polar_coordinates is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." -#endif - #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED) -# pragma message("GLM: GLM_GTX_polar_coordinates extension included") +# ifndef GLM_ENABLE_EXPERIMENTAL +# pragma message("GLM: GLM_GTX_polar_coordinates is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.") +# elif +# pragma message("GLM: GLM_GTX_polar_coordinates extension included") +# endif #endif namespace glm diff --git a/glm/gtx/projection.hpp b/glm/gtx/projection.hpp index ccc351ce..c1b4f66c 100644 --- a/glm/gtx/projection.hpp +++ b/glm/gtx/projection.hpp @@ -15,12 +15,12 @@ // Dependency: #include "../geometric.hpp" -#ifndef GLM_ENABLE_EXPERIMENTAL -# error "GLM: GLM_GTX_projection is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." -#endif - #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED) -# pragma message("GLM: GLM_GTX_projection extension included") +# ifndef GLM_ENABLE_EXPERIMENTAL +# pragma message("GLM: GLM_GTX_projection is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.") +# elif +# pragma message("GLM: GLM_GTX_projection extension included") +# endif #endif namespace glm diff --git a/glm/gtx/quaternion.hpp b/glm/gtx/quaternion.hpp index e3c03de9..26e0343e 100644 --- a/glm/gtx/quaternion.hpp +++ b/glm/gtx/quaternion.hpp @@ -20,12 +20,12 @@ #include "../ext/quaternion_exponential.hpp" #include "../gtx/norm.hpp" -#ifndef GLM_ENABLE_EXPERIMENTAL -# error "GLM: GLM_GTX_quaternion is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." -#endif - #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED) -# pragma message("GLM: GLM_GTX_quaternion extension included") +# ifndef GLM_ENABLE_EXPERIMENTAL +# pragma message("GLM: GLM_GTX_quaternion is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.") +# elif +# pragma message("GLM: GLM_GTX_quaternion extension included") +# endif #endif namespace glm diff --git a/glm/gtx/range.hpp b/glm/gtx/range.hpp index 38c5713a..7bcdc6a6 100644 --- a/glm/gtx/range.hpp +++ b/glm/gtx/range.hpp @@ -15,12 +15,12 @@ // Dependencies #include "../detail/setup.hpp" -#ifndef GLM_ENABLE_EXPERIMENTAL -# error "GLM: GLM_GTX_range is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." -#endif - -#if !GLM_HAS_RANGE_FOR -# error "GLM_GTX_range requires C++11 suppport or 'range for'" +#if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED) +# ifndef GLM_ENABLE_EXPERIMENTAL +# pragma message("GLM: GLM_GTX_range is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.") +# elif +# pragma message("GLM: GLM_GTX_range extension included") +# endif #endif #include "../gtc/type_ptr.hpp" diff --git a/glm/gtx/raw_data.hpp b/glm/gtx/raw_data.hpp index f4d7fd96..7c63a0ff 100644 --- a/glm/gtx/raw_data.hpp +++ b/glm/gtx/raw_data.hpp @@ -16,12 +16,12 @@ #include "../ext/scalar_uint_sized.hpp" #include "../detail/setup.hpp" -#ifndef GLM_ENABLE_EXPERIMENTAL -# error "GLM: GLM_GTX_raw_data is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." -#endif - #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED) -# pragma message("GLM: GLM_GTX_raw_data extension included") +# ifndef GLM_ENABLE_EXPERIMENTAL +# pragma message("GLM: GLM_GTX_raw_data is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.") +# elif +# pragma message("GLM: GLM_GTX_raw_data extension included") +# endif #endif namespace glm diff --git a/glm/gtx/rotate_normalized_axis.hpp b/glm/gtx/rotate_normalized_axis.hpp index 87a63eb8..9a61aa6a 100644 --- a/glm/gtx/rotate_normalized_axis.hpp +++ b/glm/gtx/rotate_normalized_axis.hpp @@ -19,12 +19,12 @@ #include "../gtc/epsilon.hpp" #include "../gtc/quaternion.hpp" -#ifndef GLM_ENABLE_EXPERIMENTAL -# error "GLM: GLM_GTX_rotate_normalized_axis is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." -#endif - #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED) -# pragma message("GLM: GLM_GTX_rotate_normalized_axis extension included") +# ifndef GLM_ENABLE_EXPERIMENTAL +# pragma message("GLM: GLM_GTX_rotate_normalized_axis is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.") +# elif +# pragma message("GLM: GLM_GTX_rotate_normalized_axis extension included") +# endif #endif namespace glm diff --git a/glm/gtx/rotate_vector.hpp b/glm/gtx/rotate_vector.hpp index f918c6c2..5bc8e1f5 100644 --- a/glm/gtx/rotate_vector.hpp +++ b/glm/gtx/rotate_vector.hpp @@ -19,12 +19,12 @@ #include "../ext/vector_relational.hpp" #include "../glm.hpp" -#ifndef GLM_ENABLE_EXPERIMENTAL -# error "GLM: GLM_GTX_rotate_vector is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." -#endif - #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED) -# pragma message("GLM: GLM_GTX_rotate_vector extension included") +# ifndef GLM_ENABLE_EXPERIMENTAL +# pragma message("GLM: GLM_GTX_rotate_vector is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.") +# elif +# pragma message("GLM: GLM_GTX_rotate_vector extension included") +# endif #endif namespace glm diff --git a/glm/gtx/scalar_multiplication.hpp b/glm/gtx/scalar_multiplication.hpp index b73edf67..3b1bc70d 100644 --- a/glm/gtx/scalar_multiplication.hpp +++ b/glm/gtx/scalar_multiplication.hpp @@ -16,12 +16,12 @@ #include "../detail/setup.hpp" -#ifndef GLM_ENABLE_EXPERIMENTAL -# error "GLM: GLM_GTX_scalar_multiplication is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." -#endif - -#if !GLM_HAS_TEMPLATE_ALIASES && !(GLM_COMPILER & GLM_COMPILER_GCC) -# error "GLM_GTX_scalar_multiplication requires C++11 support or alias templates and if not support for GCC" +#if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED) +# ifndef GLM_ENABLE_EXPERIMENTAL +# pragma message("GLM: GLM_GTX_scalar_multiplication is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.") +# elif +# pragma message("GLM: GLM_GTX_scalar_multiplication extension included") +# endif #endif #include "../vec2.hpp" diff --git a/glm/gtx/scalar_relational.hpp b/glm/gtx/scalar_relational.hpp index 491c62ab..bf94adb2 100644 --- a/glm/gtx/scalar_relational.hpp +++ b/glm/gtx/scalar_relational.hpp @@ -15,12 +15,12 @@ // Dependency: #include "../glm.hpp" -#ifndef GLM_ENABLE_EXPERIMENTAL -# error "GLM: GLM_GTX_extend is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." -#endif - #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED) -# pragma message("GLM: GLM_GTX_extend extension included") +# ifndef GLM_ENABLE_EXPERIMENTAL +# pragma message("GLM: GLM_GTX_extend is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.") +# elif +# pragma message("GLM: GLM_GTX_extend extension included") +# endif #endif namespace glm diff --git a/glm/gtx/spline.hpp b/glm/gtx/spline.hpp index d59fa76a..29f48960 100644 --- a/glm/gtx/spline.hpp +++ b/glm/gtx/spline.hpp @@ -16,12 +16,12 @@ #include "../glm.hpp" #include "../gtx/optimum_pow.hpp" -#ifndef GLM_ENABLE_EXPERIMENTAL -# error "GLM: GLM_GTX_spline is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." -#endif - #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED) -# pragma message("GLM: GLM_GTX_spline extension included") +# ifndef GLM_ENABLE_EXPERIMENTAL +# pragma message("GLM: GLM_GTX_spline is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.") +# elif +# pragma message("GLM: GLM_GTX_spline extension included") +# endif #endif namespace glm diff --git a/glm/gtx/std_based_type.hpp b/glm/gtx/std_based_type.hpp index 6183a622..9d08e733 100644 --- a/glm/gtx/std_based_type.hpp +++ b/glm/gtx/std_based_type.hpp @@ -17,12 +17,12 @@ #include "../glm.hpp" #include -#ifndef GLM_ENABLE_EXPERIMENTAL -# error "GLM: GLM_GTX_std_based_type is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." -#endif - #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED) -# pragma message("GLM: GLM_GTX_std_based_type extension included") +# ifndef GLM_ENABLE_EXPERIMENTAL +# pragma message("GLM: GLM_GTX_std_based_type is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.") +# elif +# pragma message("GLM: GLM_GTX_std_based_type extension included") +# endif #endif namespace glm diff --git a/glm/gtx/string_cast.hpp b/glm/gtx/string_cast.hpp index 0564e57b..a8109aae 100644 --- a/glm/gtx/string_cast.hpp +++ b/glm/gtx/string_cast.hpp @@ -24,18 +24,18 @@ #include #include -#ifndef GLM_ENABLE_EXPERIMENTAL -# error "GLM: GLM_GTX_string_cast is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." +#if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED) +# ifndef GLM_ENABLE_EXPERIMENTAL +# pragma message("GLM: GLM_GTX_string_cast is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.") +# elif +# pragma message("GLM: GLM_GTX_string_cast extension included") +# endif #endif #if(GLM_COMPILER & GLM_COMPILER_CUDA) # error "GLM_GTX_string_cast is not supported on CUDA compiler" #endif -#if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED) -# pragma message("GLM: GLM_GTX_string_cast extension included") -#endif - namespace glm { /// @addtogroup gtx_string_cast diff --git a/glm/gtx/texture.hpp b/glm/gtx/texture.hpp index ee3bf7ce..b0e5c2dc 100644 --- a/glm/gtx/texture.hpp +++ b/glm/gtx/texture.hpp @@ -17,12 +17,12 @@ #include "../gtc/integer.hpp" #include "../gtx/component_wise.hpp" -#ifndef GLM_ENABLE_EXPERIMENTAL -# error "GLM: GLM_GTX_texture is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." -#endif - #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED) -# pragma message("GLM: GLM_GTX_texture extension included") +# ifndef GLM_ENABLE_EXPERIMENTAL +# pragma message("GLM: GLM_GTX_texture is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.") +# elif +# pragma message("GLM: GLM_GTX_texture extension included") +# endif #endif namespace glm diff --git a/glm/gtx/transform.hpp b/glm/gtx/transform.hpp index eded01a3..e2f47528 100644 --- a/glm/gtx/transform.hpp +++ b/glm/gtx/transform.hpp @@ -19,12 +19,12 @@ #include "../glm.hpp" #include "../gtc/matrix_transform.hpp" -#ifndef GLM_ENABLE_EXPERIMENTAL -# error "GLM: GLM_GTX_transform is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." -#endif - #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED) -# pragma message("GLM: GLM_GTX_transform extension included") +# ifndef GLM_ENABLE_EXPERIMENTAL +# pragma message("GLM: GLM_GTX_transform is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.") +# elif +# pragma message("GLM: GLM_GTX_transform extension included") +# endif #endif namespace glm diff --git a/glm/gtx/transform2.hpp b/glm/gtx/transform2.hpp index 19fdf6cc..27431380 100644 --- a/glm/gtx/transform2.hpp +++ b/glm/gtx/transform2.hpp @@ -17,12 +17,12 @@ #include "../glm.hpp" #include "../gtx/transform.hpp" -#ifndef GLM_ENABLE_EXPERIMENTAL -# error "GLM: GLM_GTX_transform2 is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." -#endif - #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED) -# pragma message("GLM: GLM_GTX_transform2 extension included") +# ifndef GLM_ENABLE_EXPERIMENTAL +# pragma message("GLM: GLM_GTX_transform2 is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.") +# elif +# pragma message("GLM: GLM_GTX_transform2 extension included") +# endif #endif namespace glm diff --git a/glm/gtx/type_aligned.hpp b/glm/gtx/type_aligned.hpp index 130f4cd6..fb379a87 100644 --- a/glm/gtx/type_aligned.hpp +++ b/glm/gtx/type_aligned.hpp @@ -17,12 +17,12 @@ #include "../gtc/type_precision.hpp" #include "../gtc/quaternion.hpp" -#ifndef GLM_ENABLE_EXPERIMENTAL -# error "GLM: GLM_GTX_type_aligned is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." -#endif - #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED) -# pragma message("GLM: GLM_GTX_type_aligned extension included") +# ifndef GLM_ENABLE_EXPERIMENTAL +# pragma message("GLM: GLM_GTX_type_aligned is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.") +# elif +# pragma message("GLM: GLM_GTX_type_aligned extension included") +# endif #endif namespace glm diff --git a/glm/gtx/type_trait.hpp b/glm/gtx/type_trait.hpp index 6a7bed6c..92d4f412 100644 --- a/glm/gtx/type_trait.hpp +++ b/glm/gtx/type_trait.hpp @@ -12,8 +12,12 @@ #pragma once -#ifndef GLM_ENABLE_EXPERIMENTAL -# error "GLM: GLM_GTX_type_trait is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." +#if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED) +# ifndef GLM_ENABLE_EXPERIMENTAL +# pragma message("GLM: GLM_GTX_type_trait is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.") +# elif +# pragma message("GLM: GLM_GTX_type_trait extension included") +# endif #endif // Dependency: @@ -21,10 +25,6 @@ #include "../gtc/quaternion.hpp" #include "../gtx/dual_quaternion.hpp" -#if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED) -# pragma message("GLM: GLM_GTX_type_trait extension included") -#endif - namespace glm { /// @addtogroup gtx_type_trait diff --git a/glm/gtx/vec_swizzle.hpp b/glm/gtx/vec_swizzle.hpp index daebac38..c45f195d 100644 --- a/glm/gtx/vec_swizzle.hpp +++ b/glm/gtx/vec_swizzle.hpp @@ -14,8 +14,12 @@ #include "../glm.hpp" -#ifndef GLM_ENABLE_EXPERIMENTAL -# error "GLM: GLM_GTX_vec_swizzle is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." +#if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED) +# ifndef GLM_ENABLE_EXPERIMENTAL +# pragma message("GLM: GLM_GTX_vec_swizzle is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.") +# elif +# pragma message("GLM: GLM_GTX_vec_swizzle extension included") +# endif #endif namespace glm { diff --git a/glm/gtx/vector_angle.hpp b/glm/gtx/vector_angle.hpp index c3660ca4..ed0ad790 100644 --- a/glm/gtx/vector_angle.hpp +++ b/glm/gtx/vector_angle.hpp @@ -20,12 +20,12 @@ #include "../gtx/quaternion.hpp" #include "../gtx/rotate_vector.hpp" -#ifndef GLM_ENABLE_EXPERIMENTAL -# error "GLM: GLM_GTX_vector_angle is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." -#endif - #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED) -# pragma message("GLM: GLM_GTX_vector_angle extension included") +# ifndef GLM_ENABLE_EXPERIMENTAL +# pragma message("GLM: GLM_GTX_vector_angle is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.") +# elif +# pragma message("GLM: GLM_GTX_vector_angle extension included") +# endif #endif namespace glm diff --git a/glm/gtx/vector_query.hpp b/glm/gtx/vector_query.hpp index 7d663d74..da6e3a9e 100644 --- a/glm/gtx/vector_query.hpp +++ b/glm/gtx/vector_query.hpp @@ -17,12 +17,12 @@ #include #include -#ifndef GLM_ENABLE_EXPERIMENTAL -# error "GLM: GLM_GTX_vector_query is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." -#endif - #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED) -# pragma message("GLM: GLM_GTX_vector_query extension included") +# ifndef GLM_ENABLE_EXPERIMENTAL +# pragma message("GLM: GLM_GTX_vector_query is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.") +# elif +# pragma message("GLM: GLM_GTX_vector_query extension included") +# endif #endif namespace glm diff --git a/glm/gtx/wrap.hpp b/glm/gtx/wrap.hpp index ecd0f048..7d8017b8 100644 --- a/glm/gtx/wrap.hpp +++ b/glm/gtx/wrap.hpp @@ -16,12 +16,12 @@ #include "../glm.hpp" #include "../gtc/vec1.hpp" -#ifndef GLM_ENABLE_EXPERIMENTAL -# error "GLM: GLM_GTX_wrap is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." -#endif - #if GLM_MESSAGES == GLM_ENABLE && !defined(GLM_EXT_INCLUDED) -# pragma message("GLM: GLM_GTX_wrap extension included") +# ifndef GLM_ENABLE_EXPERIMENTAL +# pragma message("GLM: GLM_GTX_wrap is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it.") +# elif +# pragma message("GLM: GLM_GTX_wrap extension included") +# endif #endif namespace glm