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

review fixes

Browse source
This commit is contained in:
ExMix 2015-07-31 09:23:51 +03:00 • committed by r.kuznetsov
parent 61b04a64ba
commit ee00401a88
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
drape_frontend/kinetic_scroller.cpp
View file

@ -8,6 +8,8 @@ namespace df
class KineticScrollAnimation : public BaseModelViewAnimation
{
public:
// startRect - mercator visible on screen rect in moment when user release fingers
// direction - mercator space direction of moving. length(direction) - mercator distance on wich map will be offset
KineticScrollAnimation(m2::AnyRectD const & startRect, m2::PointD const & direction, double duration)
: BaseModelViewAnimation(duration)
, m_targetCenter(startRect.GlobalCenter() + direction)
@ -19,9 +21,9 @@ public:
m2::AnyRectD GetCurrentRect() const override
{
m2::PointD center = -m_direction * exp(-GetT());
m2::AnyRectD rect(m_targetCenter + center, m_angle, m_localRect);
return rect;
// current position = target position - amplutide * e ^ (elapsed / duration)
// we calculate current position not based on start position, but based on target position
return m2::AnyRectD(m_targetCenter - m_direction * exp(-GetT()), m_angle, m_localRect);
}
m2::AnyRectD GetTargetRect() const override
@ -51,6 +53,9 @@ void KineticScroller::InitGrab(ScreenBase const & modelView, double timeStamp)
void KineticScroller::GrabViewRect(ScreenBase const & modelView, double timeStamp)
{
// In KineitcScroller we store m_direction in mixed state
// Direction in mercator space, and length(m_direction) in pixel space
// We need same reaction on different zoom levels, and should calculate velocity on pixel space
ASSERT_GREATER(m_lastTimestamp, 0.0, ());
ASSERT_GREATER(timeStamp, m_lastTimestamp, ());
double elapsed = timeStamp - m_lastTimestamp;
@ -62,7 +67,9 @@ void KineticScroller::GrabViewRect(ScreenBase const & modelView, double timeStam
if (!delta.IsAlmostZero())
delta = delta.Normalize();
// velocity on pixels
double v = pxDeltaLength / elapsed;
// at this point length(m_direction) already in pixel space, and delta normalized
m_direction = delta * 0.8 * v + m_direction * 0.2;
m_lastTimestamp = timeStamp;
@ -82,6 +89,7 @@ unique_ptr<BaseModelViewAnimation> KineticScroller::CreateKineticAnimation(Scree
return unique_ptr<BaseModelViewAnimation>();
double const KINETIC_DURATION = 0.375;
// Before we start animation we have to convert length(m_direction) from pixel space to mercator space
m2::PointD center = m_lastRect.GlobalCenter();
double glbLength = 0.5 * (modelView.PtoG(modelView.GtoP(center) + m_direction) - center).Length();
return unique_ptr<BaseModelViewAnimation>(new KineticScrollAnimation(m_lastRect,