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/gtx/vector_angle.hpp | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) (limited to 'external/include/glm/gtx/vector_angle.hpp') diff --git a/external/include/glm/gtx/vector_angle.hpp b/external/include/glm/gtx/vector_angle.hpp index d52d3f8..401a47e 100644 --- a/external/include/glm/gtx/vector_angle.hpp +++ b/external/include/glm/gtx/vector_angle.hpp @@ -8,9 +8,9 @@ /// @defgroup gtx_vector_angle GLM_GTX_vector_angle /// @ingroup gtx /// -/// @brief Compute angle between vectors +/// Include to use the features of this extension. /// -/// need to be included to use these functionalities. +/// Compute angle between vectors #pragma once @@ -20,6 +20,10 @@ #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_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED) # pragma message("GLM: GLM_GTX_vector_angle extension included") #endif @@ -32,27 +36,20 @@ namespace glm //! Returns the absolute angle between two vectors. //! Parameters need to be normalized. /// @see gtx_vector_angle extension. - template - GLM_FUNC_DECL typename vecType::value_type angle( - vecType const & x, - vecType const & y); + template + GLM_FUNC_DECL T angle(vec const& x, vec const& y); //! Returns the oriented angle between two 2d vectors. //! Parameters need to be normalized. /// @see gtx_vector_angle extension. - template - GLM_FUNC_DECL T orientedAngle( - tvec2 const & x, - tvec2 const & y); + template + GLM_FUNC_DECL T orientedAngle(vec<2, T, Q> const& x, vec<2, T, Q> const& y); //! Returns the oriented angle between two 3d vectors based from a reference axis. //! Parameters need to be normalized. /// @see gtx_vector_angle extension. - template - GLM_FUNC_DECL T orientedAngle( - tvec3 const & x, - tvec3 const & y, - tvec3 const & ref); + template + GLM_FUNC_DECL T orientedAngle(vec<3, T, Q> const& x, vec<3, T, Q> const& y, vec<3, T, Q> const& ref); /// @} }// namespace glm -- cgit v1.2.3