Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mapsme/omim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorr.kuznetsov <r.kuznetsov@corp.mail.ru>2016-05-05 15:29:15 +0300
committerVladimir Byko-Ianko <v.bykoianko@corp.mail.ru>2016-05-12 10:19:18 +0300
commit8b5964ab8e2caea4e26ea34f10a6c48bd4e2768e (patch)
treef89584d9b27a1a6c9b747e02f205e350eb3a3ce2 /drape_frontend/animation_system.hpp
parent0c7c5c75411f527ecff0736e7327a85f8316ecfe (diff)
Fixed turning on/off perspective animation
Diffstat (limited to 'drape_frontend/animation_system.hpp')
-rw-r--r--drape_frontend/animation_system.hpp16
1 files changed, 9 insertions, 7 deletions
diff --git a/drape_frontend/animation_system.hpp b/drape_frontend/animation_system.hpp
index 3503bdd3ca..f1afc959ac 100644
--- a/drape_frontend/animation_system.hpp
+++ b/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>;