TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-15 00:24:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/master'

Browse source
This commit is contained in:
thecelloman 2013-04-18 01:58:38 -04:00
commit db51fb251f
2 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Engine/source/math/mEase.h
View file

@ -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) {

7
README.md
View file

@ -15,6 +15,13 @@ More Information
* GarageGames [Store](http://www.garagegames.com/products) * GarageGames [Store](http://www.garagegames.com/products)
* GarageGames [Professional Services](http://services.garagegames.com/) * GarageGames [Professional Services](http://services.garagegames.com/)
Pre-compiled Versions
---------------------
In addition to GitHub we also have a couple of pre-packaged files for you to download if you would prefer to not compile the code yourself:
* [Complete Torque 3D 2.0 zip package](http://mit.garagegames.com/Torque3D-2.0.zip) with updated TorqueScript documentation, the *Project Manager*, and compiled versions of the templates.
* [Torque 3D Project Manager v1.1](http://mit.garagegames.com/T3DProjectManager-1.1.zip) on its own for use in your T3D forks.
Creating a New Project Based on a Template Creating a New Project Based on a Template
------------------------------------------ ------------------------------------------