RedAuburn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

Merge pull request #3854 from darina/interpolator-fix

Browse source 
Fixed handling of zero duration in interpolators.
This commit is contained in:
Roman Kuznetsov 2016-07-20 18:19:22 +03:00 • committed by GitHub
commit 6b872bc6ea
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
drape_frontend/animation/interpolators.cpp
View file

@ -93,7 +93,7 @@ PositionInterpolator::PositionInterpolator(double duration, double delay,
, m_endPosition(endPosition)
, m_position(startPosition)
{
SetActive(m_startPosition != m_endPosition);
SetActive((GetDuration() > 0.0) && (m_startPosition != m_endPosition));
}
PositionInterpolator::PositionInterpolator(m2::PointD const & startPosition, m2::PointD const & endPosition,
@ -109,7 +109,7 @@ PositionInterpolator::PositionInterpolator(double delay,
, m_endPosition(endPosition)
, m_position(startPosition)
{
SetActive(m_startPosition != m_endPosition);
SetActive((GetDuration() > 0.0) && (m_startPosition != m_endPosition));
}
PositionInterpolator::PositionInterpolator(m2::PointD const & startPosition, m2::PointD const & endPosition,
@ -125,7 +125,7 @@ PositionInterpolator::PositionInterpolator(double delay,
, m_endPosition(endPosition)
, m_position(startPosition)
{
SetActive(m_startPosition != m_endPosition);
SetActive((GetDuration() > 0.0) && (m_startPosition != m_endPosition));
}
//static
@ -190,7 +190,7 @@ ScaleInterpolator::ScaleInterpolator(double delay, double startScale, double end
, m_endScale(endScale)
, m_scale(startScale)
{
SetActive(m_startScale != m_endScale);
SetActive((GetDuration() > 0.0) && (m_startScale != m_endScale));
}
// static
@ -231,7 +231,7 @@ AngleInterpolator::AngleInterpolator(double delay, double startAngle, double end
, m_endAngle(ang::AngleIn2PI(endAngle))
, m_angle(m_startAngle)
{
SetActive(m_startAngle != m_endAngle);
SetActive((GetDuration() > 0.0) && (m_startAngle != m_endAngle));
}
AngleInterpolator::AngleInterpolator(double delay, double duration, double startAngle, double endAngle)
@ -240,7 +240,7 @@ AngleInterpolator::AngleInterpolator(double delay, double duration, double start
, m_endAngle(ang::AngleIn2PI(endAngle))
, m_angle(m_startAngle)
{
SetActive(m_startAngle != m_endAngle);
SetActive((GetDuration() > 0.0) && (m_startAngle != m_endAngle));
}
// static