From c08a25cd6a99a73fe772493f5a97e3021d5676ae Mon Sep 17 00:00:00 2001
From: rachytski <siarhei.rachytski@gmail.com>
Date: Sat, 8 Oct 2011 18:55:50 +0300
Subject: [PATCH] added correct transformation of PathTextElements during
 rendering with non-identity Matrix.

---
 geometry/angles.hpp          | 28 ++++++++++++++++++++++++++
 platform/platform_ios.mm     |  4 ++--
 yg/path_text_element.cpp     |  4 ++--
 yg/straight_text_element.cpp |  4 ++--
 yg/text_element.cpp          | 38 +++++++++++++++++++++++++++++++++---
 yg/text_element.hpp          |  1 +
 6 files changed, 70 insertions(+), 9 deletions(-)

diff --git a/geometry/angles.hpp b/geometry/angles.hpp
index 8a53474d5f..ba0ed7bcd3 100644
--- a/geometry/angles.hpp
+++ b/geometry/angles.hpp
@@ -3,6 +3,7 @@
 #include <cmath>
 #include "point2d.hpp"
 
+#include "../base/matrix.hpp"
 #include "../base/start_mem_debug.hpp"
 
 namespace ang
@@ -36,11 +37,38 @@ namespace ang
     {
       return m_cos;
     }
+
+    Angle<T> const & operator*=(math::Matrix<T, 3, 3> const & m)
+    {
+      m2::Point<T> pt0(0, 0);
+      m2::Point<T> pt1(m_cos, m_sin);
+
+      pt1 *= m;
+      pt0 *= m;
+
+      m_val = atan2(pt1.y - pt0.y, pt1.x - pt0.x);
+      m_sin = sin(m_val);
+      m_cos = cos(m_val);
+
+      return this;
+    }
   };
 
   typedef Angle<double> AngleD;
   typedef Angle<float> AngleF;
 
+  template <typename T>
+  Angle<T> const operator*(Angle<T> const & a, math::Matrix<T, 3, 3> const & m)
+  {
+    m2::Point<T> pt0(0, 0);
+    m2::Point<T> pt1(a.cos(), a.sin());
+
+    pt1 *= m;
+    pt0 *= m;
+
+    return Angle<T>(atan2(pt1.y - pt0.y, pt1.x - pt0.x));
+  }
+
   /// Returns an angle of vector [p1, p2] from x-axis directed to y-axis.
   /// Angle is in range [-pi, pi].
   template <typename T>
diff --git a/platform/platform_ios.mm b/platform/platform_ios.mm
index a99ad7603d..c951332022 100644
--- a/platform/platform_ios.mm
+++ b/platform/platform_ios.mm
@@ -187,12 +187,12 @@ int Platform::ScaleEtalonSize() const
 
 int Platform::MaxTilesCount() const
 {
-  return 120;
+  return 60;
 }
 
 int Platform::TileSize() const
 {
-  return 256;
+  return 512;
 }
 
 string Platform::DeviceName() const
diff --git a/yg/path_text_element.cpp b/yg/path_text_element.cpp
index 068ee84ff5..b4f8ed6161 100644
--- a/yg/path_text_element.cpp
+++ b/yg/path_text_element.cpp
@@ -67,11 +67,11 @@ namespace yg
       if (!isVisible())
         return;
 
-      drawTextImpl(m_glyphLayout, screen, m, desc, yg::maxDepth - 1);
+      drawTextImpl(m_glyphLayout, screen, m, false, desc, yg::maxDepth - 1);
       desc.m_isMasked = false;
     }
 
-    drawTextImpl(m_glyphLayout, screen, m, desc, yg::maxDepth);
+    drawTextImpl(m_glyphLayout, screen, m, false, desc, yg::maxDepth);
   }
 
   void PathTextElement::offset(m2::PointD const & offs)
