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

Added night theme for 3D-arrow

Browse source
This commit is contained in:
r.kuznetsov 2016-01-06 16:24:52 +03:00 • committed by Constantin Shalnev
parent b2241bce1e
commit 189f0d5ea6
4 changed files with 12 additions and 3 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.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;

8
drape_frontend/arrow3d.cpp
View file

@ -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);

2
drape_frontend/color_constants.cpp
View file

@ -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) },
}
},
};

1
drape_frontend/color_constants.hpp
View file

@ -20,6 +20,7 @@ enum ColorConstant
Selection,
Route,
RoutePedestrian,
Arrow3D
};
dp::Color GetColorConstant(MapStyle style, ColorConstant constant);