diff --git a/CMakeLists.txt b/CMakeLists.txt index e5159b0f..bd4dd654 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -82,6 +82,11 @@ option(GLM_TEST_ENABLE_SIMD_AVX "Enable AVX optimizations" OFF) option(GLM_TEST_ENABLE_SIMD_AVX2 "Enable AVX2 optimizations" OFF) option(GLM_TEST_FORCE_PURE "Force 'pure' instructions" OFF) +option(GLM_ENABLE_EXPERIMENTAL "Enable experimental GLM_GTX" OFF) +configure_file(glm/experimental.hpp.in experimental.hpp @ONLY) +include_directories(${CMAKE_BINARY_DIR}/glm) +include_directories(${CMAKE_BINARY_DIR}) + if(GLM_TEST_FORCE_PURE) add_definitions(-DGLM_FORCE_PURE) @@ -167,6 +172,7 @@ option(GLM_INSTALL_ENABLE "GLM install" ON) set(GLM_INSTALL_CONFIGDIR "${CMAKE_INSTALL_LIBDIR}/cmake/glm") if (GLM_INSTALL_ENABLE) install(DIRECTORY glm DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) + install(FILES "${CMAKE_CURRENT_BINARY_DIR}/experimental.hpp" DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/glm) endif() write_basic_package_version_file("${CMAKE_CURRENT_BINARY_DIR}/glmConfigVersion.cmake" VERSION ${GLM_VERSION} COMPATIBILITY AnyNewerVersion) diff --git a/glm/CMakeLists.txt b/glm/CMakeLists.txt index df9c9ee5..dc5db4bc 100644 --- a/glm/CMakeLists.txt +++ b/glm/CMakeLists.txt @@ -43,6 +43,8 @@ source_group("SIMD Files" FILES ${SIMD_INLINE}) source_group("SIMD Files" FILES ${SIMD_HEADER}) include_directories(${CMAKE_CURRENT_SOURCE_DIR}/..) +# make out-of tree builds find experimental.hpp +include_directories(${CMAKE_BINARY_DIR}/glm) if(GLM_STATIC_LIBRARY_ENABLE OR GLM_DYNAMIC_LIBRARY_ENABLE) if(GLM_STATIC_LIBRARY_ENABLE) diff --git a/glm/experimental.hpp.in b/glm/experimental.hpp.in new file mode 100644 index 00000000..bfab5138 --- /dev/null +++ b/glm/experimental.hpp.in @@ -0,0 +1 @@ +#cmakedefine GLM_ENABLE_EXPERIMENTAL diff --git a/glm/ext.hpp b/glm/ext.hpp index d085bfd5..a2948447 100644 --- a/glm/ext.hpp +++ b/glm/ext.hpp @@ -39,6 +39,7 @@ # include "./gtc/type_aligned.hpp" #endif +#include "experimental.hpp" #ifdef GLM_ENABLE_EXPERIMENTAL #include "./gtx/associated_min_max.hpp" #include "./gtx/bit.hpp" diff --git a/glm/gtx/associated_min_max.hpp b/glm/gtx/associated_min_max.hpp index 0c9935f3..d00c2bc4 100644 --- a/glm/gtx/associated_min_max.hpp +++ b/glm/gtx/associated_min_max.hpp @@ -16,6 +16,7 @@ // Dependency: #include "../glm.hpp" +#include "../experimental.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 diff --git a/glm/gtx/bit.hpp b/glm/gtx/bit.hpp index 1447fa00..31957083 100644 --- a/glm/gtx/bit.hpp +++ b/glm/gtx/bit.hpp @@ -15,6 +15,7 @@ // Dependencies #include "../gtc/bitfield.hpp" +#include "../experimental.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 diff --git a/glm/gtx/closest_point.hpp b/glm/gtx/closest_point.hpp index 6859bb96..ebd9fe5a 100644 --- a/glm/gtx/closest_point.hpp +++ b/glm/gtx/closest_point.hpp @@ -15,6 +15,7 @@ // Dependency: #include "../glm.hpp" +#include "../experimental.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 diff --git a/glm/gtx/color_space.hpp b/glm/gtx/color_space.hpp index d1e655c3..51416819 100644 --- a/glm/gtx/color_space.hpp +++ b/glm/gtx/color_space.hpp @@ -15,6 +15,7 @@ // Dependency: #include "../glm.hpp" +#include "../experimental.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 diff --git a/glm/gtx/color_space_YCoCg.hpp b/glm/gtx/color_space_YCoCg.hpp index e82cbd8b..7ae71041 100644 --- a/glm/gtx/color_space_YCoCg.hpp +++ b/glm/gtx/color_space_YCoCg.hpp @@ -15,6 +15,7 @@ // Dependency: #include "../glm.hpp" +#include "../experimental.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 diff --git a/glm/gtx/common.hpp b/glm/gtx/common.hpp index 8081bff7..57a68a8d 100644 --- a/glm/gtx/common.hpp +++ b/glm/gtx/common.hpp @@ -18,6 +18,7 @@ #include "../vec4.hpp" #include "../gtc/vec1.hpp" +#include "../experimental.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 diff --git a/glm/gtx/compatibility.hpp b/glm/gtx/compatibility.hpp index e5b60399..9876669c 100644 --- a/glm/gtx/compatibility.hpp +++ b/glm/gtx/compatibility.hpp @@ -16,6 +16,7 @@ #include "../glm.hpp" #include "../gtc/quaternion.hpp" +#include "../experimental.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 diff --git a/glm/gtx/component_wise.hpp b/glm/gtx/component_wise.hpp index 39bab5d5..4fe0e4e2 100644 --- a/glm/gtx/component_wise.hpp +++ b/glm/gtx/component_wise.hpp @@ -18,6 +18,7 @@ #include "../detail/setup.hpp" #include "../detail/qualifier.hpp" +#include "../experimental.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 diff --git a/glm/gtx/dual_quaternion.hpp b/glm/gtx/dual_quaternion.hpp index c4343e9d..d59fb459 100644 --- a/glm/gtx/dual_quaternion.hpp +++ b/glm/gtx/dual_quaternion.hpp @@ -20,6 +20,7 @@ #include "../gtc/constants.hpp" #include "../gtc/quaternion.hpp" +#include "../experimental.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 diff --git a/glm/gtx/euler_angles.hpp b/glm/gtx/euler_angles.hpp index e66e9281..ad5988c1 100644 --- a/glm/gtx/euler_angles.hpp +++ b/glm/gtx/euler_angles.hpp @@ -15,6 +15,7 @@ // Dependency: #include "../glm.hpp" +#include "../experimental.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 diff --git a/glm/gtx/extend.hpp b/glm/gtx/extend.hpp index eda4e470..cde6db63 100644 --- a/glm/gtx/extend.hpp +++ b/glm/gtx/extend.hpp @@ -15,6 +15,7 @@ // Dependency: #include "../glm.hpp" +#include "../experimental.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 diff --git a/glm/gtx/extended_min_max.hpp b/glm/gtx/extended_min_max.hpp index 3e767b0c..0bcffcc6 100644 --- a/glm/gtx/extended_min_max.hpp +++ b/glm/gtx/extended_min_max.hpp @@ -15,6 +15,7 @@ // Dependency: #include "../glm.hpp" +#include "../experimental.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 diff --git a/glm/gtx/fast_exponential.hpp b/glm/gtx/fast_exponential.hpp index 2d4918e7..e6d11f0a 100644 --- a/glm/gtx/fast_exponential.hpp +++ b/glm/gtx/fast_exponential.hpp @@ -16,6 +16,7 @@ // Dependency: #include "../glm.hpp" +#include "../experimental.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 diff --git a/glm/gtx/fast_square_root.hpp b/glm/gtx/fast_square_root.hpp index 1e1ec3cf..f758aeef 100644 --- a/glm/gtx/fast_square_root.hpp +++ b/glm/gtx/fast_square_root.hpp @@ -19,6 +19,7 @@ #include "../exponential.hpp" #include "../geometric.hpp" +#include "../experimental.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 diff --git a/glm/gtx/fast_trigonometry.hpp b/glm/gtx/fast_trigonometry.hpp index 739065fb..f1332958 100644 --- a/glm/gtx/fast_trigonometry.hpp +++ b/glm/gtx/fast_trigonometry.hpp @@ -15,6 +15,7 @@ // Dependency: #include "../gtc/constants.hpp" +#include "../experimental.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 diff --git a/glm/gtx/gradient_paint.hpp b/glm/gtx/gradient_paint.hpp index 2713cec0..d4703991 100644 --- a/glm/gtx/gradient_paint.hpp +++ b/glm/gtx/gradient_paint.hpp @@ -17,6 +17,7 @@ #include "../glm.hpp" #include "../gtx/optimum_pow.hpp" +#include "../experimental.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 diff --git a/glm/gtx/handed_coordinate_space.hpp b/glm/gtx/handed_coordinate_space.hpp index 1d0d4104..3a52ddcf 100644 --- a/glm/gtx/handed_coordinate_space.hpp +++ b/glm/gtx/handed_coordinate_space.hpp @@ -15,6 +15,7 @@ // Dependency: #include "../glm.hpp" +#include "../experimental.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 diff --git a/glm/gtx/hash.hpp b/glm/gtx/hash.hpp index fe8a3efd..92bfc9b2 100644 --- a/glm/gtx/hash.hpp +++ b/glm/gtx/hash.hpp @@ -12,6 +12,7 @@ #pragma once +#include "../experimental.hpp" #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." #endif diff --git a/glm/gtx/integer.hpp b/glm/gtx/integer.hpp index 96637a13..5d1a16c6 100644 --- a/glm/gtx/integer.hpp +++ b/glm/gtx/integer.hpp @@ -16,6 +16,7 @@ #include "../glm.hpp" #include "../gtc/integer.hpp" +#include "../experimental.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 diff --git a/glm/gtx/intersect.hpp b/glm/gtx/intersect.hpp index 61e2226a..4895ba93 100644 --- a/glm/gtx/intersect.hpp +++ b/glm/gtx/intersect.hpp @@ -21,6 +21,7 @@ #include "../gtx/closest_point.hpp" #include "../gtx/vector_query.hpp" +#include "../experimental.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 diff --git a/glm/gtx/io.hpp b/glm/gtx/io.hpp index 49a1ec11..ae39cd60 100644 --- a/glm/gtx/io.hpp +++ b/glm/gtx/io.hpp @@ -23,6 +23,7 @@ #include "../glm.hpp" #include "../gtx/quaternion.hpp" +#include "../experimental.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 diff --git a/glm/gtx/log_base.hpp b/glm/gtx/log_base.hpp index e873e356..45b8d53c 100644 --- a/glm/gtx/log_base.hpp +++ b/glm/gtx/log_base.hpp @@ -15,6 +15,7 @@ // Dependency: #include "../glm.hpp" +#include "../experimental.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 diff --git a/glm/gtx/matrix_cross_product.hpp b/glm/gtx/matrix_cross_product.hpp index 967743b8..52d6c173 100644 --- a/glm/gtx/matrix_cross_product.hpp +++ b/glm/gtx/matrix_cross_product.hpp @@ -16,6 +16,7 @@ // Dependency: #include "../glm.hpp" +#include "../experimental.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 diff --git a/glm/gtx/matrix_decompose.hpp b/glm/gtx/matrix_decompose.hpp index b7ec0e83..6793fee2 100644 --- a/glm/gtx/matrix_decompose.hpp +++ b/glm/gtx/matrix_decompose.hpp @@ -20,6 +20,7 @@ #include "../gtc/quaternion.hpp" #include "../gtc/matrix_transform.hpp" +#include "../experimental.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 diff --git a/glm/gtx/matrix_factorisation.hpp b/glm/gtx/matrix_factorisation.hpp index e30a7746..79c293be 100644 --- a/glm/gtx/matrix_factorisation.hpp +++ b/glm/gtx/matrix_factorisation.hpp @@ -15,6 +15,7 @@ // Dependency: #include "../glm.hpp" +#include "../experimental.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 diff --git a/glm/gtx/matrix_interpolation.hpp b/glm/gtx/matrix_interpolation.hpp index 89c4596c..799983bb 100644 --- a/glm/gtx/matrix_interpolation.hpp +++ b/glm/gtx/matrix_interpolation.hpp @@ -16,6 +16,7 @@ // Dependency: #include "../glm.hpp" +#include "../experimental.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 diff --git a/glm/gtx/matrix_major_storage.hpp b/glm/gtx/matrix_major_storage.hpp index 7f264a59..e68467cd 100644 --- a/glm/gtx/matrix_major_storage.hpp +++ b/glm/gtx/matrix_major_storage.hpp @@ -16,6 +16,7 @@ // Dependency: #include "../glm.hpp" +#include "../experimental.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 diff --git a/glm/gtx/matrix_operation.hpp b/glm/gtx/matrix_operation.hpp index bce938bb..1e85bb5e 100644 --- a/glm/gtx/matrix_operation.hpp +++ b/glm/gtx/matrix_operation.hpp @@ -15,6 +15,7 @@ // Dependency: #include "../glm.hpp" +#include "../experimental.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 diff --git a/glm/gtx/matrix_query.hpp b/glm/gtx/matrix_query.hpp index 5df5f52f..eec1eec0 100644 --- a/glm/gtx/matrix_query.hpp +++ b/glm/gtx/matrix_query.hpp @@ -18,6 +18,7 @@ #include "../gtx/vector_query.hpp" #include +#include "../experimental.hpp" #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 diff --git a/glm/gtx/matrix_transform_2d.hpp b/glm/gtx/matrix_transform_2d.hpp index 239ab9f4..3ca8d2f2 100644 --- a/glm/gtx/matrix_transform_2d.hpp +++ b/glm/gtx/matrix_transform_2d.hpp @@ -17,6 +17,7 @@ #include "../mat3x3.hpp" #include "../vec2.hpp" +#include "../experimental.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 diff --git a/glm/gtx/mixed_product.hpp b/glm/gtx/mixed_product.hpp index 58562aab..5c7460d5 100644 --- a/glm/gtx/mixed_product.hpp +++ b/glm/gtx/mixed_product.hpp @@ -15,6 +15,7 @@ // Dependency: #include "../glm.hpp" +#include "../experimental.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 diff --git a/glm/gtx/norm.hpp b/glm/gtx/norm.hpp index 46474e07..3cf2c3ea 100644 --- a/glm/gtx/norm.hpp +++ b/glm/gtx/norm.hpp @@ -17,6 +17,7 @@ #include "../geometric.hpp" #include "../gtx/quaternion.hpp" +#include "../experimental.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 diff --git a/glm/gtx/normal.hpp b/glm/gtx/normal.hpp index 15cec9c2..7bb4c096 100644 --- a/glm/gtx/normal.hpp +++ b/glm/gtx/normal.hpp @@ -16,6 +16,7 @@ // Dependency: #include "../glm.hpp" +#include "../experimental.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 diff --git a/glm/gtx/normalize_dot.hpp b/glm/gtx/normalize_dot.hpp index 86048e70..c6604da4 100644 --- a/glm/gtx/normalize_dot.hpp +++ b/glm/gtx/normalize_dot.hpp @@ -16,6 +16,7 @@ // Dependency: #include "../gtx/fast_square_root.hpp" +#include "../experimental.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 diff --git a/glm/gtx/number_precision.hpp b/glm/gtx/number_precision.hpp index 3732a56c..b48845f7 100644 --- a/glm/gtx/number_precision.hpp +++ b/glm/gtx/number_precision.hpp @@ -18,6 +18,7 @@ #include "../glm.hpp" #include "../gtc/type_precision.hpp" +#include "../experimental.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 diff --git a/glm/gtx/optimum_pow.hpp b/glm/gtx/optimum_pow.hpp index eb09f1c3..94a6bbb2 100644 --- a/glm/gtx/optimum_pow.hpp +++ b/glm/gtx/optimum_pow.hpp @@ -15,6 +15,7 @@ // Dependency: #include "../glm.hpp" +#include "../experimental.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 diff --git a/glm/gtx/orthonormalize.hpp b/glm/gtx/orthonormalize.hpp index 2a684ee4..4ff47e53 100644 --- a/glm/gtx/orthonormalize.hpp +++ b/glm/gtx/orthonormalize.hpp @@ -18,6 +18,7 @@ #include "../mat3x3.hpp" #include "../geometric.hpp" +#include "../experimental.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 diff --git a/glm/gtx/perpendicular.hpp b/glm/gtx/perpendicular.hpp index 35601ac7..17251ebe 100644 --- a/glm/gtx/perpendicular.hpp +++ b/glm/gtx/perpendicular.hpp @@ -17,6 +17,7 @@ #include "../glm.hpp" #include "../gtx/projection.hpp" +#include "../experimental.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 diff --git a/glm/gtx/polar_coordinates.hpp b/glm/gtx/polar_coordinates.hpp index b8421db4..5125215d 100644 --- a/glm/gtx/polar_coordinates.hpp +++ b/glm/gtx/polar_coordinates.hpp @@ -15,6 +15,7 @@ // Dependency: #include "../glm.hpp" +#include "../experimental.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 diff --git a/glm/gtx/projection.hpp b/glm/gtx/projection.hpp index 9a24abf9..4d5bf76f 100644 --- a/glm/gtx/projection.hpp +++ b/glm/gtx/projection.hpp @@ -15,6 +15,7 @@ // Dependency: #include "../geometric.hpp" +#include "../experimental.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 diff --git a/glm/gtx/quaternion.hpp b/glm/gtx/quaternion.hpp index c3d99a5c..808ba0fd 100644 --- a/glm/gtx/quaternion.hpp +++ b/glm/gtx/quaternion.hpp @@ -19,6 +19,7 @@ #include "../gtc/quaternion.hpp" #include "../gtx/norm.hpp" +#include "../experimental.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 diff --git a/glm/gtx/range.hpp b/glm/gtx/range.hpp index e0ef46af..03c797c3 100644 --- a/glm/gtx/range.hpp +++ b/glm/gtx/range.hpp @@ -15,6 +15,7 @@ // Dependencies #include "../detail/setup.hpp" +#include "../experimental.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 diff --git a/glm/gtx/raw_data.hpp b/glm/gtx/raw_data.hpp index fb34c8cb..0084fec6 100644 --- a/glm/gtx/raw_data.hpp +++ b/glm/gtx/raw_data.hpp @@ -16,6 +16,7 @@ #include "../detail/setup.hpp" #include "../detail/type_int.hpp" +#include "../experimental.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 diff --git a/glm/gtx/rotate_normalized_axis.hpp b/glm/gtx/rotate_normalized_axis.hpp index eee90d6e..82612928 100644 --- a/glm/gtx/rotate_normalized_axis.hpp +++ b/glm/gtx/rotate_normalized_axis.hpp @@ -19,6 +19,7 @@ #include "../gtc/epsilon.hpp" #include "../gtc/quaternion.hpp" +#include "../experimental.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 diff --git a/glm/gtx/rotate_vector.hpp b/glm/gtx/rotate_vector.hpp index c8ace89e..e954b041 100644 --- a/glm/gtx/rotate_vector.hpp +++ b/glm/gtx/rotate_vector.hpp @@ -17,6 +17,7 @@ #include "../glm.hpp" #include "../gtx/transform.hpp" +#include "../experimental.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 diff --git a/glm/gtx/scalar_multiplication.hpp b/glm/gtx/scalar_multiplication.hpp index b73edf67..22baa52a 100644 --- a/glm/gtx/scalar_multiplication.hpp +++ b/glm/gtx/scalar_multiplication.hpp @@ -16,6 +16,7 @@ #include "../detail/setup.hpp" +#include "../experimental.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 diff --git a/glm/gtx/scalar_relational.hpp b/glm/gtx/scalar_relational.hpp index 7fc8c1cc..f21f3b2b 100644 --- a/glm/gtx/scalar_relational.hpp +++ b/glm/gtx/scalar_relational.hpp @@ -15,6 +15,7 @@ // Dependency: #include "../glm.hpp" +#include "../experimental.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 diff --git a/glm/gtx/spline.hpp b/glm/gtx/spline.hpp index f96d7e07..76359cfd 100644 --- a/glm/gtx/spline.hpp +++ b/glm/gtx/spline.hpp @@ -16,6 +16,7 @@ #include "../glm.hpp" #include "../gtx/optimum_pow.hpp" +#include "../experimental.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 diff --git a/glm/gtx/std_based_type.hpp b/glm/gtx/std_based_type.hpp index 55a2f074..92532b9e 100644 --- a/glm/gtx/std_based_type.hpp +++ b/glm/gtx/std_based_type.hpp @@ -17,6 +17,7 @@ #include "../glm.hpp" #include +#include "../experimental.hpp" #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 diff --git a/glm/gtx/string_cast.hpp b/glm/gtx/string_cast.hpp index 4b4e280f..dfcd5085 100644 --- a/glm/gtx/string_cast.hpp +++ b/glm/gtx/string_cast.hpp @@ -24,6 +24,7 @@ #include #include +#include "../experimental.hpp" #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." #endif diff --git a/glm/gtx/texture.hpp b/glm/gtx/texture.hpp index 312bf398..7af185f6 100644 --- a/glm/gtx/texture.hpp +++ b/glm/gtx/texture.hpp @@ -17,6 +17,7 @@ #include "../gtc/integer.hpp" #include "../gtx/component_wise.hpp" +#include "../experimental.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 diff --git a/glm/gtx/transform.hpp b/glm/gtx/transform.hpp index d23b99ce..5a5d9619 100644 --- a/glm/gtx/transform.hpp +++ b/glm/gtx/transform.hpp @@ -19,6 +19,7 @@ #include "../glm.hpp" #include "../gtc/matrix_transform.hpp" +#include "../experimental.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 diff --git a/glm/gtx/transform2.hpp b/glm/gtx/transform2.hpp index 85f5bea4..5d7c83fc 100644 --- a/glm/gtx/transform2.hpp +++ b/glm/gtx/transform2.hpp @@ -17,6 +17,7 @@ #include "../glm.hpp" #include "../gtx/transform.hpp" +#include "../experimental.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 diff --git a/glm/gtx/type_aligned.hpp b/glm/gtx/type_aligned.hpp index 6ff9f276..6ad92fad 100644 --- a/glm/gtx/type_aligned.hpp +++ b/glm/gtx/type_aligned.hpp @@ -18,6 +18,7 @@ // Dependency: #include "../gtc/type_precision.hpp" +#include "../experimental.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 diff --git a/glm/gtx/type_trait.hpp b/glm/gtx/type_trait.hpp index 637bbd19..65519cab 100644 --- a/glm/gtx/type_trait.hpp +++ b/glm/gtx/type_trait.hpp @@ -12,6 +12,7 @@ #pragma once +#include "../experimental.hpp" #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." #endif diff --git a/glm/gtx/vec_swizzle.hpp b/glm/gtx/vec_swizzle.hpp index daebac38..13d523dc 100644 --- a/glm/gtx/vec_swizzle.hpp +++ b/glm/gtx/vec_swizzle.hpp @@ -14,6 +14,7 @@ #include "../glm.hpp" +#include "../experimental.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." #endif diff --git a/glm/gtx/vector_angle.hpp b/glm/gtx/vector_angle.hpp index 401a47eb..98c9d110 100644 --- a/glm/gtx/vector_angle.hpp +++ b/glm/gtx/vector_angle.hpp @@ -20,6 +20,7 @@ #include "../gtx/quaternion.hpp" #include "../gtx/rotate_vector.hpp" +#include "../experimental.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 diff --git a/glm/gtx/vector_query.hpp b/glm/gtx/vector_query.hpp index 6560eaa5..5ab1ffda 100644 --- a/glm/gtx/vector_query.hpp +++ b/glm/gtx/vector_query.hpp @@ -17,6 +17,7 @@ #include #include +#include "../experimental.hpp" #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 diff --git a/glm/gtx/wrap.hpp b/glm/gtx/wrap.hpp index 2c4b55df..5bf26a33 100644 --- a/glm/gtx/wrap.hpp +++ b/glm/gtx/wrap.hpp @@ -16,6 +16,7 @@ #include "../glm.hpp" #include "../gtc/vec1.hpp" +#include "../experimental.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