Fixed debug compilation, tuned colors

3 files changed, 18 insertions, 15 deletions

diff --git a/drape_frontend/arrow3d.cpp b/drape_frontend/arrow3d.cpp
index ef413eda02..3798b29b78 100644
--- a/drape_frontend/arrow3d.cpp
+++ b/drape_frontend/arrow3d.cpp
@@ -1,6 +1,7 @@
 #include "drape_frontend/arrow3d.hpp"
 
 #include "drape_frontend/color_constants.hpp"
+#include "drape_frontend/visual_params.hpp"
 
 #include "drape/glconstants.hpp"
 #include "drape/glextensions_list.hpp"
@@ -21,7 +22,7 @@
 namespace df
 {
 
-double const kArrowSize = 22.0;
+double const kArrowSize = 12.0;
 double const kArrow3dScaleMin = 1.0;
 double const kArrow3dScaleMax = 2.2;
 double const kArrow3dMinZoom = 16;
@@ -174,14 +175,18 @@ void Arrow3d::RenderArrow(ScreenBase const & screen, ref_ptr<dp::GpuProgram> pro
 
 math::Matrix<float, 4, 4> Arrow3d::CalculateTransform(ScreenBase const & screen, float dz) const
 {
-  static double const kLog2 = log(2.0);
-  double const kMaxZoom = scales::UPPER_STYLE_SCALE + 1.0;
-  double const zoomLevel = my::clamp(fabs(log(screen.GetScale()) / kLog2), kArrow3dMinZoom, kMaxZoom);
-  double const t = (zoomLevel - kArrow3dMinZoom) / (kMaxZoom - kArrow3dMinZoom);
-  double const arrowScale = kArrow3dScaleMin * (1.0 - t) + kArrow3dScaleMax * t;
-
-  double const scaleX = kArrowSize * arrowScale * 2.0 / screen.PixelRect().SizeX();
-  double const scaleY = kArrowSize * arrowScale * 2.0 / screen.PixelRect().SizeY();
+  double arrowScale = VisualParams::Instance().GetVisualScale() * kArrowSize;
+  if (screen.isPerspective())
+  {
+    static double const kLog2 = log(2.0);
+    double const kMaxZoom = scales::UPPER_STYLE_SCALE + 1.0;
+    double const zoomLevel = my::clamp(fabs(log(screen.GetScale()) / kLog2), kArrow3dMinZoom, kMaxZoom);
+    double const t = (zoomLevel - kArrow3dMinZoom) / (kMaxZoom - kArrow3dMinZoom);
+    arrowScale *= (kArrow3dScaleMin * (1.0 - t) + kArrow3dScaleMax * t);
+  }
+
+  double const scaleX = arrowScale * 2.0 / screen.PixelRect().SizeX();
+  double const scaleY = arrowScale * 2.0 / screen.PixelRect().SizeY();
   double const scaleZ = screen.isPerspective() ? (0.002 * screen.GetDepth3d()) : 1.0;
 
   m2::PointD const pos = screen.GtoP(m_position);
diff --git a/drape_frontend/color_constants.cpp b/drape_frontend/color_constants.cpp
index 65fb733a60..060e524f2b 100644
--- a/drape_frontend/color_constants.cpp
+++ b/drape_frontend/color_constants.cpp
@@ -18,8 +18,8 @@ unordered_map<int, unordered_map<int, dp::Color>> kColorConstants =
       { Route, dp::Color(21, 121, 244, 204) },
       { RoutePedestrian, dp::Color(29, 51, 158, 204) },
       { RouteBicycle, dp::Color(156, 39, 176, 204) },
-      { Arrow3D, dp::Color(30, 150, 240, 255) },
-      { Arrow3DObsolete, dp::Color(105, 135, 155, 255) },
+      { Arrow3D, dp::Color(80, 170, 255, 255) },
+      { Arrow3DObsolete, dp::Color(130, 170, 200, 183) },
       { TrackHumanSpeed, dp::Color(29, 51, 158, 255) },
       { TrackCarSpeed, dp::Color(21, 121, 244, 255) },
       { TrackPlaneSpeed, dp::Color(10, 196, 255, 255) },
@@ -34,8 +34,8 @@ unordered_map<int, unordered_map<int, dp::Color>> kColorConstants =
       { Route, dp::Color(255, 202, 40, 180) },
       { RoutePedestrian, dp::Color(255, 152, 0, 180) },
       { RouteBicycle, dp::Color(216, 27, 96, 180) },
-      { Arrow3D, dp::Color(255, 230, 140, 255) },
-      { Arrow3DObsolete, dp::Color(230, 230, 170, 255) },
+      { Arrow3D, dp::Color(255, 220, 120, 255) },
+      { Arrow3DObsolete, dp::Color(215, 200, 160, 183) },
       { TrackHumanSpeed, dp::Color(255, 152, 0, 255) },
       { TrackCarSpeed, dp::Color(255, 202, 40, 255) },
       { TrackPlaneSpeed, dp::Color(255, 245, 160, 255) },
diff --git a/drape_frontend/my_position.cpp b/drape_frontend/my_position.cpp
index 358f34a6fa..ef76067b1f 100644
--- a/drape_frontend/my_position.cpp
+++ b/drape_frontend/my_position.cpp
@@ -203,8 +203,6 @@ void MyPosition::CachePointPosition(ref_ptr<dp::TextureManager> mng)
 
   m_arrow3d.SetTexture(mng);
 
-  ASSERT(pointSymbol.GetTexture() == arrowSymbol.GetTexture(), ());
-  ASSERT(pointSymbol.GetTexture() == arrowGraySymbol.GetTexture(), ());
   dp::GLState state(gpu::MY_POSITION_PROGRAM, dp::GLState::OverlayLayer);
   state.SetColorTexture(pointSymbol.GetTexture());