mirror of
https://github.com/TorqueGameEngines/Torque3D.git
synced 2026-04-29 16:25:42 +00:00
Merge pull request #200 from lukaspj/ElasticEaseFunctionFix
Elastic ease fix
This commit is contained in:
commit
fdd38bee04
1 changed files with 1 additions and 1 deletions
|
|
@ -278,7 +278,7 @@ inline F32 mEaseOutElastic(F32 t, F32 b, F32 c, F32 d, F32 a, F32 p) {
|
||||||
F32 s;
|
F32 s;
|
||||||
if (a < mFabs(c)) { a=c; s=p/4; }
|
if (a < mFabs(c)) { a=c; s=p/4; }
|
||||||
else s = p/(2*M_PI_F) * mAsin (c/a);
|
else s = p/(2*M_PI_F) * mAsin (c/a);
|
||||||
return a*mPow(2,-10*t) * mAsin( (t*d-s)*(2*M_PI_F)/p ) + c + b;
|
return a*mPow(2,-10*t) * mSin( (t*d-s)*(2*M_PI_F)/p ) + c + b;
|
||||||
};
|
};
|
||||||
|
|
||||||
inline F32 mEaseInOutElastic(F32 t, F32 b, F32 c, F32 d, F32 a, F32 p) {
|
inline F32 mEaseInOutElastic(F32 t, F32 b, F32 c, F32 d, F32 a, F32 p) {
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue