mirror/Aquaria
1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2025-01-26 02:07:26 +00:00
Code Issues Releases Wiki Activity

Tiny vector cleanup

Browse source
This commit is contained in:
fgenesis 2016-03-21 03:41:22 +01:00
parent ce7239056b
commit 361915947b
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
BBGE/Vector.cpp
View file

@ -396,7 +396,7 @@ Vector VectorPath::getValue(float usePercent)
/*************************************************************************/
float InterpolatedVector::interpolateTo(Vector vec, float timePeriod, int loopType, bool pingPong, bool ease, InterpolateToFlag flag)
float InterpolatedVector::interpolateTo(Vector vec, float timePeriod, int loopType, bool pingPong, bool ease)
{
if (timePeriod == 0)
{
@ -550,14 +550,14 @@ void InterpolatedVector::doInterpolate(float dt)
if (data->pingPong)
{
interpolateTo (data->from, data->timePeriod, data->loopType, data->pingPong, data->ease, IS_LOOPING);
interpolateTo (data->from, data->timePeriod, data->loopType, data->pingPong, data->ease);
}
else
{
this->x = data->from.x;
this->y = data->from.y;
this->z = data->from.z;
interpolateTo (data->target, data->timePeriod, data->loopType, data->pingPong, data->ease, IS_LOOPING);
interpolateTo (data->target, data->timePeriod, data->loopType, data->pingPong, data->ease);
}
}

3
BBGE/Vector.h
View file

@ -515,8 +515,7 @@ public:
return *this;
}
enum InterpolateToFlag { NONE=0, IS_LOOPING };
float interpolateTo (Vector vec, float timePeriod, int loopType = 0, bool pingPong = false, bool ease = false, InterpolateToFlag flag = NONE);
float interpolateTo (Vector vec, float timePeriod, int loopType = 0, bool pingPong = false, bool ease = false);
void inline update(float dt)
{
if (!data)