Perspective animation removed.

2 files changed, 6 insertions, 8 deletions

diff --git a/geometry/screenbase.cpp b/geometry/screenbase.cpp
index f28eaf412c..1c4503ac5c 100644
--- a/geometry/screenbase.cpp
+++ b/geometry/screenbase.cpp
@@ -28,7 +28,7 @@ ScreenBase::ScreenBase() :
     m_3dMaxAngleX(0.0),
     m_3dScale(1.0),
     m_isPerspective(false),
-    m_isAutoPerspective(true),
+    m_isAutoPerspective(false),
     m_GlobalRect(m_Org, ang::AngleD(0), m2::RectD(-320, -240, 320, 240)),
     m_ClipRect(m2::RectD(0, 0, 640, 480))
 {
@@ -117,13 +117,10 @@ double ScreenBase::CalculatePerspectiveAngle(double scale) const
   return kMaxPerspectiveAngle2 * 0.99;
 }
 
-void ScreenBase::UpdatePerspectiveParameters()
+void ScreenBase::SetAutoPerspective(bool isAutoPerspective)
 {
-  double const angle = CalculatePerspectiveAngle(m_Scale);
-  if (angle > 0.0)
-    ApplyPerspective(angle, angle, kPerspectiveAngleFOV);
-  else if (m_isPerspective)
-    ResetPerspective();
+  m_isAutoPerspective = isAutoPerspective;
+  UpdateDependentParameters();
 }
 
 void ScreenBase::SetFromRects(m2::AnyRectD const & glbRect, m2::RectD const & pxRect)
diff --git a/geometry/screenbase.hpp b/geometry/screenbase.hpp
index 1fc667bbf9..d3fbc6fc99 100644
--- a/geometry/screenbase.hpp
+++ b/geometry/screenbase.hpp
@@ -132,7 +132,6 @@ public:
   m2::AnyRectD const & GlobalRect() const { return m_GlobalRect; }
   m2::RectD const & ClipRect() const { return m_ClipRect; }
 
-  void UpdatePerspectiveParameters();
   void ApplyPerspective(double currentRotationAngle, double maxRotationAngle, double angleFOV);
   void ResetPerspective();
 
@@ -146,6 +145,8 @@ public:
 
   Matrix3dT const & Pto3dMatrix() const { return m_Pto3d; }
   bool isPerspective() const { return m_isPerspective; }
+  bool isAutoPerspective() const { return m_isAutoPerspective; }
+  void SetAutoPerspective(bool isAutoPerspective);
 
   bool IsReverseProjection3d(m2::PointD const & pt) const;