diff --git a/yg/straight_text_element.cpp b/yg/straight_text_element.cpp
index 76bd3d52ae..99a5c239bf 100644
--- a/yg/straight_text_element.cpp
+++ b/yg/straight_text_element.cpp
@@ -203,13 +203,13 @@ namespace yg
     if (m_fontDesc.m_isMasked)
     {
       for (unsigned i = 0; i < m_glyphLayouts.size(); ++i)
-        drawTextImpl(m_glyphLayouts[i], screen, m, m_fontDesc, yg::maxDepth - 1);
+        drawTextImpl(m_glyphLayouts[i], screen, m, true, m_fontDesc, yg::maxDepth - 1);
 
       desc.m_isMasked = false;
     }
 
     for (unsigned i = 0; i < m_glyphLayouts.size(); ++i)
-      drawTextImpl(m_glyphLayouts[i], screen, m, desc, yg::maxDepth);
+      drawTextImpl(m_glyphLayouts[i], screen, m, true, desc, yg::maxDepth);
   }
 
   void StraightTextElement::offset(m2::PointD const & offs)
diff --git a/yg/text_element.cpp b/yg/text_element.cpp
index 3a04a63282..f67f4fe467 100644
--- a/yg/text_element.cpp
+++ b/yg/text_element.cpp
@@ -44,9 +44,27 @@ namespace yg
     return m_logText != m_visText;
   }
 
-  void TextElement::drawTextImpl(GlyphLayout const & layout, gl::OverlayRenderer * screen, math::Matrix<double, 3, 3> const & m, FontDesc const & fontDesc, double depth) const
+  void TextElement::drawTextImpl(GlyphLayout const & layout,
+                                 gl::OverlayRenderer * screen,
+                                 math::Matrix<double, 3, 3> const & m,
+                                 bool doTransformPivotOnly,
+                                 FontDesc const & fontDesc,
+                                 double depth) const
   {
-    m2::PointD pv = layout.pivot() * m;
+    m2::PointD pv = layout.pivot();
+    double deltaA = 0;
+
+    if (doTransformPivotOnly)
+      pv *= m;
+    else
+    {
+      double k = (sqrt((m(0, 0) * m(0, 0) + m(0, 1) * m(0, 1) + m(1, 0) * m(1, 0) + m(1, 1) * m(1, 1)) / 2));
+
+      if ((k > 1.1) || (k < 1 / 1.1))
+        return;
+
+      deltaA = (ang::AngleD(0) * m).val();
+    }
 
     for (unsigned i = layout.firstVisible(); i < layout.lastVisible(); ++i)
     {
@@ -59,7 +77,21 @@ namespace yg
       uint32_t const glyphID = skin->mapGlyph(glyphKey, screen->glyphCache());
       CharStyle const * charStyle = static_cast<CharStyle const *>(skin->fromID(glyphID));
 
-      screen->drawGlyph(elem.m_pt + pv, m2::PointD(0.0, 0.0), elem.m_angle, 0, charStyle, depth);
+      m2::PointD glyphPt;
+      ang::AngleD glyphAngle;
+
+      if (doTransformPivotOnly)
+      {
+        glyphPt = pv + elem.m_pt;
+        glyphAngle = elem.m_angle;
+      }
+      else
+      {
+        glyphPt = (pv + elem.m_pt) * m;
+        glyphAngle = ang::AngleD(elem.m_angle.val() + deltaA);
+      }
+
+      screen->drawGlyph(glyphPt, m2::PointD(0.0, 0.0), glyphAngle, 0, charStyle, depth);
     }
   }
 
diff --git a/yg/text_element.hpp b/yg/text_element.hpp
index 833f551e9b..8611f4fe38 100644
--- a/yg/text_element.hpp
+++ b/yg/text_element.hpp
@@ -68,6 +68,7 @@ namespace yg
     void drawTextImpl(GlyphLayout const & layout,
                       gl::OverlayRenderer * r,
                       math::Matrix<double, 3, 3> const & m,
+                      bool doTransformPivotOnly,
                       FontDesc const & desc,
                       double depth) const;
     strings::UniString const & logText() const;