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

[core] review fix

Browse source
This commit is contained in:
ExMix 2014-09-25 15:25:52 +03:00 • committed by Alex Zolotarev
parent b070547def
commit 4695a52557
5 changed files with 47 additions and 69 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
anim/angle_interpolation.cpp
View file

@ -75,4 +75,21 @@ namespace anim
m_endAngle = m_startAngle + m_dist;
m_interval = fabs(m_dist) / (2 * math::pi) * m_speed;
}
SafeAngleInterpolation::SafeAngleInterpolation(double start, double end, double speed)
: TBase(start, end, speed, m_angle)
{
m_angle = start;
}
void SafeAngleInterpolation::ResetDestParams(double dstAngle, double speed)
{
Reset(GetCurrentValue(), dstAngle, speed);
}
double SafeAngleInterpolation::GetCurrentValue() const
{
return m_angle;
}
}

12
anim/angle_interpolation.hpp
View file

@ -41,16 +41,10 @@ namespace anim
{
typedef AngleInterpolation TBase;
public:
SafeAngleInterpolation(double start, double end, double speed)
: TBase(start, end, speed, m_angle)
{
m_angle = start;
}
SafeAngleInterpolation(double start, double end, double speed);
double GetCurrentValue() const
{
return m_angle;
}
void ResetDestParams(double dstAngle, double speed);
double GetCurrentValue() const;
private:
double m_angle;

18
anim/segment_interpolation.cpp
View file

@ -56,4 +56,22 @@ namespace anim
m_outPt = m_endPt;
Task::OnEnd(ts);
}
SafeSegmentInterpolation::SafeSegmentInterpolation(m2::PointD const & startPt, m2::PointD const & endPt,
double interval)
: TBase(startPt, endPt, interval, m_pt)
{
m_pt = startPt;
}
void SafeSegmentInterpolation::ResetDestParams(m2::PointD const & dstPt, double interval)
{
Reset(GetCurrentValue(), dstPt, interval);
}
const m2::PointD &SafeSegmentInterpolation::GetCurrentValue() const
{
return m_pt;
}
}

12
anim/segment_interpolation.hpp
View file

@ -35,16 +35,10 @@ namespace anim
public:
SafeSegmentInterpolation(m2::PointD const & startPt,
m2::PointD const & endPt,
double interval)
: TBase(startPt, endPt, interval, m_pt)
{
m_pt = startPt;
}
double interval);
m2::PointD const & GetCurrentValue() const
{
return m_pt;
}
void ResetDestParams(m2::PointD const & dstPt, double interval);
m2::PointD const & GetCurrentValue() const;
private:
m2::PointD m_pt;

57
map/location_state.cpp
View file

@ -28,9 +28,6 @@ namespace
{
static const int POSITION_Y_OFFSET = 120;
#ifdef USE_FRAME_COUNT
static const int ANIM_THRESHOLD = 4;
#endif
uint16_t IncludeModeBit(uint16_t mode, uint16_t bit)
{
@ -63,11 +60,6 @@ public:
RotateAndFollowAnim(Framework * fw, m2::PointD const & srcPos,
double srcAngle, m2::PointD const & srcPixelBinding)
: m_fw(fw)
#ifdef USE_FRAME_COUNT
, m_anglePrevState(EReady)
, m_posPrevState(EReady)
, m_freeFrameCount(0)
#endif
{
m_angleAnim.reset(new anim::SafeAngleInterpolation(srcAngle, srcAngle, 0.0));
m_posAnim.reset(new anim::SafeSegmentInterpolation(srcPos, srcPos, 0.0));
@ -82,14 +74,14 @@ public:
double const posSpeed = m_fw->GetNavigator().ComputeMoveSpeed(m_posAnim->GetCurrentValue(), dstPos);
double const angleSpeed = m_fw->GetAnimator().GetRotationSpeed();
m_angleAnim->Reset(m_angleAnim->GetCurrentValue(), dstAngle, angleSpeed);
m_posAnim->Reset(m_posAnim->GetCurrentValue(), dstPos, posSpeed);
m_angleAnim->ResetDestParams(dstAngle, angleSpeed);
m_posAnim->ResetDestParams(dstPos, posSpeed);
}
void SetDestinationPxBinding(m2::PointD const & pxBinding)
{
ASSERT(m_pxBindingAnim != nullptr, ());
m_pxBindingAnim->Reset(m_pxBindingAnim->GetCurrentValue(), InvertPxBinding(pxBinding), 0.5);
m_pxBindingAnim->ResetDestParams(InvertPxBinding(pxBinding), 0.5);
}
virtual void OnStep(double ts)
@ -105,10 +97,6 @@ public:
if (updateViewPort)
UpdateViewport();
#ifdef USE_FRAME_COUNT
AnimStateChanged();
#endif
}
virtual bool IsVisual() const
@ -117,11 +105,6 @@ public:
ASSERT(m_angleAnim != nullptr, ());
ASSERT(m_pxBindingAnim != nullptr, ());
#ifdef USE_FRAME_COUNT
if (m_freeFrameCount < ANIM_THRESHOLD)
return true;
#endif
return m_posAnim->IsRunning() ||
m_angleAnim->IsRunning() ||
m_pxBindingAnim->IsRunning();
@ -164,27 +147,6 @@ private:
m_fw->Invalidate();
}
#ifdef USE_FRAME_COUNT
void AnimStateChanged()
{
anim::Task::EState const angleState = m_angleAnim->State();
anim::Task::EState const posState = m_posAnim->State();
if ((posState == anim::Task::EEnded && angleState == anim::Task::EEnded) &&
(posState != m_posPrevState || angleState != m_anglePrevState))
{
++m_freeFrameCount;
}
else if ((angleState == anim::Task::EInProgress || posState == anim::Task::EInProgress) &&
m_freeFrameCount > ANIM_THRESHOLD)
{
m_freeFrameCount = 0;
}
m_posPrevState = posState;
m_anglePrevState = angleState;
}
#endif
bool OnStep(anim::Task * task, double ts)
{
if (task->IsReady())
@ -193,17 +155,16 @@ private:
task->OnStart(ts);
}
bool isDoSome = false;
if (task->IsRunning())
{
task->OnStep(ts);
isDoSome = true;
return true;
}
return isDoSome;
return false;
}
m2::PointD InvertPxBinding(m2::PointD const & px)
m2::PointD InvertPxBinding(m2::PointD const & px) const
{
m2::RectD const & pixelRect = m_fw->GetNavigator().Screen().PixelRect();
return m2::PointD(px.x, pixelRect.maxY() - px.y);
@ -215,12 +176,6 @@ private:
unique_ptr<anim::SafeAngleInterpolation> m_angleAnim;
unique_ptr<anim::SafeSegmentInterpolation> m_posAnim;
unique_ptr<anim::SafeSegmentInterpolation> m_pxBindingAnim;
#ifdef USE_FRAME_COUNT
anim::Task::EState m_anglePrevState;
anim::Task::EState m_posPrevState;
int m_freeFrameCount;
#endif
};
}