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/spline.hpp | 50 ++++++++++++++++++++----------------- 1 file changed, 27 insertions(+), 23 deletions(-) (limited to 'external/include/glm/gtx/spline.hpp') diff --git a/external/include/glm/gtx/spline.hpp b/external/include/glm/gtx/spline.hpp index 333a5bc..f080fec 100644 --- a/external/include/glm/gtx/spline.hpp +++ b/external/include/glm/gtx/spline.hpp @@ -6,9 +6,9 @@ /// @defgroup gtx_spline GLM_GTX_spline /// @ingroup gtx /// -/// @brief Spline functions +/// Include to use the features of this extension. /// -/// need to be included to use these functionalities. +/// Spline functions #pragma once @@ -16,6 +16,10 @@ #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_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED) # pragma message("GLM: GLM_GTX_spline extension included") #endif @@ -27,33 +31,33 @@ namespace glm /// Return a point from a catmull rom curve. /// @see gtx_spline extension. - template + template GLM_FUNC_DECL genType catmullRom( - genType const & v1, - genType const & v2, - genType const & v3, - genType const & v4, - typename genType::value_type const & s); - + genType const& v1, + genType const& v2, + genType const& v3, + genType const& v4, + typename genType::value_type const& s); + /// Return a point from a hermite curve. /// @see gtx_spline extension. - template + template GLM_FUNC_DECL genType hermite( - genType const & v1, - genType const & t1, - genType const & v2, - genType const & t2, - typename genType::value_type const & s); - - /// Return a point from a cubic curve. + genType const& v1, + genType const& t1, + genType const& v2, + genType const& t2, + typename genType::value_type const& s); + + /// Return a point from a cubic curve. /// @see gtx_spline extension. - template + template GLM_FUNC_DECL genType cubic( - genType const & v1, - genType const & v2, - genType const & v3, - genType const & v4, - typename genType::value_type const & s); + genType const& v1, + genType const& v2, + genType const& v3, + genType const& v4, + typename genType::value_type const& s); /// @} }//namespace glm -- cgit v1.2.3