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

ease member vars tagged as member vars

Browse source
This commit is contained in:
Azaezel 2018-03-14 15:45:45 -05:00
parent d979cf9d2d
commit 300d9eefbf
4 changed files with 88 additions and 88 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

146
Engine/source/math/mEase.cpp
View file

@ -6,158 +6,158 @@
EaseF::EaseF()
{
dir = 0;
type = 0;
param[0] = param[1] = -1.0f;
mDir = 0;
mType = 0;
mParam[0] = mParam[1] = -1.0f;
}
EaseF::EaseF(const EaseF &ease)
{
this->dir = ease.dir;
this->type = ease.type;
this->param[0] = ease.param[0];
this->param[1] = ease.param[1];
this->mDir = ease.mDir;
this->mType = ease.mType;
this->mParam[0] = ease.mParam[0];
this->mParam[1] = ease.mParam[1];
}
EaseF::EaseF(const S32 dir, const S32 type)
{
this->dir = dir;
this->type = type;
this->param[0] = this->param[1] = -1.0f;
this->mDir = dir;
this->mType = type;
this->mParam[0] = this->mParam[1] = -1.0f;
}
EaseF::EaseF(const S32 dir, const S32 type, F32 param[2])
{
this->dir = dir;
this->type = type;
this->param[0] = param[0];
this->param[1] = param[1];
this->mDir = dir;
this->mType = type;
this->mParam[0] = param[0];
this->mParam[1] = param[1];
}
void EaseF::set(const S32 dir, const S32 type)
{
this->dir = dir;
this->type = type;
this->param[0] = this->param[1] = -1.0f;
this->mDir = dir;
this->mType = type;
this->mParam[0] = this->mParam[1] = -1.0f;
}
void EaseF::set(const S32 dir, const S32 type, F32 param[2])
{
this->dir = dir;
this->type = type;
this->param[0] = param[0];
this->param[1] = param[1];
this->mDir = dir;
this->mType = type;
this->mParam[0] = param[0];
this->mParam[1] = param[1];
}
void EaseF::set(const S32 dir, const S32 type, F32 param0, F32 param1)
{
this->dir = dir;
this->type = type;
this->param[0] = param0;
this->param[1] = param1;
this->mDir = dir;
this->mType = type;
this->mParam[0] = param0;
this->mParam[1] = param1;
}
void EaseF::set(const char *s)
{
dSscanf(s,"%d %d %f %f",&dir,&type,&param[0],&param[1]);
dSscanf(s,"%d %d %f %f",&mDir,&mType,&mParam[0],&mParam[1]);
}
F32 EaseF::getValue(F32 t, F32 b, F32 c, F32 d) const
{
F32 value = 0;
if (type == Ease::Linear)
if (mType == Ease::Linear)
{
value = mLinearTween(t,b, c, d);
}
else if (type == Ease::Quadratic)
else if (mType == Ease::Quadratic)
{
if (dir == Ease::In)
if (mDir == Ease::In)
value = mEaseInQuad(t,b, c, d);
else if (dir == Ease::Out)
else if (mDir == Ease::Out)
value = mEaseOutQuad(t,b, c, d);
else if (dir == Ease::InOut)
else if (mDir == Ease::InOut)
value = mEaseInOutQuad(t,b, c, d);
}
else if (type == Ease::Cubic)
else if (mType == Ease::Cubic)
{
if (dir == Ease::In)
if (mDir == Ease::In)
value = mEaseInCubic(t,b, c, d);
else if (dir == Ease::Out)
else if (mDir == Ease::Out)
value = mEaseOutCubic(t,b, c, d);
else if (dir == Ease::InOut)
else if (mDir == Ease::InOut)
value = mEaseInOutCubic(t,b, c, d);
}
else if (type == Ease::Quartic)
else if (mType == Ease::Quartic)
{
if (dir == Ease::In)
if (mDir == Ease::In)
value = mEaseInQuart(t,b, c, d);
else if (dir == Ease::Out)
else if (mDir == Ease::Out)
value = mEaseOutQuart(t,b, c, d);
else if (dir == Ease::InOut)
else if (mDir == Ease::InOut)
value = mEaseInOutQuart(t,b, c, d);
}
else if (type == Ease::Quintic)
else if (mType == Ease::Quintic)
{
if (dir == Ease::In)
if (mDir == Ease::In)
value = mEaseInQuint(t,b, c, d);
else if (dir == Ease::Out)
else if (mDir == Ease::Out)
value = mEaseOutQuint(t,b, c, d);
else if (dir == Ease::InOut)
else if (mDir == Ease::InOut)
value = mEaseInOutQuint(t,b, c, d);
}
else if (type == Ease::Sinusoidal)
else if (mType == Ease::Sinusoidal)
{
if (dir == Ease::In)
if (mDir == Ease::In)
value = mEaseInSine(t,b, c, d);
else if (dir == Ease::Out)
else if (mDir == Ease::Out)
value = mEaseOutSine(t,b, c, d);
else if (dir == Ease::InOut)
else if (mDir == Ease::InOut)
value = mEaseInOutSine(t,b, c, d);
}
else if (type == Ease::Exponential)
else if (mType == Ease::Exponential)
{
if (dir == Ease::In)
if (mDir == Ease::In)
value = mEaseInExpo(t,b, c, d);
else if (dir == Ease::Out)
else if (mDir == Ease::Out)
value = mEaseOutExpo(t,b, c, d);
else if (dir == Ease::InOut)
else if (mDir == Ease::InOut)
value = mEaseInOutExpo(t,b, c, d);
}
else if (type == Ease::Circular)
else if (mType == Ease::Circular)
{
if (dir == Ease::In)
if (mDir == Ease::In)
value = mEaseInCirc(t,b, c, d);
else if (dir == Ease::Out)
else if (mDir == Ease::Out)
value = mEaseOutCirc(t,b, c, d);
else if (dir == Ease::InOut)
else if (mDir == Ease::InOut)
value = mEaseInOutCirc(t,b, c, d);
}
else if (type == Ease::Elastic)
else if (mType == Ease::Elastic)
{
if (dir == Ease::In)
value = mEaseInElastic(t,b, c, d, param[0], param[1]);
else if (dir == Ease::Out)
value = mEaseOutElastic(t,b, c, d, param[0], param[1]);
else if (dir == Ease::InOut)
value = mEaseInOutElastic(t,b, c, d, param[0], param[1]);
if (mDir == Ease::In)
value = mEaseInElastic(t,b, c, d, mParam[0], mParam[1]);
else if (mDir == Ease::Out)
value = mEaseOutElastic(t,b, c, d, mParam[0], mParam[1]);
else if (mDir == Ease::InOut)
value = mEaseInOutElastic(t,b, c, d, mParam[0], mParam[1]);
}
else if (type == Ease::Back)
else if (mType == Ease::Back)
{
if (dir == Ease::In)
value = mEaseInBack(t,b, c, d, param[0]);
else if (dir == Ease::Out)
value = mEaseOutBack(t,b, c, d, param[0]);
else if (dir == Ease::InOut)
value = mEaseInOutBack(t,b, c, d, param[0]);
if (mDir == Ease::In)
value = mEaseInBack(t,b, c, d, mParam[0]);
else if (mDir == Ease::Out)
value = mEaseOutBack(t,b, c, d, mParam[0]);
else if (mDir == Ease::InOut)
value = mEaseInOutBack(t,b, c, d, mParam[0]);
}
else if (type == Ease::Bounce)
else if (mType == Ease::Bounce)
{
if (dir == Ease::In)
if (mDir == Ease::In)
value = mEaseInBounce(t,b, c, d);
else if (dir == Ease::Out)
else if (mDir == Ease::Out)
value = mEaseOutBounce(t,b, c, d);
else if (dir == Ease::InOut)
else if (mDir == Ease::InOut)
value = mEaseInOutBounce(t,b, c, d);
}
else

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

@ -76,9 +76,9 @@ class EaseF : public Ease
{
//-------------------------------------- Public data
public:
S32 dir; // inout, in, out
S32 type; // linear, etc...
F32 param[2]; // optional params
S32 mDir; // inout, in, out
S32 mType; // linear, etc...
F32 mParam[2]; // optional params
//-------------------------------------- Public interface
public:

16
Engine/source/math/mathIO.h
View file

@ -142,10 +142,10 @@ inline bool mathRead(Stream& stream, QuatF* q)
inline bool mathRead(Stream& stream, EaseF* e)
{
bool success = stream.read( &e->dir );
success &= stream.read( &e->type );
success &= stream.read( &e->param[ 0 ] );
success &= stream.read( &e->param[ 1 ] );
bool success = stream.read( &e->mDir );
success &= stream.read( &e->mType );
success &= stream.read( &e->mParam[ 0 ] );
success &= stream.read( &e->mParam[ 1 ] );
return success;
}
@ -270,10 +270,10 @@ inline bool mathWrite(Stream& stream, const QuatF& q)
inline bool mathWrite(Stream& stream, const EaseF& e)
{
bool success = stream.write(e.dir);
success &= stream.write(e.type);
success &= stream.write(e.param[0]);
success &= stream.write(e.param[1]);
bool success = stream.write(e.mDir);
success &= stream.write(e.mType);
success &= stream.write(e.mParam[0]);
success &= stream.write(e.mParam[1]);
return success;
}

8
Engine/source/math/mathTypes.cpp
View file

@ -557,7 +557,7 @@ ConsoleGetType( TypeEaseF )
static const U32 bufSize = 256;
char* returnBuffer = Con::getReturnBuffer(bufSize);
dSprintf(returnBuffer, bufSize, "%d %d %g %g",
pEase->dir, pEase->type, pEase->param[0], pEase->param[1]);
pEase->mDir, pEase->mType, pEase->mParam[0], pEase->mParam[1]);
return returnBuffer;
}
@ -567,11 +567,11 @@ ConsoleSetType( TypeEaseF )
EaseF* pDst = (EaseF*)dptr;
// defaults...
pDst->param[0] = -1.0f;
pDst->param[1] = -1.0f;
pDst->mParam[0] = -1.0f;
pDst->mParam[1] = -1.0f;
if (argc == 1) {
U32 args = dSscanf(argv[0], "%d %d %f %f", // the two params are optional and assumed -1 if not present...
&pDst->dir, &pDst->type, &pDst->param[0],&pDst->param[1]);
&pDst->mDir, &pDst->mType, &pDst->mParam[0],&pDst->mParam[1]);
if( args < 2 )
Con::warnf( "Warning, EaseF probably not read properly" );
} else {