mirror/glm
1
0
Fork 0
mirror of https://github.com/g-truc/glm.git synced 2024-12-01 20:24:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed GTX_easing build on VS2013

Browse Source
This commit is contained in:
Christophe Riccio 2018-05-08 12:16:58 +02:00
parent c58b60ec2a
commit 1cd7a47279
3 changed files with 46 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
glm/gtx/easing.hpp
View File

@ -171,29 +171,41 @@ namespace glm{
template <typename genType> template <typename genType>
GLM_FUNC_DECL genType elasticEaseInOut(genType const & a); GLM_FUNC_DECL genType elasticEaseInOut(genType const & a);
/// @param o Optional overshoot modifier
/// @see gtx_easing /// @see gtx_easing
template <typename genType> template <typename genType>
GLM_FUNC_DECL genType backEaseIn(genType const & a, genType const & o = 1.70158f); GLM_FUNC_DECL genType backEaseIn(genType const& a);
/// @see gtx_easing
template <typename genType>
GLM_FUNC_DECL genType backEaseOut(genType const& a);
/// @see gtx_easing
template <typename genType>
GLM_FUNC_DECL genType backEaseInOut(genType const& a);
/// @param o Optional overshoot modifier /// @param o Optional overshoot modifier
/// @see gtx_easing /// @see gtx_easing
template <typename genType> template <typename genType>
GLM_FUNC_DECL genType backEaseOut(genType const & a, genType const & o = 1.70158f); GLM_FUNC_DECL genType backEaseIn(genType const& a, genType const& o);
/// @param o Optional overshoot modifier /// @param o Optional overshoot modifier
/// @see gtx_easing /// @see gtx_easing
template <typename genType> template <typename genType>
GLM_FUNC_DECL genType backEaseInOut(genType const & a, genType const & o = 1.70158f); GLM_FUNC_DECL genType backEaseOut(genType const& a, genType const& o);
/// @param o Optional overshoot modifier
/// @see gtx_easing
template <typename genType>
GLM_FUNC_DECL genType backEaseInOut(genType const& a, genType const& o);
template <typename genType> template <typename genType>
GLM_FUNC_DECL genType bounceEaseIn(genType const & a); GLM_FUNC_DECL genType bounceEaseIn(genType const& a);
template <typename genType> template <typename genType>
GLM_FUNC_DECL genType bounceEaseOut(genType const & a); GLM_FUNC_DECL genType bounceEaseOut(genType const& a);
template <typename genType> template <typename genType>
GLM_FUNC_DECL genType bounceEaseInOut(genType const & a, genType); GLM_FUNC_DECL genType bounceEaseInOut(genType const& a, genType);
/// @} /// @}
}//namespace glm }//namespace glm

18
glm/gtx/easing.inl
View File

@ -361,6 +361,24 @@ namespace glm{
} }
} }
template <typename genType>
GLM_FUNC_QUALIFIER genType backEaseIn(genType const& a)
{
return backEaseIn(a, static_cast<genType>(1.70158));
}
template <typename genType>
GLM_FUNC_QUALIFIER genType backEaseOut(genType const& a)
{
return backEaseOut(a, static_cast<genType>(1.70158));
}
template <typename genType>
GLM_FUNC_QUALIFIER genType backEaseInOut(genType const& a)
{
return backEaseInOut(a, static_cast<genType>(1.70158));
}
template <typename genType> template <typename genType>
GLM_FUNC_QUALIFIER genType bounceEaseOut(genType const& a) GLM_FUNC_QUALIFIER genType bounceEaseOut(genType const& a)
{ {

18
test/gtx/gtx_easing.cpp
View File

@ -13,39 +13,39 @@ namespace
T r; T r;
r = glm::linearInterpolation(a); r = glm::linearInterpolation(a);
//
r = glm::quadraticEaseIn(a); r = glm::quadraticEaseIn(a);
r = glm::quadraticEaseOut(a); r = glm::quadraticEaseOut(a);
r = glm::quadraticEaseInOut(a); r = glm::quadraticEaseInOut(a);
//
r = glm::cubicEaseIn(a); r = glm::cubicEaseIn(a);
r = glm::cubicEaseOut(a); r = glm::cubicEaseOut(a);
r = glm::cubicEaseInOut(a); r = glm::cubicEaseInOut(a);
//
r = glm::quarticEaseIn(a); r = glm::quarticEaseIn(a);
r = glm::quarticEaseOut(a); r = glm::quarticEaseOut(a);
r = glm::quinticEaseInOut(a); r = glm::quinticEaseInOut(a);
//
r = glm::sineEaseIn(a); r = glm::sineEaseIn(a);
r = glm::sineEaseOut(a); r = glm::sineEaseOut(a);
r = glm::sineEaseInOut(a); r = glm::sineEaseInOut(a);
//
r = glm::circularEaseIn(a); r = glm::circularEaseIn(a);
r = glm::circularEaseOut(a); r = glm::circularEaseOut(a);
r = glm::circularEaseInOut(a); r = glm::circularEaseInOut(a);
//
r = glm::exponentialEaseIn(a);; r = glm::exponentialEaseIn(a);;
r = glm::exponentialEaseOut(a); r = glm::exponentialEaseOut(a);
r = glm::exponentialEaseInOut(a); r = glm::exponentialEaseInOut(a);
//
r = glm::elasticEaseIn(a); r = glm::elasticEaseIn(a);
r = glm::elasticEaseOut(a); r = glm::elasticEaseOut(a);
r = glm::elasticEaseInOut(a); r = glm::elasticEaseInOut(a);
//
r = glm::backEaseIn(a); r = glm::backEaseIn(a);
r = glm::backEaseOut(a); r = glm::backEaseOut(a);
r = glm::backEaseInOut(a); r = glm::backEaseInOut(a);
//
r = glm::bounceEaseIn(a);; r = glm::bounceEaseIn(a);;
r = glm::bounceEaseOut(a); r = glm::bounceEaseOut(a);
r = glm::bounceEaseInOut(a); r = glm::bounceEaseInOut(a);