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

[core] move animation in RotateAndFollow mode

Browse source
This commit is contained in:
ExMix 2014-10-14 10:18:10 +03:00 • committed by Alex Zolotarev
parent 8186871f09
commit d5a2a73d32
2 changed files with 19 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
map/location_state.cpp
View file

@ -103,6 +103,11 @@ public:
}
}
m2::PointD const & GetPositionForDraw()
{
return m_posAnim->GetCurrentValue();
}
virtual void OnStep(double ts)
{
ASSERT(m_angleAnim != nullptr, ());
@ -171,7 +176,7 @@ private:
if (dstPos.EqualDxDy(m_posAnim->GetCurrentValue(), POSITION_TOLERANCE) && angleDist < ANGLE_TOLERANCE)
return;
double const posSpeed = m_fw->GetNavigator().ComputeMoveSpeed(m_posAnim->GetCurrentValue(), dstPos);
double const posSpeed = 2 * m_fw->GetNavigator().ComputeMoveSpeed(m_posAnim->GetCurrentValue(), dstPos);
double const angleSpeed = angleDist < 1.0 ? 1.5 : m_fw->GetAnimator().GetRotationSpeed();
m_angleAnim->ResetDestParams(dstAngle, angleSpeed);
m_posAnim->ResetDestParams(dstPos, posSpeed);
@ -467,13 +472,14 @@ void State::draw(graphics::OverlayRenderer * r,
m_framework->GetNavigator().GtoP(Position() + m2::PointD(m_errorRadius, 0.0)));
double const drawScale = pxErrorRadius / s_cacheRadius;
m2::PointD const & pivotPosition = GetPositionForDraw();
math::Matrix<double, 3, 3> locationDrawM = math::Shift(
math::Scale(
math::Identity<double, 3>(),
drawScale,
drawScale),
pivot());
pivotPosition);
math::Matrix<double, 3, 3> const drawM = locationDrawM * m;
// draw error sector
@ -488,7 +494,7 @@ void State::draw(graphics::OverlayRenderer * r,
math::Rotate(
math::Identity<double, 3>(),
rotateAngle),
pivot());
pivotPosition);
if (!IsInRouting())
r->drawDisplayList(m_positionArrow.get(), compassDrawM * m);
@ -847,4 +853,12 @@ void State::SetDirection(double bearing)
SetModeInfo(IncludeModeBit(m_modeInfo, KnownDirectionBit));
}
m2::PointD const State::GetPositionForDraw() const
{
if (m_animTask != nullptr)
return m_framework->GtoP(static_cast<RotateAndFollowAnim *>(m_animTask.get())->GetPositionForDraw());
return pivot();
}
}

2
map/location_state.hpp
View file

@ -145,6 +145,8 @@ namespace location
bool Assign(location::CompassInfo const & info);
void SetDirection(double bearing);
const m2::PointD GetPositionForDraw() const;
private:
// Mode bits
// {