map-per/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

Review fixes.

Browse source
This commit is contained in:
Daria Volvenkova 2015-12-01 14:45:41 +03:00
parent cdc06f523f
commit e337f26588
3 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drape/shaders/arrow3d_fragment_shader.fsh
View file

@ -1,7 +1,9 @@
varying float v_intensity;
const vec3 color = vec3(0.0, 0.75, 1.0);
void main()
{
gl_FragColor.rgb = (v_intensity * 0.4 + 0.6) * vec3(0.0, 0.75, 1.0);
gl_FragColor.rgb = (v_intensity * 0.4 + 0.6) * color;
gl_FragColor.a = 1.0;
}

3
drape/shaders/arrow3d_vertex_shader.vsh
View file

@ -5,9 +5,10 @@ uniform mat4 m_transform;
varying float v_intensity;
const vec4 lightDir = vec4(1.0, 0.0, 1.0, 0.0);
void main()
{
vec4 lightDir = vec4(1.0, 0.0, 1.0, 0.0);
vec4 position = m_transform * vec4(a_pos, 1.0);
vec4 normal = m_transform * vec4(a_normal + a_pos, 1.0);
v_intensity = max(0.0, -dot(normalize(lightDir), normalize(normal - position)));

6
drape_frontend/arrow3d.cpp
View file

@ -128,9 +128,9 @@ void Arrow3d::Render(ScreenBase const & screen, ref_ptr<dp::GpuProgramManager> m
if (m_VAO == 0)
Build(prg);
double scaleX = m_pixelWidth * kArrow3dScale * 2.0 / screen.PixelRect().SizeX() / kArrowSizeX;
double scaleY = m_pixelHeight * kArrow3dScale * 2.0 / screen.PixelRect().SizeY() / kArrowSizeY;
double scaleZ = scaleX;
double const scaleX = m_pixelWidth * kArrow3dScale * 2.0 / screen.PixelRect().SizeX() / kArrowSizeX;
double const scaleY = m_pixelHeight * kArrow3dScale * 2.0 / screen.PixelRect().SizeY() / kArrowSizeY;
double const scaleZ = scaleX;
m2::PointD const pos = screen.GtoP(m_position);
double const dX = 2.0 * pos.x / screen.PixelRect().SizeX() - 1.0;