Fixed turning on/off perspective animation

drape_frontend/animation_system.cpp

@@ -1034,7 +1034,8 @@ void AnimationSystem::PushAnimation(drape_ptr<Animation> animation)
   m_animationChain.emplace_back(move(list));
 }
 
-void AnimationSystem::FinishAnimations(Animation::Type type, bool rewind)
+void AnimationSystem::FinishAnimations(function<bool(drape_ptr<Animation> const &)> const & predicate,
+                                       bool rewind, bool finishAll)
 {
   if (m_animationChain.empty())
     return;
@@ -1043,7 +1044,7 @@ void AnimationSystem::FinishAnimations(Animation::Type type, bool rewind)
   for (auto it = frontList.begin(); it != frontList.end();)
   {
     auto & anim = *it;
-    if (anim->GetType() == type)
+    if (predicate(anim))
     {
       if (rewind)
         anim->Finish();
@@ -1055,33 +1056,35 @@ void AnimationSystem::FinishAnimations(Animation::Type type, bool rewind)
       ++it;
     }
   }
+
+  if (finishAll)
+  {
+    for (auto & lst : m_animationChain)
+    {
+      for (auto it = lst.begin(); it != lst.end();)
+      {
+        if (predicate(*it))
+          it = lst.erase(it);
+        else
+          ++it;
+      }
+    }
+  }
+
   if (frontList.empty())
     StartNextAnimations();
 }
 
-void AnimationSystem::FinishObjectAnimations(Animation::TObject object, bool rewind)
+void AnimationSystem::FinishAnimations(Animation::Type type, bool rewind, bool finishAll)
 {
-  if (m_animationChain.empty())
-    return;
+  FinishAnimations([&type](drape_ptr<Animation> const & anim) { return anim->GetType() == type; },
+                   rewind, finishAll);
+}
 
-  TAnimationList & frontList = m_animationChain.front();
-  for (auto it = frontList.begin(); it != frontList.end();)
-  {
-    auto & anim = *it;
-    if (anim->HasObject(object))
-    {
-      if (rewind)
-        anim->Finish();
-      SaveAnimationResult(*anim);
-      it = frontList.erase(it);
-    }
-    else
-    {
-      ++it;
-    }
-  }
-  if (frontList.empty())
-    StartNextAnimations();
+void AnimationSystem::FinishObjectAnimations(Animation::TObject object, bool rewind, bool finishAll)
+{
+  FinishAnimations([&object](drape_ptr<Animation> const & anim) { return anim->HasObject(object); },
+                   rewind, finishAll);
 }
 
 void AnimationSystem::Advance(double elapsedSeconds)

drape_frontend/animation_system.hpp

@@ -568,21 +568,23 @@ public:
   void CombineAnimation(drape_ptr<Animation> animation);
   void PushAnimation(drape_ptr<Animation> animation);
 
-  void FinishAnimations(Animation::Type type, bool rewind);
-  void FinishObjectAnimations(Animation::TObject object, bool rewind);
+  void FinishAnimations(Animation::Type type, bool rewind, bool finishAll);
+  void FinishObjectAnimations(Animation::TObject object, bool rewind, bool finishAll);
 
   void Advance(double elapsedSeconds);
 
   ScreenBase const & GetLastScreen() { return m_lastScreen; }
   void SaveAnimationResult(Animation const & animation);
 
-private:
-  bool GetProperty(Animation::TObject object, Animation::TProperty property, Animation::PropertyValue & value) const;
-  void StartNextAnimations();
-
+private:  
   AnimationSystem();
 
-private:
+  bool GetProperty(Animation::TObject object, Animation::TProperty property,
+                   Animation::PropertyValue & value) const;
+  void StartNextAnimations();
+  void FinishAnimations(function<bool(drape_ptr<Animation> const &)> const & predicate,
+                        bool rewind, bool finishAll);
+
   using TAnimationList = list<drape_ptr<Animation>>;
   using TAnimationChain = deque<TAnimationList>;
   using TPropertyCache = map<pair<Animation::TObject, Animation::TProperty>, Animation::PropertyValue>;

drape_frontend/user_event_stream.cpp

