diff --git a/glm/gtx/easing.hpp b/glm/gtx/easing.hpp index b0d20afc..ec285e4d 100644 --- a/glm/gtx/easing.hpp +++ b/glm/gtx/easing.hpp @@ -16,10 +16,12 @@ #pragma once +// Dependency: +#include "../glm.hpp" #include "../detail/setup.hpp" #include "../detail/qualifier.hpp" #include "../detail/type_int.hpp" - +#include "../gtc/constants.hpp" #ifndef GLM_ENABLE_EXPERIMENTAL # error "GLM: GLM_GTX_easing 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." diff --git a/glm/gtx/easing.inl b/glm/gtx/easing.inl index 4ea32c59..d7e6ec1e 100644 --- a/glm/gtx/easing.inl +++ b/glm/gtx/easing.inl @@ -32,7 +32,7 @@ namespace glm{ assert(a >= zero()); assert(a <= one()); - return -(a * (a - 2)); + return -(a * (a - static_cast(2))); } template @@ -42,13 +42,13 @@ namespace glm{ assert(a >= zero()); assert(a <= one()); - if(a < 0.5) + if(a < static_cast(0.5)) { - return 2 * a * a; + return static_cast(2) * a * a; } else { - return (-2 * a * a) + (4 * a) - one(); + return (-static_cast(2) * a * a) + (4 * a) - one(); } } @@ -80,14 +80,14 @@ namespace glm{ assert(a >= zero()); assert(a <= one()); - if (a < 0.5) + if (a < static_cast(0.5)) { - return 4 * a * a * a; + return static_cast(4) * a * a * a; } else { - genType const f = ((2 * a) - 2); - return 0.5f * f * f * f + one(); + genType const f = ((static_cast(2) * a) - static_cast(2)); + return static_cast(0.5) * f * f * f + one(); } } @@ -119,14 +119,14 @@ namespace glm{ assert(a >= zero()); assert(a <= one()); - if (a < 0.5) + if (a < static_cast(0.5)) { - return 8 * a * a * a * a; + return static_cast(8) * a * a * a * a; } else { genType const f = (a - one()); - return -8 * f * f * f * f + one(); + return -static_cast(8) * f * f * f * f + one(); } } @@ -158,14 +158,14 @@ namespace glm{ assert(a >= zero()); assert(a <= one()); - if (a < 0.5) + if (a < static_cast(0.5)) { - return 16 * a * a * a * a * a; + return static_cast(16) * a * a * a * a * a; } else { - genType const f = ((2 * a) - 2); - return 0.5f * f * f * f * f * f + one(); + genType const f = ((static_cast(2) * a) - static_cast(2)); + return static_cast(0.5) * f * f * f * f * f + one(); } } @@ -196,7 +196,7 @@ namespace glm{ assert(a >= zero()); assert(a <= one()); - return 0.5f * (one() - cos(a * pi())); + return static_cast(0.5) * (one() - cos(a * pi())); } template @@ -216,7 +216,7 @@ namespace glm{ assert(a >= zero()); assert(a <= one()); - return sqrt((2 - a) * a); + return sqrt((static_cast(2) - a) * a); } template @@ -267,11 +267,11 @@ namespace glm{ if(a < static_cast(0.5)) { - return static_cast(0.5) * pow(2, (20 * a) - 10); + return static_cast(0.5) * pow(static_cast(2), (static_cast(20) * a) - static_cast(10)); } else { - return -static_cast(0.5) * pow(2, (-20 * a) + 10) + one(); + return -static_cast(0.5) * pow(static_cast(2), (-static_cast(20) * a) + static_cast(10)) + one(); } } @@ -282,7 +282,7 @@ namespace glm{ assert(a >= zero()); assert(a <= one()); - return sin(13 * half_pi() * a) * pow(static_cast(2), 10 * (a - one())); + return sin(static_cast(13) * half_pi() * a) * pow(static_cast(2), static_cast(10) * (a - one())); } template @@ -292,7 +292,7 @@ namespace glm{ assert(a >= zero()); assert(a <= one()); - return sin(-13 * half_pi() * (a + one())) * pow(static_cast(2), -10 * a) + one(); + return sin(-static_cast(13) * half_pi() * (a + one())) * pow(static_cast(2), -static_cast(10) * a) + one(); } template