diff options
| author | Daria Volvenkova <d.volvenkova@corp.mail.ru> | 2016-07-20 17:54:42 +0300 |
|---|---|---|
| committer | Daria Volvenkova <d.volvenkova@corp.mail.ru> | 2016-07-20 18:17:58 +0300 |
| commit | 671a19027b58e62ecfdb6c27b0ac5a72468d7410 (patch) | |
| tree | 5feaecd573734e8af9f1c959ea832ae3fa3a9570 /drape_frontend | |
| parent | beaffc2b97556f2be68a8f22cdaf47bc565a244a (diff) | |
Fixed handling of zero duration in interpolators.
Diffstat (limited to 'drape_frontend')
| -rw-r--r-- | drape_frontend/animation/interpolators.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drape_frontend/animation/interpolators.cpp b/drape_frontend/animation/interpolators.cpp index aa65ef1589..57267b335e 100644 --- a/drape_frontend/animation/interpolators.cpp +++ b/drape_frontend/animation/interpolators.cpp @@ -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 |