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

Fixed directional arrows rendering

Browse source
This commit is contained in:
r.kuznetsov 2016-11-08 17:12:59 +03:00 • committed by Ilya Grechuhin
parent 554fb1647c
commit 550f638588
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
drape/shaders/path_symbol_vertex_shader.vsh
View file

@ -8,10 +8,16 @@ uniform mat4 pivotTransform;
varying vec2 v_colorTexCoords;
const float kShapeCoordScalar = 1000.0;
void main(void)
{
vec4 pos = vec4(a_position.xyz, 1) * modelView;
vec4 norm = vec4(a_normal, 0, 0) * modelView;
float normalLen = length(a_normal);
vec4 n = normalize(vec4(a_position.xy + a_normal * kShapeCoordScalar, 0, 0) * modelView);
vec4 norm = n * normalLen;
vec4 shiftedPos = norm + pos;
shiftedPos = shiftedPos * projection;
float w = shiftedPos.w;

4
drape_frontend/path_symbol_shape.cpp
View file

@ -43,10 +43,6 @@ void PathSymbolShape::Draw(ref_ptr<dp::Batcher> batcher, ref_ptr<dp::TextureMana
glsl::vec2 const pivot = glsl::ToVec2(ConvertToLocal(splineIter.m_pos, m_params.m_tileCenter, kShapeCoordScalar));
glsl::vec2 n = halfH * glsl::normalize(glsl::vec2(-splineIter.m_dir.y, splineIter.m_dir.x));
glsl::vec2 d = halfW * glsl::normalize(glsl::vec2(splineIter.m_dir.x, splineIter.m_dir.y));
float nLength = glsl::length(n) * pToGScale;
float dLength = glsl::length(d) * pToGScale;
n = nLength * glsl::normalize(n);
d = dLength * glsl::normalize(d);
buffer.emplace_back(gpu::SolidTexturingVertex(glsl::vec4(pivot, m_params.m_depth, 0.0f), - d - n, glsl::ToVec2(rect.LeftTop())));
buffer.emplace_back(gpu::SolidTexturingVertex(glsl::vec4(pivot, m_params.m_depth, 0.0f), - d + n, glsl::ToVec2(rect.LeftBottom())));