new resources for balloon

2 files changed, 173 insertions, 10 deletions

diff --git a/map/bookmark_balloon.cpp b/map/bookmark_balloon.cpp
index 41973c19df..62db7d2963 100644
--- a/map/bookmark_balloon.cpp
+++ b/map/bookmark_balloon.cpp
@@ -1,8 +1,88 @@
 #include "bookmark_balloon.hpp"
 #include "framework.hpp"
 
+#include "../geometry/transformations.hpp"
+
+#include "../anim/controller.hpp"
+#include "../anim/value_interpolation.hpp"
+
 #define POPUP_PADDING 23
 
+class BookmarkBalloon::BalloonAnimTask : public anim::Task
+{
+public:
+  BalloonAnimTask(double startScale, double endScale,
+                  double startOffset, double endOffset,
+                  double interval)
+    : m_scaleAnim(startScale, endScale, interval, m_scale),
+      m_offsetAnim(startOffset, endOffset, interval, m_offset)
+  {
+    m_scale = startScale;
+    m_offset = startOffset;
+  }
+
+  void OnStart(double ts)
+  {
+    m_scaleAnim.Start();
+    m_scaleAnim.OnStart(ts);
+
+    m_offsetAnim.Start();
+    m_offsetAnim.OnStart(ts);
+    anim::Task::OnStart(ts);
+  }
+
+  void OnStep(double ts)
+  {
+    m_scaleAnim.OnStep(ts);
+    m_offsetAnim.OnStep(ts);
+    UpdateState();
+    anim::Task::OnStep(ts);
+  }
+
+  void OnEnd(double ts)
+  {
+    m_scaleAnim.OnEnd(ts);
+    m_offsetAnim.OnEnd(ts);
+    UpdateState();
+    anim::Task::OnEnd(ts);
+  }
+
+  void OnCancel(double ts)
+  {
+    m_scaleAnim.OnCancel(ts);
+    m_offsetAnim.OnCancel(ts);
+    UpdateState();
+    anim::Task::OnCancel(ts);
+  }
+
+  double GetScale() const
+  {
+    return m_scale;
+  }
+
+  double GetOffset() const
+  {
+    return m_offset;
+  }
+
+  bool IsVisual() const
+  {
+    return true;
+  }
+
+private:
+  void UpdateState()
+  {
+    SetState(m_scaleAnim.State());
+  }
+
+private:
+  anim::ValueInterpolation m_scaleAnim;
+  anim::ValueInterpolation m_offsetAnim;
+  double m_scale;
+  double m_offset;
+};
+
 BookmarkBalloon::BookmarkBalloon(Params const & p)
  : Balloon(p),
    m_framework(p.m_framework)
@@ -17,9 +97,72 @@ void BookmarkBalloon::update()
     m2::PointD newPivot(m_framework->GtoP(m_glbPivot));
     newPivot.y -= POPUP_PADDING * visualScale();
     setPivot(newPivot);
+
+    if (m_currentAnimTask)
+    {
+      m_balloonScale = m_currentAnimTask->GetScale();
+      m_textImageOffsetH = m_currentAnimTask->GetOffset();
+    }
   }
 }
 
+void BookmarkBalloon::createTask(double startScale, double endScale, double startOffset, double endOffset, double interval, int index)
+{
+  m_currentAnimTask.reset(new BalloonAnimTask(startScale, endScale, startOffset, endOffset, interval));
+  m_currentAnimTask->AddCallback(anim::Task::EEnded, bind(&BookmarkBalloon::animTaskEnded, this, index));
+  m_currentAnimTask->AddCallback(anim::Task::ECancelled, bind(&BookmarkBalloon::cancelTask, this));
+  m_framework->GetAnimController()->AddTask(m_currentAnimTask);
+}
+
+void BookmarkBalloon::animTaskEnded(int animIndex)
+{
+  bool isVisibleTextAndImage = true;
+  switch(animIndex)
+  {
+  case 0:
+    createTask(0.1, 1.05, 0.0, 0.0, 0.1, 1);
+    isVisibleTextAndImage = false;
+    break;
+  case 1:
+    createTask(1.05, 0.95, -2.0, 5.0, 0.05, 2);
+    break;
+  case 2:
+    createTask(0.95, 1.0, 5.0, 0.0, 0.02, 3);
+    break;
+  }
+
+  m_mainTextView->setIsVisible(isVisibleTextAndImage);
+  m_imageView->setIsVisible(isVisibleTextAndImage);
+}
+
+void BookmarkBalloon::cancelTask()
+{
+  if (m_currentAnimTask)
+  {
+    m_currentAnimTask->Lock();
+    if (!m_currentAnimTask->IsEnded() &&
+        !m_currentAnimTask->IsCancelled())
+    {
+      m_currentAnimTask->Cancel();
+    }
+
+    m_currentAnimTask->Unlock();
+    m_currentAnimTask.reset();
+  }
+}
+
+void BookmarkBalloon::showAnimated()
+{
+  animTaskEnded(0);
+  setIsVisible(true);
+}
+
+void BookmarkBalloon::hide()
+{
+  cancelTask();
+  setIsVisible(false);
+}
+
 void BookmarkBalloon::setGlbPivot(m2::PointD const & pivot)
 {
   m_glbPivot = pivot;
@@ -30,22 +173,29 @@ m2::PointD const BookmarkBalloon::glbPivot()
   return m_glbPivot;
 }
 
-void BookmarkBalloon::setBookmarkName(string const & name)
+void BookmarkBalloon::setBookmarkCaption(string const & name,
+                                         string const & type)
 {
   m_bmkName = name;
+  m_bmkType = type;
 
-  strings::UniString s = strings::MakeUniString(name);
+  /*strings::UniString uniName = strings::MakeUniString(name);
+  strings::UniString uniType = strings::MakeUniString(type);
 
   // 15 is going from straight_text_element.cpp, visSplit.
-  if (s.size() > 15)
+  if (uniName.size() > 15)
   {
-    s.resize(18);
-    s[17] = s[16] = s[15] = '.';
-
-    setText(strings::ToUtf8(s));
+    uniName.resize(18);
+    uniName[17] = uniName[16] = uniName[15] = '.';
   }
-  else
-    setText(name);
+
+  if (uniType.size() > 15)
+  {
+    uniType.resize(18);
+    uniType[17] = uniType[16] = uniType[15] = '.';
+  }*/
+
+  setText(name, type);
 }
 
 string const & BookmarkBalloon::bookmarkName()
diff --git a/map/bookmark_balloon.hpp b/map/bookmark_balloon.hpp
index 16a1aa82e0..2a08a9c19d 100644
--- a/map/bookmark_balloon.hpp
+++ b/map/bookmark_balloon.hpp
@@ -10,9 +10,19 @@ class BookmarkBalloon : public gui::Balloon
 {
 private:
 
+  class BalloonAnimTask;
+  shared_ptr<BalloonAnimTask> m_currentAnimTask;
+
   m2::PointD m_glbPivot;
   Framework const * m_framework;
   string m_bmkName;
+  string m_bmkType;
+
+  void createTask(double startScale, double endScale,
+                  double startOffset, double endOffset,
+                  double interval, int index);
+  void animTaskEnded(int animIndex);
+  void cancelTask();
 
   void update();
 
@@ -27,9 +37,12 @@ public:
 
   BookmarkBalloon(Params const & p);
 
+  void showAnimated();
+  void hide();
+
   void setGlbPivot(m2::PointD const & pivot);
   m2::PointD const glbPivot();
 
-  void setBookmarkName(string const & name);
+  void setBookmarkCaption(string const & name, string const & type);
   string const & bookmarkName();
 };