From 189f0d5ea6c1525c39226f08afac9cdc430d71db Mon Sep 17 00:00:00 2001
From: "r.kuznetsov" <r.kuznetsov@corp.mail.ru>
Date: Wed, 6 Jan 2016 16:24:52 +0300
Subject: [PATCH] Added night theme for 3D-arrow

---
 drape/shaders/arrow3d_fragment_shader.fsh | 4 ++--
 drape_frontend/arrow3d.cpp                | 8 +++++++-
 drape_frontend/color_constants.cpp        | 2 ++
 drape_frontend/color_constants.hpp        | 1 +
 4 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/drape/shaders/arrow3d_fragment_shader.fsh b/drape/shaders/arrow3d_fragment_shader.fsh
index a267a0268c..523906d492 100644
--- a/drape/shaders/arrow3d_fragment_shader.fsh
+++ b/drape/shaders/arrow3d_fragment_shader.fsh
@@ -4,7 +4,7 @@ varying float v_intensity;
 uniform sampler2D u_colorTex;
 #endif
 
-const vec3 color = vec3(0.11, 0.59, 0.94);
+uniform vec4 u_color;
 
 void main()
 {
@@ -14,7 +14,7 @@ void main()
   lowp vec4 fakeColor = texture2D(u_colorTex, vec2(0.0, 0.0)) * kFakeColorScalar;
 #endif
 
-  vec4 resColor = vec4((v_intensity * 0.3 + 0.7) * color, 1.0);
+  vec4 resColor = vec4((v_intensity * 0.3 + 0.7) * u_color.rgb, u_color.a);
   
 #ifdef SAMSUNG_GOOGLE_NEXUS
   gl_FragColor = resColor + fakeColor;
diff --git a/drape_frontend/arrow3d.cpp b/drape_frontend/arrow3d.cpp
index c06da5be5f..c099ab251f 100644
--- a/drape_frontend/arrow3d.cpp
+++ b/drape_frontend/arrow3d.cpp
@@ -1,4 +1,6 @@
-#include "arrow3d.hpp"
+#include "drape_frontend/arrow3d.hpp"
+
+#include "drape_frontend/color_constants.hpp"
 
 #include "drape/glconstants.hpp"
 #include "drape/glfunctions.hpp"
@@ -10,6 +12,7 @@
 #include "drape/texture_manager.hpp"
 #include "drape/uniform_values_storage.hpp"
 
+#include "indexer/map_style_reader.hpp"
 #include "indexer/scales.hpp"
 
 #include "geometry/screenbase.hpp"
@@ -172,6 +175,9 @@ void Arrow3d::Render(ScreenBase const & screen, ref_ptr<dp::GpuProgramManager> m
   dp::UniformValuesStorage uniforms;
   uniforms.SetMatrix4x4Value("m_transform", modelTransform.m_data);
 
+  glsl::vec4 const color = glsl::ToVec4(df::GetColorConstant(GetStyleReader().GetCurrentStyle(), df::Arrow3D));
+  uniforms.SetFloatValue("u_color", color.r, color.g, color.b, color.a);
+
   dp::ApplyUniforms(uniforms, prg);
 
   GLFunctions::glBindBuffer(m_bufferId, gl_const::GLArrayBuffer);
diff --git a/drape_frontend/color_constants.cpp b/drape_frontend/color_constants.cpp
index 66ec7902f6..d37cdfb9cb 100644
--- a/drape_frontend/color_constants.cpp
+++ b/drape_frontend/color_constants.cpp
@@ -23,6 +23,7 @@ unordered_map<int, unordered_map<int, dp::Color>> kColorConstants =
       { Selection, dp::Color(30, 150, 240, 164) },
       { Route, dp::Color(30, 150, 240, 204) },
       { RoutePedestrian, dp::Color(5, 105, 175, 204) },
+      { Arrow3D, dp::Color(30, 150, 240, 255) },
     }
   },
   { MapStyleDark,
@@ -38,6 +39,7 @@ unordered_map<int, unordered_map<int, dp::Color>> kColorConstants =
       { Selection, dp::Color(255, 230, 140, 164) },
       { Route, dp::Color(255, 230, 140, 204) },
       { RoutePedestrian, dp::Color(250, 215, 80, 204) },
+      { Arrow3D, dp::Color(255, 230, 140, 255) },
     }
   },
 };
diff --git a/drape_frontend/color_constants.hpp b/drape_frontend/color_constants.hpp
index 3c64acc39e..66beee696e 100644
--- a/drape_frontend/color_constants.hpp
+++ b/drape_frontend/color_constants.hpp
@@ -20,6 +20,7 @@ enum ColorConstant
   Selection,
   Route,
   RoutePedestrian,
+  Arrow3D
 };
 
 dp::Color GetColorConstant(MapStyle style, ColorConstant constant);