@@ -252,8 +252,7 @@ ScreenBase const & UserEventStream::ProcessEvents(bool & modelViewChange, bool &
       m_discardedFOV = m_discardedAngle = 0.0;
       break;
     case UserEvent::EVENT_DISABLE_PERSPECTIVE:
-      if (m_navigator.Screen().isPerspective())
-        SetDisable3dModeAnimation();
+      SetDisable3dModeAnimation();
       m_discardedFOV = m_discardedAngle = 0.0;
       break;
     case UserEvent::EVENT_SWITCH_VIEW_MODE:
@@ -587,14 +586,16 @@ bool UserEventStream::SetFollowAndRotate(m2::PointD const & userPos, m2::PointD
 
 bool UserEventStream::FilterEventWhile3dAnimation(UserEvent::EEventType type) const
 {
-  return type != UserEvent::EVENT_RESIZE && type != UserEvent::EVENT_SET_RECT;
+  return type != UserEvent::EVENT_RESIZE && type != UserEvent::EVENT_SET_RECT &&
+         type != UserEvent::EVENT_ENABLE_PERSPECTIVE &&
+         type != UserEvent::EVENT_DISABLE_PERSPECTIVE &&
+         type != UserEvent::EVENT_SWITCH_VIEW_MODE;
 }
 
 void UserEventStream::SetEnable3dMode(double maxRotationAngle, double angleFOV,
                                       bool isAnim, bool immediatelyStart)
 {
-  ResetCurrentAnimations(Animation::MapLinear);
-  ResetCurrentAnimations(Animation::MapScale);
+  ResetAnimationsBeforeSwitch3D();
 
   double const startAngle = isAnim ? 0.0 : maxRotationAngle;
   double const endAngle = maxRotationAngle;
@@ -616,8 +617,7 @@ void UserEventStream::SetEnable3dMode(double maxRotationAngle, double angleFOV,
 
 void UserEventStream::SetDisable3dModeAnimation()
 {
-  ResetCurrentAnimations(Animation::MapLinear);
-  ResetCurrentAnimations(Animation::MapScale);
+  ResetAnimationsBeforeSwitch3D();
 
   double const startAngle = m_navigator.Screen().GetRotationAngle();
   double const endAngle = 0.0;
@@ -634,10 +634,10 @@ void UserEventStream::SetDisable3dModeAnimation()
   m_animationSystem.CombineAnimation(move(anim));
 }
 
-void UserEventStream::ResetCurrentAnimations(Animation::Type animType)
+void UserEventStream::ResetAnimations(Animation::Type animType, bool finishAll)
 {
   bool const hasAnimations = m_animationSystem.HasAnimations();
-  m_animationSystem.FinishAnimations(animType, true /* rewind */);
+  m_animationSystem.FinishAnimations(animType, true /* rewind */, finishAll);
   if (hasAnimations)
   {
     m2::AnyRectD rect;
@@ -649,7 +649,7 @@ void UserEventStream::ResetCurrentAnimations(Animation::Type animType)
 void UserEventStream::ResetMapPlaneAnimations()
 {
   bool const hasAnimations = m_animationSystem.HasAnimations();
-  m_animationSystem.FinishObjectAnimations(Animation::MapPlane, false /* finishAll */);
+  m_animationSystem.FinishObjectAnimations(Animation::MapPlane, false /* rewind */, false /* finishAll */);
   if (hasAnimations)
   {
     m2::AnyRectD rect;
@@ -658,6 +658,13 @@ void UserEventStream::ResetMapPlaneAnimations()
   }
 }
 
+void UserEventStream::ResetAnimationsBeforeSwitch3D()
+{
+  ResetAnimations(Animation::MapLinear);
+  ResetAnimations(Animation::MapScale);
+  ResetAnimations(Animation::MapPerspective, true /* finishAll */);
+}
+
 m2::AnyRectD UserEventStream::GetCurrentRect() const
 {
   return m_navigator.Screen().GlobalRect();
@@ -705,7 +712,7 @@ bool UserEventStream::TouchDown(array<Touch, 2> const & touches)
   bool isMapTouch = true;
   
   // Interrupt kinetic scroll on touch down.
-  m_animationSystem.FinishAnimations(Animation::KineticScroll, false /* rewind */);
+  m_animationSystem.FinishAnimations(Animation::KineticScroll, false /* rewind */, true /* finishAll */);
 
   // Interrupt kinetic scroll on touch down.
   m_animationSystem.FinishAnimations(Animation::KineticScroll, false /* rewind */);

drape_frontend/user_event_stream.hpp

@@ -352,8 +352,9 @@ private:
   void CancelFilter(Touch const & t);
 
   void ApplyAnimations(bool & modelViewChanged, bool & viewportChanged);
-  void ResetCurrentAnimations(Animation::Type animType);
+  void ResetAnimations(Animation::Type animType, bool finishAll = false);
   void ResetMapPlaneAnimations();
+  void ResetAnimationsBeforeSwitch3D();
 
   list<UserEvent> m_events;
   mutable mutex m_lock;