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

Fixed follow-and-rotate animation jittering

Browse source
This commit is contained in:
r.kuznetsov 2016-08-05 15:09:59 -07:00 • committed by Vladimir Byko-Ianko
parent ae0185f13e
commit b9d212427c
4 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drape_frontend/animation/animation.hpp
View file

@ -76,6 +76,7 @@ public:
: m_couldBeInterrupted(couldBeInterrupted)
, m_couldBeBlended(couldBeBlended)
, m_interruptedOnCombine(false)
, m_couldBeRewinded(true)
{}
virtual void OnStart() { if (m_onStartAction != nullptr) m_onStartAction(this); }
@ -114,6 +115,9 @@ public:
void SetCouldBeInterrupted(bool enable) { m_couldBeInterrupted = enable; }
void SetCouldBeBlended(bool enable) { m_couldBeBlended = enable; }
void SetCouldBeRewinded(bool enable) { m_couldBeRewinded = enable; }
bool CouldBeRewinded() const { return m_couldBeRewinded; }
protected:
TAction m_onStartAction;
@ -126,6 +130,8 @@ protected:
bool m_couldBeBlended;
// Animation must be interrupted in case of combining another animation.
bool m_interruptedOnCombine;
// Animation could be rewinded in case of finishing.
bool m_couldBeRewinded;
};
} // namespace df

4
drape_frontend/animation/follow_animation.cpp
View file

@ -41,6 +41,10 @@ MapFollowAnimation::MapFollowAnimation(ScreenBase const & screen,
m_properties.insert(Animation::Angle);
if (m_offsetInterpolator.IsActive() || m_scaleInterpolator.IsActive() || m_angleInterpolator.IsActive())
m_properties.insert(Animation::Position);
// If MapFollowAnimation affects only angles, disable rewinding.
SetCouldBeRewinded(!m_angleInterpolator.IsActive() || m_scaleInterpolator.IsActive() ||
m_offsetInterpolator.IsActive());
}
Animation::TObjectProperties const & MapFollowAnimation::GetProperties(TObject object) const

8
drape_frontend/animation_system.cpp
View file

@ -270,7 +270,8 @@ void AnimationSystem::FinishAnimations(function<bool(shared_ptr<Animation> const
if (predicate(anim))
{
#ifdef DEBUG_ANIMATIONS
LOG(LINFO, ("Finish animation", anim->GetType(), ", rewind:", rewind));
LOG(LINFO, ("Finish animation", anim->GetType(), ", rewind:", rewind,
", couldBeRewinded:", anim->CouldBeRewinded()));
changed = true;
#endif
finishAnimations.splice(finishAnimations.end(), frontList, it++);
@ -291,7 +292,8 @@ void AnimationSystem::FinishAnimations(function<bool(shared_ptr<Animation> const
if (predicate(*it))
{
#ifdef DEBUG_ANIMATIONS
LOG(LINFO, ("Finish animation", (*it)->GetType(), ", rewind:", rewind));
LOG(LINFO, ("Finish animation", (*it)->GetType(), ", rewind:", rewind,
", couldBeRewinded:", anim->CouldBeRewinded()));
changed = true;
#endif
it = lst.erase(it);
@ -306,7 +308,7 @@ void AnimationSystem::FinishAnimations(function<bool(shared_ptr<Animation> const
for (auto & anim : finishAnimations)
{
if (rewind)
if (rewind && anim->CouldBeRewinded())
anim->Finish();
SaveAnimationResult(*anim);
}

2
drape_frontend/user_event_stream.cpp
View file

@ -390,7 +390,9 @@ bool UserEventStream::InterruptFollowAnimations(bool force)
ResetAnimations(Animation::Arrow);
}
else
{
return false;
}
}
return true;
}