AndrewShkrob/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

Tuned arrow scale and color

Browse source
This commit is contained in:
r.kuznetsov 2016-01-05 16:05:18 +03:00
parent 66e47a51a1
commit fe94171941
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drape/shaders/arrow3d_fragment_shader.fsh
View file

@ -4,7 +4,7 @@ varying float v_intensity;
uniform sampler2D u_colorTex;
#endif
const vec3 color = vec3(0.0, 0.75, 1.0);
const vec3 color = vec3(0.11, 0.59, 0.94);
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.4 + 0.6) * color, 1.0);
vec4 resColor = vec4((v_intensity * 0.3 + 0.7) * color, 1.0);
#ifdef SAMSUNG_GOOGLE_NEXUS
gl_FragColor = resColor + fakeColor;

4
drape_frontend/arrow3d.cpp
View file

@ -19,8 +19,8 @@ namespace df
double const kArrowSizeX = 2.0;
double const kArrowSizeY = 3.0;
double const kArrow3dScaleMin = 1.2;
double const kArrow3dScaleMax = 2.0;
double const kArrow3dScaleMin = 1.0;
double const kArrow3dScaleMax = 2.2;
double const kArrow3dMinZoom = 16;
Arrow3d::Arrow3d()