diff --git a/glm/gtx/easing.inl b/glm/gtx/easing.inl index 54bb7790..b6d7886f 100644 --- a/glm/gtx/easing.inl +++ b/glm/gtx/easing.inl @@ -249,7 +249,8 @@ namespace glm{ { genType const Complementary = a - one(); genType const Two = static_cast(2); - return glm::pow(Two, Complementary * static_cast(10)); + + return glm::pow(Two, Complementary * static_cast(10)); } } @@ -263,7 +264,9 @@ namespace glm{ if(a >= one()) return a; else - return one() - glm::pow(static_cast(2), -static_cast(10) * a); + { + return one() - glm::pow(static_cast(2), -static_cast(10) * a); + } } template @@ -274,9 +277,9 @@ namespace glm{ assert(a <= one()); if(a < static_cast(0.5)) - return static_cast(0.5) * glm::pow(static_cast(2), (static_cast(20) * a) - static_cast(10)); + return static_cast(0.5) * glm::pow(static_cast(2), (static_cast(20) * a) - static_cast(10)); else - return -static_cast(0.5) * glm::pow(static_cast(2), (-static_cast(20) * a) + static_cast(10)) + one(); + return -static_cast(0.5) * glm::pow(static_cast(2), (-static_cast(20) * a) + static_cast(10)) + one(); } template @@ -286,7 +289,7 @@ namespace glm{ assert(a >= zero()); assert(a <= one()); - return std::sin(static_cast(13) * half_pi() * a) * glm::pow(static_cast(2), static_cast(10) * (a - one())); + return std::sin(static_cast(13) * half_pi() * a) * glm::pow(static_cast(2), static_cast(10) * (a - one())); } template @@ -296,7 +299,7 @@ namespace glm{ assert(a >= zero()); assert(a <= one()); - return std::sin(-static_cast(13) * half_pi() * (a + one())) * glm::pow(static_cast(2), -static_cast(10) * a) + one(); + return std::sin(-static_cast(13) * half_pi() * (a + one())) * glm::pow(static_cast(2), -static_cast(10) * a) + one(); } template @@ -307,9 +310,9 @@ namespace glm{ assert(a <= one()); if(a < static_cast(0.5)) - return static_cast(0.5) * std::sin(static_cast(13) * half_pi() * (static_cast(2) * a)) * glm::pow(static_cast(2), static_cast(10) * ((static_cast(2) * a) - one())); + return static_cast(0.5) * std::sin(static_cast(13) * half_pi() * (static_cast(2) * a)) * glm::pow(static_cast(2), static_cast(10) * ((static_cast(2) * a) - one())); else - return static_cast(0.5) * (std::sin(-static_cast(13) * half_pi() * ((static_cast(2) * a - one()) + one())) * glm::pow(static_cast(2), -static_cast(10) * (static_cast(2) * a - one())) + static_cast(2)); + return static_cast(0.5) * (std::sin(-static_cast(13) * half_pi() * ((static_cast(2) * a - one()) + one())) * glm::pow(static_cast(2), -static_cast(10) * (static_cast(2) * a - one())) + static_cast(2)); } template