[drape] rebase fixes

1 files changed, 0 insertions, 122 deletions

diff --git a/anim/anyrect_interpolation.cpp b/anim/anyrect_interpolation.cpp
deleted file mode 100644
index 19d3fbe3cb..0000000000
--- a/anim/anyrect_interpolation.cpp
+++ /dev/null
@@ -1,122 +0,0 @@
-#include "anim/anyrect_interpolation.hpp"
-
-#include "base/logging.hpp"
-
-namespace anim
-{
-  AnyRectInterpolation::AnyRectInterpolation(m2::AnyRectD const & startRect,
-                                             m2::AnyRectD const & endRect,
-                                             double rotationSpeed,
-                                             m2::AnyRectD & outRect)
-    : m_interval(max(0.5, rotationSpeed * fabs(ang::GetShortestDistance(startRect.Angle().val(),
-                                                                        endRect.Angle().val())) / (2 * math::pi))),
-      m_angleInt(startRect.Angle().val(),
-                 endRect.Angle().val(),
-                 rotationSpeed,
-                 m_curAngle),
-      m_segmentInt(startRect.GlobalCenter(),
-                   endRect.GlobalCenter(),
-                   m_interval,
-                   m_curCenter),
-      m_sizeXInt(startRect.GetLocalRect().SizeX(),
-                 endRect.GetLocalRect().SizeX(),
-                 m_interval,
-                 m_curSizeX),
-      m_sizeYInt(startRect.GetLocalRect().SizeY(),
-                 endRect.GetLocalRect().SizeY(),
-                 m_interval,
-                 m_curSizeY),
-      m_startRect(startRect),
-      m_endRect(endRect),
-      m_outRect(outRect)
-  {
-  }
-
-  void AnyRectInterpolation::OnStart(double ts)
-  {
-    m_startTime = ts;
-
-    m_angleInt.OnStart(ts);
-    m_angleInt.Start();
-
-    m_segmentInt.OnStart(ts);
-    m_segmentInt.Start();
-
-    m_sizeXInt.OnStart(ts);
-    m_sizeXInt.Start();
-
-    m_sizeYInt.OnStart(ts);
-    m_sizeYInt.Start();
-
-    m_outRect = m_startRect;
-
-    anim::Task::OnStart(ts);
-  }
-
-  void AnyRectInterpolation::OnStep(double ts)
-  {
-    if (!IsRunning())
-      return;
-
-    if (ts - m_startTime >= m_interval)
-    {
-      End();
-      return;
-    }
-
-    if (m_angleInt.IsRunning())
-      m_angleInt.OnStep(ts);
-
-    if (m_segmentInt.IsRunning())
-      m_segmentInt.OnStep(ts);
-
-    if (m_sizeXInt.IsRunning())
-      m_sizeXInt.OnStep(ts);
-
-    if (m_sizeYInt.IsRunning())
-      m_sizeYInt.OnStep(ts);
-
-    m_outRect = m2::AnyRectD(m_curCenter,
-                             m_curAngle,
-                             m2::RectD(-m_curSizeX / 2, -m_curSizeY / 2,
-                                       m_curSizeX / 2, m_curSizeY / 2));
-
-    anim::Task::OnStep(ts);
-  }
-
-  void AnyRectInterpolation::OnEnd(double ts)
-  {
-    if (m_angleInt.IsRunning())
-      m_angleInt.OnEnd(ts);
-
-    if (m_segmentInt.IsRunning())
-      m_segmentInt.OnEnd(ts);
-
-    if (m_sizeXInt.IsRunning())
-      m_sizeXInt.OnEnd(ts);
-
-    if (m_sizeYInt.IsRunning())
-      m_sizeYInt.OnEnd(ts);
-
-    m_outRect = m_endRect;
-
-    anim::Task::OnEnd(ts);
-  }
-
-  void AnyRectInterpolation::OnCancel(double ts)
-  {
-    if (m_angleInt.IsRunning())
-      m_angleInt.Cancel();
-
-    if (m_segmentInt.IsRunning())
-      m_segmentInt.Cancel();
-
-    if (m_sizeXInt.IsRunning())
-      m_sizeXInt.Cancel();
-
-    if (m_sizeYInt.IsRunning())
-      m_sizeYInt.Cancel();
-
-    anim::Task::OnCancel(ts);
-  }
-}