From 2877f4eda3d1b0c7431039e3142ecf1a282a34b1 Mon Sep 17 00:00:00 2001 From: LaG1924 <12997935+LaG1924@users.noreply.github.com> Date: Tue, 21 Aug 2018 20:40:38 +0500 Subject: Update glm to 0.9.9.0 --- external/include/glm/ext.hpp | 36 +++++++++++------------------------- 1 file changed, 11 insertions(+), 25 deletions(-) (limited to 'external/include/glm/ext.hpp') diff --git a/external/include/glm/ext.hpp b/external/include/glm/ext.hpp index 0c9f9f9..1f74f3c 100644 --- a/external/include/glm/ext.hpp +++ b/external/include/glm/ext.hpp @@ -1,29 +1,8 @@ /// @file glm/ext.hpp /// /// @ref core (Dependence) -/// -/// @defgroup gtc GTC Extensions (Stable) -/// -/// @brief Functions and types that the GLSL specification doesn't define, but useful to have for a C++ program. -/// -/// GTC extensions aim to be stable. -/// -/// Even if it's highly unrecommended, it's possible to include all the extensions at once by -/// including . Otherwise, each extension needs to be included a specific file. -/// -/// @defgroup gtx GTX Extensions (Experimental) -/// -/// @brief Functions and types that the GLSL specification doesn't define, but -/// useful to have for a C++ program. -/// -/// Experimental extensions are useful functions and types, but the development of -/// their API and functionality is not necessarily stable. They can change -/// substantially between versions. Backwards compatibility is not much of an issue -/// for them. -/// -/// Even if it's highly unrecommended, it's possible to include all the extensions -/// at once by including . Otherwise, each extension needs to be -/// included a specific file. + +#include "detail/setup.hpp" #pragma once @@ -31,14 +10,16 @@ #if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_MESSAGE_EXT_INCLUDED_DISPLAYED) # define GLM_MESSAGE_EXT_INCLUDED_DISPLAYED -# pragma message("GLM: All extensions included (not recommanded)") +# pragma message("GLM: All extensions included (not recommended)") #endif//GLM_MESSAGES +#include "./ext/vec1.hpp" +#include "./ext/vector_relational.hpp" + #include "./gtc/bitfield.hpp" #include "./gtc/color_space.hpp" #include "./gtc/constants.hpp" #include "./gtc/epsilon.hpp" -#include "./gtc/functions.hpp" #include "./gtc/integer.hpp" #include "./gtc/matrix_access.hpp" #include "./gtc/matrix_integer.hpp" @@ -59,9 +40,11 @@ # include "./gtc/type_aligned.hpp" #endif +#ifdef GLM_ENABLE_EXPERIMENTAL #include "./gtx/associated_min_max.hpp" #include "./gtx/bit.hpp" #include "./gtx/closest_point.hpp" +#include "./gtx/color_encoding.hpp" #include "./gtx/color_space.hpp" #include "./gtx/color_space_YCoCg.hpp" #include "./gtx/compatibility.hpp" @@ -73,6 +56,7 @@ #include "./gtx/fast_exponential.hpp" #include "./gtx/fast_square_root.hpp" #include "./gtx/fast_trigonometry.hpp" +#include "./gtx/functions.hpp" #include "./gtx/gradient_paint.hpp" #include "./gtx/handed_coordinate_space.hpp" #include "./gtx/integer.hpp" @@ -103,6 +87,7 @@ #endif #include "./gtx/transform.hpp" #include "./gtx/transform2.hpp" +#include "./gtx/vec_swizzle.hpp" #include "./gtx/vector_angle.hpp" #include "./gtx/vector_query.hpp" #include "./gtx/wrap.hpp" @@ -114,3 +99,4 @@ #if GLM_HAS_RANGE_FOR # include "./gtx/range.hpp" #endif +#endif//GLM_ENABLE_EXPERIMENTAL -- cgit v1.2.3