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

Rebase fixes

Browse source
This commit is contained in:
r.kuznetsov 2015-12-08 17:00:06 +03:00 • committed by Daria Volvenkova
parent 23c2bfe2fd
commit 0260f4007a
3 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
drape/shaders/shader_index.txt
View file

@ -17,7 +17,6 @@ BOOKMARK_PROGRAM user_mark.vsh texturing_fragment_shader.fsh
ROUTE_PROGRAM route_vertex_shader.vsh route_fragment_shader.fsh
ROUTE_ARROW_PROGRAM route_vertex_shader.vsh route_arrow_fragment_shader.fsh
DEBUG_RECT_PROGRAM debug_rect_vertex_shader.vsh debug_rect_fragment_shader.fsh
TEXTURING_3D_PROGRAM texturing3d_vertex_shader.vsh texturing3d_fragment_shader.fsh
PLANE_3D_PROGRAM plane3d_vertex_shader.vsh plane3d_fragment_shader.fsh
ARROW_3D_PROGRAM arrow3d_vertex_shader.vsh arrow3d_fragment_shader.fsh
TEXTURING_BILLBOARD_PROGRAM texturing_billboard_vertex_shader.vsh texturing_fragment_shader.fsh

2
drape/shaders/text_outlined_billboard_vertex_shader.vsh
View file

@ -34,7 +34,7 @@ void main()
vec4 offset = vec4(a_normal, Zero, Zero) * projection;
vec4 projectedPivot = pivot * projection;
vec4 transformedPivot = pivotTransform * projectedPivot;
vec4 transformedPivot = pivotTransform * vec4(projectedPivot.xy, 0.0, 1.0);
vec4 scale = pivotTransform * vec4(One, -One, Zero, One);
gl_Position = transformedPivot + vec4(offset.xy * transformedPivot.w / scale.w * scale.x, Zero, Zero);

2
drape/shaders/text_outlined_vertex_shader.vsh
View file

@ -34,7 +34,7 @@ void main()
highp vec4 shiftedPos = vec4(a_normal, Zero, Zero) + pos;
shiftedPos = shiftedPos * projection;
float w = shiftedPos.w;
shiftedPos.xyw = (pivotTransform * shiftedPos).xyw;
shiftedPos.xyw = (pivotTransform * vec4(shiftedPos.xy, 0.0, w)).xyw;
shiftedPos.z *= shiftedPos.w / w;
gl_Position = shiftedPos;
vec2 colorTexCoord = a_colorTexCoord * notOutline + a_outlineColorTexCoord * isOutline;