kirylkaveryn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps-tmp
Code Pull requests Activity

Getting of arrow animation properties fixed.

Browse source
This commit is contained in:
Daria Volvenkova 2016-06-01 16:42:32 +03:00
parent b7e1bea854
commit f40a9d5884
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drape_frontend/animation/interpolators.cpp
View file

@ -93,7 +93,9 @@ PositionInterpolator::PositionInterpolator(double duration, double delay,
, m_startPosition(startPosition)
, m_endPosition(endPosition)
, m_position(startPosition)
{}
{
SetActive(m_startPosition != m_endPosition);
}
PositionInterpolator::PositionInterpolator(m2::PointD const & startPosition,
m2::PointD const & endPosition,

4
drape_frontend/animation_system.cpp
View file

@ -138,7 +138,7 @@ bool AnimationSystem::SwitchPerspective(Animation::SwitchPerspectiveParams & par
bool AnimationSystem::GetArrowPosition(m2::PointD & position)
{
Animation::PropertyValue value;
if (GetProperty(Animation::Arrow, Animation::Position, value))
if (GetProperty(Animation::MyPositionArrow, Animation::Position, value))
{
position = value.m_valuePointD;
return true;
@ -149,7 +149,7 @@ bool AnimationSystem::GetArrowPosition(m2::PointD & position)
bool AnimationSystem::GetArrowAngle(double & angle)
{
Animation::PropertyValue value;
if (GetProperty(Animation::Arrow, Animation::Angle, value))
if (GetProperty(Animation::MyPositionArrow, Animation::Angle, value))
{
angle = value.m_valueD;
return true;