Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-01 08:20:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

warning fixes

Browse source
This commit is contained in:
Anthony J. Thibault 2019-08-04 11:03:21 -07:00
parent 31762a0c80
commit a8d7f06862
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libraries/animation/src/AnimUtil.cpp
View file

@ -222,7 +222,7 @@ float easingFunc(float alpha, EasingType type) {
case EasingType_EaseOutSine: case EasingType_EaseOutSine:
return sinf(alpha * PI_OVER_TWO); return sinf(alpha * PI_OVER_TWO);
case EasingType_EaseInOutSine: case EasingType_EaseInOutSine:
return 0.5f * (1.0f - cos(alpha * PI)); return 0.5f * (1.0f - cosf(alpha * PI));
case EasingType_EaseInQuad: case EasingType_EaseInQuad:
return alpha * alpha; return alpha * alpha;
case EasingType_EaseOutQuad: case EasingType_EaseOutQuad:
@ -282,7 +282,7 @@ float easingFunc(float alpha, EasingType type) {
case EasingType_EaseInOutExpo: case EasingType_EaseInOutExpo:
if (alpha == 0.0f || alpha == 1.0f) if (alpha == 0.0f || alpha == 1.0f)
return alpha; return alpha;
else if (alpha < 0.5) { else if (alpha < 0.5f) {
return 0.5f * powf(2.0f, (20.0f * alpha) - 10.0f); return 0.5f * powf(2.0f, (20.0f * alpha) - 10.0f);
} else { } else {
return -0.5f * powf(2.0f, (-20.0f * alpha) + 10.0f) + 1.0f; return -0.5f * powf(2.0f, (-20.0f * alpha) + 10.0f) + 1.0f;