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

Review fixes.

Browse source
This commit is contained in:
Daria Volvenkova 2016-05-19 11:00:40 +03:00
parent ffb32f2f1e
commit ada639df3c
5 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drape_frontend/animation/arrow_animation.cpp
View file

@ -3,10 +3,10 @@
namespace df
{
ArrowAnimation::ArrowAnimation(m2::PointD const & startPos, m2::PointD const & endPos,
double startAngle, double endAngle, ScreenBase const & convertor)
ArrowAnimation::ArrowAnimation(m2::PointD const & startPos, m2::PointD const & endPos, double moveDuration,
double startAngle, double endAngle)
: Animation(true /* couldBeInterrupted */, true /* couldBeBlended */)
, m_positionInterpolator(startPos, endPos, convertor)
, m_positionInterpolator(moveDuration, 0.0 /* delay */, startPos, endPos)
, m_angleInterpolator(startAngle, endAngle)
{
m_objects.insert(Animation::MyPositionArrow);

4
drape_frontend/animation/arrow_animation.hpp
View file

@ -9,8 +9,8 @@ namespace df
class ArrowAnimation : public Animation
{
public:
ArrowAnimation(m2::PointD const & startPos, m2::PointD const & endPos,
double startAngle, double endAngle, ScreenBase const & convertor);
ArrowAnimation(m2::PointD const & startPos, m2::PointD const & endPos, double moveDuration,
double startAngle, double endAngle);
Animation::Type GetType() const override { return Animation::Arrow; }

2
drape_frontend/animation/interpolators.cpp
View file

@ -9,7 +9,7 @@ namespace df
double CalcAnimSpeedDuration(double pxDiff, double pxSpeed)
{
double const kEps = 1e-5;
double constexpr kEps = 1e-5;
if (my::AlmostEqualAbs(pxDiff, 0.0, kEps))
return 0.0;

2
drape_frontend/animation/interpolators.hpp
View file

@ -9,7 +9,7 @@ class Interpolator
{
public:
Interpolator(double duration, double delay = 0);
virtual ~Interpolator(){}
virtual ~Interpolator() = default;
virtual void Advance(double elapsedSeconds);
virtual void Finish();

10
drape_frontend/my_position_controller.cpp
View file

@ -630,10 +630,10 @@ void MyPositionController::CreateAnim(m2::PointD const & oldPos, double oldAzimu
{
if (IsModeChangeViewport())
{
m_animCreator = [this, oldPos, oldAzimut, screen]()
m_animCreator = [this, oldPos, oldAzimut, moveDuration]()
{
AnimationSystem::Instance().CombineAnimation(make_unique_dp<ArrowAnimation>(oldPos, m_position, oldAzimut,
m_drawDirection, screen));
AnimationSystem::Instance().CombineAnimation(make_unique_dp<ArrowAnimation>(oldPos, m_position, moveDuration,
oldAzimut, m_drawDirection));
};
m_oldPosition = oldPos;
m_oldDrawDirection = oldAzimut;
@ -641,8 +641,8 @@ void MyPositionController::CreateAnim(m2::PointD const & oldPos, double oldAzimu
}
else
{
AnimationSystem::Instance().CombineAnimation(make_unique_dp<ArrowAnimation>(oldPos, m_position, oldAzimut,
m_drawDirection, screen));
AnimationSystem::Instance().CombineAnimation(make_unique_dp<ArrowAnimation>(oldPos, m_position, moveDuration,
oldAzimut, m_drawDirection));
}
}
}